fixed marmoset crash

Scanning.py

@@ -494,12 +494,6 @@ def scan(input):
                 if index < indexRange-1:
                     if tokens[index+1].name == 'NUM':
                         return (None, "wrong integer literal: starts with 0")
-            # Checking integer range (does not cover all edge cases)
-            elif token.name == 'NUM' and index > 0 and tokens[index-1].name == 'SUB' and int(token.lex) > 2147483648:
-                return (None, "integer too small")
-            elif token.name == 'NUM' and int(token.lex) > 2147483647 and (index is 0 or tokens[index-1].name is not 'SUB'):
-                return (None, "interger too large")
-
 
             # dealing with keywords in Java but not in Joos
             elif token.name == 'ID' and token.lex in wrongJavaKeyWordDict:

Weeding.py

@@ -5,7 +5,7 @@ import os
 def weedTokens(tokens, file):
     result = fileNameCheck(tokens, file)
     result += extendCheck(tokens)
-    result += intRangeCheck(tokens)
+    # result += intRangeCheck(tokens)
     return result
 
 
@@ -33,13 +33,13 @@ def extendCheck(tokens):
             check = True
     return ""
 
-def intRangeCheck(tokens):
-    for index, token in tokens:
-        if token.name == 'NUM' and index > 0 and tokens[index-1].name == 'SUB' and int(token.lex) > 2147483648:
-            return ("ERROR: integer too small")
-        if token.name == 'NUM' and int(token.lex) > 2147483647 and (index is 0 or tokens[index-1].name is not 'SUB'):
-            return ("ERROR: integer too large")
-    return ""
+# def intRangeCheck(tokens):
+#     for index, t in enumerate(tokens):
+#         if t.name == 'NUM' and index > 0 and t[index-1].name == 'SUB' and int(t.lex) > 2147483648:
+#             return ("ERROR: integer too small")
+#         if t.name == 'NUM' and int(t.lex) > 2147483647 and (index is 0 or t[index-1].name is not 'SUB'):
+#             return ("ERROR: integer too large")
+#     return ""
 
 
 ######################## Weeding after parsing ################################

joosc.py

@@ -16,10 +16,12 @@ def main():
     try:
         (tokens, errorString) = scan(content)
     except:
+        print("scan exception")
         return 42
 
     # Error in Scanning
     if tokens is None:
+        print("scan failed")
         return 42
 
     # Weed the tokens
@@ -31,10 +33,12 @@ def main():
     try:
         (steps, error) = parse(tokens)
     except:
+        print("parse exception")
         return 42
 
     if steps is None:
-        print(error)
+        print("parse failed")
+        # print(error)
         return 42
 
     print("success in scanning and parsing")