summaryrefslogtreecommitdiff
path: root/giscanner/sourcescanner.py
diff options
context:
space:
mode:
authorJohan Bilien <jobi@litl.com>2008-10-11 23:19:59 +0000
committerLucas Almeida Rocha <lucasr@src.gnome.org>2008-10-11 23:19:59 +0000
commite36cf2f246a5e65c8fa9ed8b3b18d73c1b9ce470 (patch)
tree17ddfc31a142d124e853e8d398c76fba2bb90f4d /giscanner/sourcescanner.py
parent8d37e2cb7be78a40ca3649a48f405db29d2cabcc (diff)
downloadgobject-introspection-e36cf2f246a5e65c8fa9ed8b3b18d73c1b9ce470.tar.gz
ignore non-UTF-8 string constants
2008-10-11 Johan Bilien <jobi@litl.com> * giscanner/scannerparser.y: ignore non-UTF-8 string constants 2008-10-11 Johan Bilien <jobi@litl.com> Bug 552347: Parse #defines constants * girepository/gtypelib.c: update the list of value_size with recently defined type tags * giscanner/scannerparser.y: brought back parsing of #defined, as present in older version * giscanner/giscannermodule.c: bind gi_source_scanner_append_filename * giscanner/girwriter.py: write out constant tags in the gir * giscanner/sourcescanner.py: add accessor for const_string * giscanner/transformer.py, giscanner/glibtransformer.py: handle constant svn path=/trunk/; revision=673
Diffstat (limited to 'giscanner/sourcescanner.py')
-rw-r--r--giscanner/sourcescanner.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/giscanner/sourcescanner.py b/giscanner/sourcescanner.py
index a4355ca5..5c2d704b 100644
--- a/giscanner/sourcescanner.py
+++ b/giscanner/sourcescanner.py
@@ -140,7 +140,7 @@ class SourceType(object):
class SourceSymbol(object):
- __members__ = ['const_int', 'ident', 'type', 'base_type']
+ __members__ = ['const_int', 'const_string', 'ident', 'type', 'base_type']
def __init__(self, scanner, symbol):
self._scanner = scanner
@@ -163,6 +163,10 @@ class SourceSymbol(object):
return self._symbol.const_int
@property
+ def const_string(self):
+ return self._symbol.const_string
+
+ @property
def ident(self):
return self._symbol.ident
@@ -210,9 +214,9 @@ class SourceScanner(object):
self._parse(headers)
self._filenames.extend(headers)
- def parse_macros(self):
+ def parse_macros(self, filenames):
self._scanner.set_macro_scan(True)
- self._parse(self._filenames)
+ self._scanner.parse_macros(filenames)
self._scanner.set_macro_scan(False)
def get_symbols(self):