Merge.

[cython.git] / Cython / Compiler / Code.py

diff --git a/Cython/Compiler/Code.py b/Cython/Compiler/Code.py
index 1dcfe42dae388f049bfd2bf5772f897f3cc5e9fc..f41f4fb46e02e2bc1887e5a677f796df5a5b0b9a 100644 (file)
--- a/Cython/Compiler/Code.py
+++ b/Cython/Compiler/Code.py
@@ -189,7 +189,7 @@ class GlobalState(object):
         # This is called when it is known that no more global declarations will
         # declared (but can be called before or after insert_XXX).
         if self.pystring_table_needed:
-            self.pystring_table.putln("{0, 0, 0, 0, 0}").putln("};")
+            self.pystring_table.putln("{0, 0, 0, 0, 0, 0}").putln("};")
             import Nodes
             self.use_utility_code(Nodes.init_string_tab_utility_code)
             self.initwriter.putln(
@@ -254,17 +254,23 @@ class GlobalState(object):
                        
     def add_interned_num_decl(self, entry):
         if self.should_declare(entry.cname, entry):
-            self.initwriter.putln("%s = PyInt_FromLong(%s); %s;" % (
-                entry.cname,
-                entry.init,
-                self.initwriter.error_goto_if_null(entry.cname, self.module_pos))) # todo: fix pos
+            if entry.init[-1] == "L":
+                self.initwriter.putln('%s = PyLong_FromString("%s", 0, 0); %s;' % (
+                    entry.cname,
+                    entry.init,
+                    self.initwriter.error_goto_if_null(entry.cname, self.module_pos)))
+            else:
+                self.initwriter.putln("%s = PyInt_FromLong(%s); %s;" % (
+                    entry.cname,
+                    entry.init,
+                    self.initwriter.error_goto_if_null(entry.cname, self.module_pos)))
+            
             self.put_pyobject_decl(entry)
         
     def add_cached_builtin_decl(self, entry):
         if self.should_declare(entry.cname, entry):
             self.put_pyobject_decl(entry)
 
-
     #
     # File name state
     #