Add support for source/header annotations.

2008-04-24  Johan Dahlin  <jdahlin@async.com.br>

    * giscanner/gidlwriter.py:
    * giscanner/girwriter.py:
    * giscanner/giscannermodule.c (directive_get_name),
    (directive_get_value), (directive_get_options),
    (symbol_get_directives), (symbol_set_directives),
    (pygi_source_scanner_parse_file),
    (pygi_source_scanner_lex_filename),
    (pygi_source_scanner_get_directives), (init_giscanner):
    * giscanner/sourcescanner.c (gi_source_scanner_get_directives):
    * giscanner/sourcescanner.h:
    * giscanner/sourcescanner.py:
    * giscanner/treebuilder.py:
    * tools/g-ir-scanner:
    Add support for source/header annotations.


svn path=/trunk/; revision=224

1 files changed, 39 insertions, 8 deletions

diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index 16b43163..c0b2044c 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -3,6 +3,31 @@ import subprocess
 
 import giscanner
 
+
+class SourceSymbol(object):
+    def __init__(self, symbol, directives):
+        self._symbol = symbol
+        self._directives = directives
+
+    def directives(self):
+        mapping = {}
+        for directive in self._directives:
+            mapping[directive.name] = directive.options
+        return mapping
+
+    @property
+    def ident(self):
+        return self._symbol.ident
+
+    @property
+    def type(self):
+        return self._symbol.type
+
+    @property
+    def base_type(self):
+        return self._symbol.base_type
+
+
 class SourceScanner(object):
     def __init__(self):
         self._scanner = giscanner.SourceScanner()
@@ -20,9 +45,18 @@ class SourceScanner(object):
                 if not opt in self._cpp_options:
                     self._cpp_options.append(opt)
 
-    def parse_file(self, filename):
-        self._parse_one(filename)
-        self._filenames.append(filename)
+    def parse_files(self, filenames):
+        headers = []
+        for filename in filenames:
+            if filename.endswith('.c'):
+                filename = os.path.abspath(filename)
+                self._scanner.lex_filename(filename)
+            else:
+                headers.append(filename)
+
+        for filename in headers:
+            self._parse_one(filename)
+            self._filenames.append(filename)
 
     def parse_macros(self):
         self._scanner.set_macro_scan(True)
@@ -32,7 +66,8 @@ class SourceScanner(object):
 
     def get_symbols(self):
         for symbol in self._scanner.get_symbols():
-            yield symbol
+            yield SourceSymbol(
+                symbol, self._scanner.get_directives(symbol.ident))
 
     def dump(self):
         print '-'*30
@@ -42,10 +77,6 @@ class SourceScanner(object):
     # Private
 
     def _parse_one(self, filename):
-        if filename.endswith('.c'):
-            # FIXME lex only
-            return
-
         filename = os.path.abspath(filename)
         proc = self._preprocess(filename)
         fd = proc.stdout.fileno()