diff options
| author | Johan Dahlin <johan@gnome.org> | 2010-09-02 01:52:45 -0300 |
|---|---|---|
| committer | Johan Dahlin <johan@gnome.org> | 2010-09-02 07:44:46 -0300 |
| commit | 7bb32e34862c0a77b72a0de4800228f4f9ca0368 (patch) | |
| tree | 63df59a8245aef4f146d5d7ec5aaafd4ee3991a4 /giscanner | |
| parent | c96ed7c9e9d21719e4dac258cbcdc9399cccff42 (diff) | |
| download | gobject-introspection-7bb32e34862c0a77b72a0de4800228f4f9ca0368.tar.gz | |
[scanner] Create the cachestore in the transformer
Diffstat (limited to 'giscanner')
| -rw-r--r-- | giscanner/scannermain.py | 5 | ||||
| -rw-r--r-- | giscanner/transformer.py | 5 |
2 files changed, 4 insertions, 6 deletions
diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py index cbd23730..1baed83e 100644 --- a/giscanner/scannermain.py +++ b/giscanner/scannermain.py @@ -30,7 +30,6 @@ import tempfile from giscanner.annotationparser import AnnotationParser from giscanner.ast import Include -from giscanner.cachestore import CacheStore from giscanner.dumper import compile_introspection_binary from giscanner.gdumpparser import GDumpParser, IntrospectionBinary from giscanner.maintransformer import MainTransformer @@ -261,9 +260,7 @@ def scanner_main(args): else: symbol_prefixes = None - cachestore = CacheStore() - transformer = Transformer(cachestore, - options.namespace_name, + transformer = Transformer(options.namespace_name, options.namespace_version, identifier_prefixes=identifier_prefixes, symbol_prefixes=symbol_prefixes, diff --git a/giscanner/transformer.py b/giscanner/transformer.py index 73430e2b..a58d60ca 100644 --- a/giscanner/transformer.py +++ b/giscanner/transformer.py @@ -24,6 +24,7 @@ import re from . import ast from . import glibast +from .cachestore import CacheStore from .config import DATADIR, GIR_DIR, GIR_SUFFIX from .girparser import GIRParser from .sourcescanner import ( @@ -46,11 +47,11 @@ class Transformer(object): UCASE_CONSTANT_RE = re.compile(r'[_A-Z0-9]+') - def __init__(self, cachestore, namespace_name, namespace_version, + def __init__(self, namespace_name, namespace_version, identifier_prefixes=None, symbol_prefixes=None, accept_unprefixed=False): self._cwd = os.getcwd() + os.sep - self._cachestore = cachestore + self._cachestore = CacheStore() self.generator = None self._accept_unprefixed = accept_unprefixed self._namespace = ast.Namespace(namespace_name, namespace_version, |