Avoid recursion when scanning girepository.h

2008-04-28  Johan Dahlin  <johan@gnome.org>

    * giscanner/transformer.py (Transformer._traverse_one): Avoid recursion
    when scanning girepository.h

    * giscanner/sourcescanner.py (SourceScanner._preprocess): Define
    a __GI_SCANNER__ when we run.

svn path=/trunk/; revision=254

diff --git a/ChangeLog b/ChangeLog
index e3aa77d..4182660 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-04-28  Johan Dahlin  <johan@gnome.org>
+
+       * giscanner/transformer.py (Transformer._traverse_one): Avoid recursion
+       when scanning girepository.h
+
+       * giscanner/sourcescanner.py (SourceScanner._preprocess): Define
+       a __GI_SCANNER__ when we run.
+
 2008-04-28  Johan Dahlin  <jdahlin@async.com.br>
 
        * giscanner/ast.py:

diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index bf5613c..583db6b 100644 (file)
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -140,6 +140,7 @@ class SourceScanner(object):
             'cpp',
             '-C',
             '-U__GNUC__',
+            '-D__GI_SCANNER__',
             '-I.',
             ]
         cpp_args += self._cpp_options

diff --git a/giscanner/transformer.py b/giscanner/transformer.py
index 8816e7d..98e6d04 100644 (file)
--- a/giscanner/transformer.py
+++ b/giscanner/transformer.py
@@ -56,6 +56,10 @@ class Transformer(object):
                 node = self._create_callback(symbol)
             elif symbol.base_type.type == giscanner.CTYPE_STRUCT:
                 node = self._create_typedef_struct(symbol)
+            # This prevents an infinite recursion when scanning structures with
+            # private types not exposed in headers.
+            elif symbol.base_type.type == giscanner.CSYMBOL_TYPE_TYPEDEF:
+                return
             else:
                 node = self._traverse_one(symbol, symbol.base_type.type)
             return node