Ticket #6305: 12063.patch

sage/misc/preparser.py

@@ -906 +906 @@
     return line
     
 
+def literals_function(contents):
+    contents, literals, state = strip_string_literals(contents)
+    contents, nums = extract_numeric_literals(contents)
+    contents = contents % literals
+    if nums:
+        # Stick the assignments at the top, trying not to shift the lines down. 
+        ix = contents.find('\n')
+        if ix == -1: ix = len(contents)
+        if not re.match(r"^ *(#.*)?$", contents[:ix]):
+            contents = "\n"+contents
+        assignments = ["%s = %s" % x for x in nums.items()]
+        # the preparser recurses on semicolons, so we only attempt to preserve line numbers if there are a few
+        if len(assignments) < 500:
+            contents = "; ".join(assignments) + contents
+        else:
+            contents = "\n".join(assignments) + "\n\n" + contents
+    return contents
+
+
 ######################################################
 ## Apply the preparser to an entire file
 ######################################################
@@ -940 +959 @@
         numeric_literals = False
     
     if numeric_literals:
-        contents, literals, state = strip_string_literals(contents)
-        contents, nums = extract_numeric_literals(contents)
-        contents = contents % literals
-        if nums:
-            # Stick the assignments at the top, trying not to shift the lines down. 
-            ix = contents.find('\n')
-            if ix == -1: ix = len(contents)
-            if not re.match(r"^ *(#.*)?$", contents[:ix]):
-                contents = "\n"+contents
-            assignments = ["%s = %s" % x for x in nums.items()]
-            # the preparser recurses on semicolons, so we only attempt to preserve line numbers if there are a few
-            if len(assignments) < 500:
-                contents = "; ".join(assignments) + contents
-            else:
-                contents = "\n".join(assignments) + "\n\n" + contents
+        contents=literals_function(contents)
 
     F = []
     A = contents.splitlines()
@@ -999 +1004 @@
                     i += 1
                     continue
                 else:
-                    A = A[:i] + G.readlines() + A[i+1:]
+                    if numeric_literals:
+                        new_content = literals_function(G.read())
+                    else:
+                        new_content = G.read()
+                    A = A[:i] + new_content.splitlines() + A[i+1:]
                     continue
             elif name_load[-5:] == '.spyx':
                 import interpreter