Add simple pre-processor using subprocess and a PIPE. Change the

2008-03-27  Johan Dahlin  <johan@gnome.org>

	* giscanner/giscannermodule.c:
	* giscanner/scannerlexer.l:
	* giscanner/sourcescanner.c:
	* tools/g-ir-scanner:

	Add simple pre-processor using subprocess and a PIPE.
	Change the parse_file apis to accept a file descriptor.


svn path=/trunk/; revision=169

1 files changed, 5 insertions, 6 deletions

diff --git a/giscanner/giscannermodule.c b/giscanner/giscannermodule.c
index 4d7bc7d5..c14151e0 100644
--- a/giscanner/giscannermodule.c
+++ b/giscanner/giscannermodule.c
@@ -200,13 +200,14 @@ static PyObject *
 pygi_source_scanner_parse_file (PyGISourceScanner *self,
 				PyObject          *args)
 {
+  int fd;
   char *filename;
   FILE *fp;
   
-  if (!PyArg_ParseTuple (args, "s:SourceScanner.__init__", &filename))
+  if (!PyArg_ParseTuple (args, "is:SourceScanner.__init__", &fd, &filename))
     return NULL;
 
-  fp = fopen (filename, "r");
+  fp = fdopen (fd, "r");
   if (!fp)
     {
       PyErr_SetFromErrnoWithFilename (PyExc_OSError, filename);
@@ -215,16 +216,14 @@ pygi_source_scanner_parse_file (PyGISourceScanner *self,
 
   self->scanner->filenames =
     g_list_append (self->scanner->filenames, g_strdup (filename));
-  self->scanner->current_filename = self->scanner->filenames->data;
-  
+  self->scanner->current_filename = g_strdup (filename);
+
   if (!gi_source_scanner_parse_file (self->scanner, fp))
     {
       g_print ("Something went wrong..\n");
       return NULL;
     }
 
-  fclose (fp);
-
   Py_INCREF (Py_None);
   return Py_None;
 }