removed duplicated code

1 files changed, 21 insertions, 40 deletions

diff --git a/codegen.py b/codegen.py
index 50804990..dae2ef8c 100644
--- a/codegen.py
+++ b/codegen.py
@@ -93,6 +93,27 @@ class PackedMethodBitField:
     def full(self):
         return self.count() == 8
 
+def multiLineFormat(things, prologue, separator, lineSeparator, epilogue, thingsPerLine = 4):
+    r = [prologue]
+    i = 0
+    for t in things:
+        if i != 0:
+            if i % thingsPerLine == 0:
+                r += [lineSeparator]
+            else:
+                r += [separator]
+        r += [t]
+        i += 1
+    r += [epilogue]
+    return "".join(r)
+
+def prettyType(typeName, subTypes, typesPerLine = 4):
+    """Pretty print a type signature made up of many alternative subtypes"""
+    sTs = multiLineFormat(subTypes,
+                          "( ", " | ", "\n\t| ", " )",
+                          thingsPerLine = typesPerLine)
+    return "-type(%s ::\n\t%s)." % (typeName, sTs)
+
 def printFileHeader():
     print """%%   Autogenerated code. Do not edit.
 %%
@@ -385,26 +406,6 @@ def genHrl(spec):
             return result
         return ', '.join([fillField(f) for f in fields])
 
-    def multiLineFormat(things, prologue, separator, lineSeparator, epilogue, thingsPerLine = 4):
-        r = [prologue]
-        i = 0
-        for t in things:
-            if i != 0:
-                if i % thingsPerLine == 0:
-                    r += [lineSeparator]
-                else:
-                    r += [separator]
-            r += [t]
-            i += 1
-        r += [epilogue]
-        return "".join(r)
-
-    def prettyType(typeName, subTypes, typesPerLine = 4):
-        sTs = multiLineFormat(subTypes,
-                              "( ", " | ", "\n\t| ", " )",
-                              thingsPerLine = typesPerLine)
-        return "-type(%s ::\n\t%s)." % (typeName, sTs)
-
     methods = spec.allMethods()
 
     printFileHeader()
@@ -450,26 +451,6 @@ def genHrl(spec):
     #                  ["%i" % ci for ci in classIds])
 
 def genSpec(spec):
-    def multiLineFormat(things, prologue, separator, lineSeparator, epilogue, thingsPerLine = 4):
-        r = [prologue]
-        i = 0
-        for t in things:
-            if i != 0:
-                if i % thingsPerLine == 0:
-                    r += [lineSeparator]
-                else:
-                    r += [separator]
-            r += [t]
-            i += 1
-        r += [epilogue]
-        return "".join(r)
-
-    def prettyType(typeName, subTypes, typesPerLine = 4):
-        sTs = multiLineFormat(subTypes,
-                              "( ", " | ", "\n\t| ", " )",
-                              thingsPerLine = typesPerLine)
-        return "-type(%s ::\n\t%s)." % (typeName, sTs)
-
     methods = spec.allMethods()
 
     printFileHeader()