]> granicus.if.org Git - python/commitdiff
Fixes by Thomas Heller:
authorJack Jansen <jack.jansen@cwi.nl>
Mon, 27 Aug 2001 14:30:55 +0000 (14:30 +0000)
committerJack Jansen <jack.jansen@cwi.nl>
Mon, 27 Aug 2001 14:30:55 +0000 (14:30 +0000)
- make the selftests work again (they were apparently not used since
  very early in bgen's development), with some minor cleanup by me
- make emacs python mode happier

Tools/bgen/bgen/bgenGenerator.py
Tools/bgen/bgen/bgenGeneratorGroup.py
Tools/bgen/bgen/bgenModule.py
Tools/bgen/bgen/bgenObjectDefinition.py
Tools/bgen/bgen/bgenOutput.py

index 47fed8e9fb4a45630e0cab2eb66fd05431081fe8..1a35c12fd005f13b90e2a4f329202169cadad00f 100644 (file)
@@ -259,12 +259,12 @@ class MethodGenerator(FunctionGenerator):
 
 def _test():
        void = None
-       eggs = Generator(void, "eggs",
-                        Variable(stringptr, 'cmd'),
-                        Variable(int, 'x'),
-                        Variable(double, 'y', InOutMode),
-                        Variable(int, 'status', ErrorMode),
-                       )
+       eggs = FunctionGenerator(void, "eggs",
+                                (stringptr, 'cmd', InMode),
+                                (int, 'x', InMode),
+                                (double, 'y', InOutMode),
+                                (int, 'status', ErrorMode),
+                                )
        eggs.setprefix("spam")
        print "/* START */"
        eggs.generate()
index 5a6290539b8a9ebfd1c9e77cef2bb778a9c3fa9d..784bf69cf068180fdea25097bd46ced72c985ef1 100644 (file)
@@ -28,9 +28,10 @@ class GeneratorGroup:
 
 
 def _test():
-       from bgenGenerator import Generator
+       void = None
+       from bgenGenerator import FunctionGenerator
        group = GeneratorGroup("spam")
-       eggs = Generator(void, "eggs")
+       eggs = FunctionGenerator(void, "eggs")
        group.add(eggs)
        print "/* START */"
        group.generate()
index b4a3db05edc504b840a4e0287644cfab09f50373..5f94b9041203e39fce2d6cfbce0f396f20e17769 100644 (file)
@@ -78,9 +78,9 @@ class Module(GeneratorGroup):
 
 
 def _test():
-       from bgenGenerator import Generator
+       from bgenGenerator import FunctionGenerator
        m = Module("spam", "", "#include <stdio.h>")
-       g = Generator(None, "bacon")
+       g = FunctionGenerator(None, "bacon")
        m.add(g)
        m.generate()
 
index e6db9cd4a597ee7e4ca4f2031d4345a3d5d98e22..2186e0e8d845e71aff823ccc7b385f6da2fc0044 100644 (file)
@@ -189,7 +189,7 @@ class ObjectDefinition(GeneratorGroup):
                Output("""if (PyDict_SetItemString(d, "%sType", (PyObject *)&%s) != 0)""",
                        self.name, self.typename);
                IndentLevel()
-               Output("""Py_FatalError("can't initialize %sType");""",
+               Output("""Py_FatalError("can\'t initialize %sType");""",
                                                           self.name)
                DedentLevel()
 
index 1a512e5c8b3b064743410ebb0efff9d3a37b26ee..a269585560c04c5f0787a4f259bd5cb3a085fab5 100644 (file)
@@ -43,7 +43,7 @@ SetOutputFile()       # Initialize _File
 _Level = 0             # Indentation level
 
 def GetLevel():
-       """"Return the current indentation level."""
+       """Return the current indentation level."""
        return _Level
 
 def SetLevel(level):