gobject-introspection r228 - in trunk: . giscanner tools

[johan svn gnome org]

Author: johan
Date: Sat Apr 26 02:27:40 2008
New Revision: 228
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=228&view=rev

Log:
2008-04-25  Johan Dahlin  <jdahlin async com br>

    * giscanner/Makefile.am:
    * giscanner/gidlparser.py:
    * giscanner/gidlwriter.py:
    * giscanner/girwriter.py:
    * giscanner/glibtransformer.py:
    * giscanner/gobjecttreebuilder.py:
    * giscanner/transformer.py:
    * giscanner/treebuilder.py:
    * tools/g-ir-scanner:
    Rename treebuilder to transformer and
    gobjectreebuilder to glibtransformer.



Added:
   trunk/giscanner/glibtransformer.py
      - copied, changed from r227, /trunk/giscanner/gobjecttreebuilder.py
   trunk/giscanner/transformer.py
      - copied, changed from r227, /trunk/giscanner/treebuilder.py
Removed:
   trunk/giscanner/gobjecttreebuilder.py
   trunk/giscanner/treebuilder.py
Modified:
   trunk/ChangeLog
   trunk/giscanner/Makefile.am
   trunk/giscanner/gidlparser.py
   trunk/giscanner/gidlwriter.py
   trunk/giscanner/girwriter.py
   trunk/tools/g-ir-scanner

Modified: trunk/giscanner/Makefile.am
==============================================================================
--- trunk/giscanner/Makefile.am	(original)
+++ trunk/giscanner/Makefile.am	Sat Apr 26 02:27:40 2008
@@ -31,10 +31,10 @@
 	gidlparser.py		\
 	gidlwriter.py		\
 	girwriter.py		\
-	gobjecttreebuilder.py 	\
+	glibtransformer.py 	\
 	odict.py		\
 	sourcescanner.py	\
-	treebuilder.py		\
+	transformer.py		\
 	xmlwriter.py
 
 _giscanner_la_CFLAGS = \

Modified: trunk/giscanner/gidlparser.py
==============================================================================
--- trunk/giscanner/gidlparser.py	(original)
+++ trunk/giscanner/gidlparser.py	Sat Apr 26 02:27:40 2008
@@ -19,7 +19,7 @@
 
 from xml.etree.ElementTree import parse
 
-from .gobjecttreebuilder import GLibObject
+from .glibtransformer import GLibObject
 
 
 class GIDLParser(object):

Modified: trunk/giscanner/gidlwriter.py
==============================================================================
--- trunk/giscanner/gidlwriter.py	(original)
+++ trunk/giscanner/gidlwriter.py	Sat Apr 26 02:27:40 2008
@@ -19,9 +19,9 @@
 
 from __future__ import with_statement
 
-from .gobjecttreebuilder import (GLibBoxed, GLibEnum, GLibEnumMember,
-                                 GLibFlags, GLibObject, GLibInterface)
-from .treebuilder import Callback, Class, Enum, Function, Interface
+from .glibtransformer import (GLibBoxed, GLibEnum, GLibEnumMember,
+                              GLibFlags, GLibObject, GLibInterface)
+from .transformer import Callback, Class, Enum, Function, Interface
 from .xmlwriter import XMLWriter
 
 

Modified: trunk/giscanner/girwriter.py
==============================================================================
--- trunk/giscanner/girwriter.py	(original)
+++ trunk/giscanner/girwriter.py	Sat Apr 26 02:27:40 2008
@@ -19,9 +19,9 @@
 
 from __future__ import with_statement
 
-from .gobjecttreebuilder import (GLibBoxed, GLibEnum, GLibEnumMember,
-                                 GLibFlags, GLibObject, GLibInterface)
-from .treebuilder import Callback, Class, Enum, Function, Interface
+from .glibtransformer import (GLibBoxed, GLibEnum, GLibEnumMember,
+                              GLibFlags, GLibObject, GLibInterface)
+from .transformer import Callback, Class, Enum, Function, Interface
 from .xmlwriter import XMLWriter
 
 

Copied: trunk/giscanner/glibtransformer.py (from r227, /trunk/giscanner/gobjecttreebuilder.py)
==============================================================================
--- /trunk/giscanner/gobjecttreebuilder.py	(original)
+++ trunk/giscanner/glibtransformer.py	Sat Apr 26 02:27:40 2008
@@ -23,7 +23,7 @@
 
 from . import cgobject
 from .odict import odict
-from .treebuilder import (Callback, Class, Enum, Function, Interface,
+from .transformer import (Callback, Class, Enum, Function, Interface,
                           Member, Node, Parameter, Property, Return, Struct)
 
 # Copied from h2defs.py
@@ -109,7 +109,7 @@
         self.parameters = []
 
 
-class GObjectTreeBuilder(object):
+class GLibTransformer(object):
     def __init__(self, namespace_name):
         self._namespace_name = namespace_name
         self._output_ns = odict()

Copied: trunk/giscanner/transformer.py (from r227, /trunk/giscanner/treebuilder.py)
==============================================================================
--- /trunk/giscanner/treebuilder.py	(original)
+++ trunk/giscanner/transformer.py	Sat Apr 26 02:27:40 2008
@@ -151,7 +151,7 @@
             self.name, self.retval, self.parameters)
 
 
-class TreeBuilder(object):
+class Transformer(object):
     def __init__(self, generator):
         self.generator = generator
         self.nodes = []

Modified: trunk/tools/g-ir-scanner
==============================================================================
--- trunk/tools/g-ir-scanner	(original)
+++ trunk/tools/g-ir-scanner	Sat Apr 26 02:27:40 2008
@@ -24,9 +24,10 @@
 
 sys.path.insert(0, '.')
 
-from giscanner.gobjecttreebuilder import GObjectTreeBuilder
+from giscanner.glibtransformer import GLibTransformer
 from giscanner.sourcescanner import SourceScanner
-from giscanner.treebuilder import TreeBuilder
+from giscanner.transformer import Transformer
+
 
 def main(args):
     parser = optparse.OptionParser('%prog [options] sources')
@@ -92,12 +93,12 @@
     ss.parse_files(filenames)
     ss.parse_macros()
 
-    builder = GObjectTreeBuilder(options.namespace)
+    builder = GLibTransformer(options.namespace)
     if options.library:
         builder.load_library(options.library)
     for include in options.includes:
         builder.register_include(include)
-    builder.parse(TreeBuilder(ss).get_nodes())
+    builder.parse(Transformer(ss).get_nodes())
 
     if options.format == 'gir':
         from giscanner.girwriter import GIRWriter