Modified scanner and cfg for some bugs for false positives

Scanning.py

@@ -31,7 +31,7 @@ idToTokenDict = dict({
     'if': 'IF',
     'implements': 'IMPLEMENTS',
     'import': 'IMPORT',
-    'instaceof': 'INSTANCEOF',
+    'instanceof': 'INSTANCEOF',
     'int': 'INT',
     'interface': 'INTERFACE',
     'native': 'NATIVE',
@@ -493,7 +493,7 @@ def scan(input):
                         return (None, "wrong keyword in comp id")
                     if i is not 0 and (t == 'Class' or t == 'class'):
                         return (None, "wrong keyword in comp id")
-            
+
             # Checking if the multi line comment has a closing tag
             if token.name == 'LCOMMENT':
                 multiLineCommentFlag = True

Test.py

@@ -7,7 +7,7 @@ from Parsing import parse
 
 
 def allFiles(testDir):
-     return [testDir + f for f in listdir(testDir) if isfile(join(testDir, f)) and f.startswith('J1')]
+     return [testDir + f for f in listdir(testDir) if isfile(join(testDir, f)) and f.startswith('Je')]
 
 def main():
 
@@ -17,21 +17,21 @@ def main():
     print("**********************************************************")
 
     for f in testFiles:
-        print(f)
+        # print(f)
 
         # Scanning 
         content = open(f, "r").read()
         (tokens, errorString) = scan(content)
         # Error in Scanning 
         if tokens is None:
-            print("ERROR in Scanning: " + errorString)
+            # print("ERROR in Scanning: " + errorString)
             print("**********************************************************")
             continue
 
-        s = "All Tokens: "
-        for token in tokens:
-            if (token.name and token.lex):
-                s += '(' + token.name + ',' + token.lex + '), '
+        # s = "All Tokens: "
+        # for token in tokens:
+        #     if (token.name and token.lex):
+        #         s += '(' + token.name + ',' + token.lex + '), '
         # print(s)
     
         # Parsing
@@ -44,10 +44,11 @@ def main():
 
         # Error in Parsing
         if steps is None:
-            print("ERROR in Parsing: ", errorString)
-            print("**********************************************************")
+            # print("ERROR in Parsing: ", errorString)
+            # print("**********************************************************")
             continue
-        
+        print(f)
+        print("Succeeded")
         # print("All Steps:")
         # print(steps)
 

cfg/lr1GenInput.cfg

@@ -162,7 +162,7 @@ primaryNoArrayAccess
 arrayID
 methodOrFieldID
 start
-205
+200
 start BOF packageDcl importDcls topDcls EOF
 packageDcl PACKAGE name SEMICO
 packageDcl PACKAGE ID SEMICO
@@ -197,7 +197,6 @@ constructorDcl methodMod ID LPAREN params RPAREN methodBody
 methodDcl methodMod methodHead methodBody
 methodHead type ID LPAREN params RPAREN
 methodHead VOID ID LPAREN params RPAREN
-methodMod
 methodMod PUBLIC
 methodMod PUBLIC FINAL
 methodMod PUBLIC STATIC
@@ -208,9 +207,6 @@ methodMod PROTECTED FINAL
 methodMod PROTECTED STATIC
 methodMod PROTECTED ABSTRACT
 methodMod PROTECTED STATIC NATIVE
-methodMod STATIC
-methodMod STATIC NATIVE
-methodMod FINAL
 methodMod ABSTRACT
 methodBody block
 methodBody SEMICO
@@ -358,7 +354,6 @@ multExpr unaryExpr
 multExpr multExpr MULT unaryExpr
 multExpr multExpr DIV unaryExpr
 multExpr multExpr MOD unaryExpr
-unaryExpr ADD unaryExpr
 unaryExpr SUB unaryExpr
 unaryExpr unaryNotPlusMinus
 unaryNotPlusMinus postfixExpr