- Fixed bug where Include was not writing the #include in some situations

Bruno da Silva de Oliveira · Bruno da Silva de Oliveira · commit 3f70253a3fc4 · 2003-08-23T17:06:37.000Z
- Rebuild cache files if pyste version changes


[SVN r19757]
diff --git a/pyste/NEWS b/pyste/NEWS
@@ -1,3 +1,8 @@
+23 August 2003
+Fixed bug where some Imports where not writing their include files.  
+Now whenever the Pyste version changes, the cache files are rebuilt
+automatically.
+
 19 August 2003
 Fixed a bug related to the generation of the bases<> template.
 
diff --git a/pyste/src/Pyste/CppParser.py b/pyste/src/Pyste/CppParser.py
@@ -20,14 +20,15 @@ class CppParserError(Exception): pass
 class CppParser:
     'Parses a header file and returns a list of declarations'
     
-    def __init__(self, includes=None, defines=None, cache_dir=None):
+    def __init__(self, includes=None, defines=None, cache_dir=None, version=None):
         'includes and defines ar the directives given to gcc'
         if includes is None:
             includes = []
         if defines is None:
             defines = []
         self.includes = includes
         self.defines = defines
+        self.version = version
         #if cache_dir is None:
         #    cache_dir = tempfile.mktemp()
         #    self.delete_cache = True
@@ -168,6 +169,9 @@ def GetCache(self, header, interface, tail):
         if os.path.isfile(cache_file):
             f = file(cache_file, 'rb')
             try:
+                version = load(f)
+                if version != self.version:
+                    return None
                 cache = load(f)
                 if cache.has_key(key):
                     self.cache_files.append(cache_file)
@@ -195,6 +199,7 @@ def CreateCache(self, header, interface, tail, declarations):
         if os.path.isfile(cache_file):
             f = file(cache_file, 'rb')
             try:
+                version = load(f)
                 cache = load(f)
             finally:
                 f.close()
@@ -204,6 +209,7 @@ def CreateCache(self, header, interface, tail, declarations):
         self.cache_files.append(cache_file)
         f = file(cache_file, 'wb')
         try:
+            dump(self.version, f, 1)
             dump(cache, f, 1)
         finally:
             f.close()
diff --git a/pyste/src/Pyste/Exporter.py b/pyste/src/Pyste/Exporter.py
@@ -82,7 +82,8 @@ def Header(self):
 
 
     def __eq__(self, other):
-        return self.Name() == other.Name()
+        return type(self) is type(other) and self.Name() == other.Name() \
+            and self.interface_file == other.interface_file
 
     def __ne__(self, other):
-        return self.Name() != other.Name()
+        return not self == other
diff --git a/pyste/src/Pyste/infos.py b/pyste/src/Pyste/infos.py
@@ -3,7 +3,6 @@
 import exporters 
 from ClassExporter import ClassExporter
 from FunctionExporter import FunctionExporter
-from IncludeExporter import IncludeExporter
 from EnumExporter import EnumExporter
 from HeaderExporter import HeaderExporter
 from VarExporter import VarExporter
diff --git a/pyste/src/Pyste/pyste.py b/pyste/src/Pyste/pyste.py
@@ -43,7 +43,7 @@
 import time
 from declarations import Typedef
 
-__version__ = '0.9.18'
+__version__ = '0.9.19'
 
 def RecursiveIncludes(include):
     'Return a list containg the include dir and all its subdirectories'
@@ -205,7 +205,7 @@ def Begin():
     for interface in interfaces:
         ExecuteInterface(interface)
     # create the parser
-    parser = CppParser(includes, defines, cache_dir)
+    parser = CppParser(includes, defines, cache_dir, __version__)
     try:
         if not create_cache:
             if not generate_main:
@@ -299,14 +299,14 @@ def GenerateCode(parser, module, out, interfaces, multiple):
     exported_names = dict([(x.Name(), None) for x in exports])
 
     # order the exports
-    interfaces_order = OrderInterfaces(interfaces)
     order = {}
     for export in exports:
         if export.interface_file in order:
             order[export.interface_file].append(export)
         else:
             order[export.interface_file] = [export]
     exports = []
+    interfaces_order = OrderInterfaces(interfaces)
     for interface in interfaces_order:
         exports.extend(order[interface])
     del order
@@ -362,7 +362,7 @@ def UsePsyco():
 
 def main():
     start = time.clock()
-    UsePsyco()
+    #UsePsyco()
     status = Begin()
     print '%0.2f seconds' % (time.clock()-start)
     sys.exit(status) 
