Merge branch 'master' of https://git.uwaterloo.ca/x299yang/cs444

Scanning.py

@@ -304,16 +304,33 @@ def JoosTransition(input, state):
     elif (state == 'STRINGESC'):
         if input == 'u':
             return 'UNICODE' #going to be discarded
+        if input.isdigit() and  0  <= int(input) <= 7:
+            return 'LSTRING'
         if input not in ('n', 'r', 't', 'v', '\\','\'', '"', '?', 'b' ):
             return None
         return 'LSTRING'
 
+    elif(state == 'CHAROCTAVEESC'):
+        if input.isdigit() and  0 <= int(input) <= 7:
+            return 'CHAROCTAVEESC1'
+        if (input == '\''):
+            return 'LITERALCHAR'
+        return None
+    elif(state == 'CHAROCTAVEESC1'):
+        if input.isdigit() and  0 <= int(input) <= 7:
+            return 'CHAREND'
+        if (input == '\''):
+            return 'LITERALCHAR'
+        return None
+
     # char literal
     elif (state == 'LCHAR'):
         if (input == '\\'):
             return 'CHARESC'
         return 'CHAREND'
     elif (state == 'CHARESC'):
+        if input.isdigit() and  0 <= int(input) <= 7:
+            return 'CHAROCTAVEESC'
         if input not in ('n', 'r', 't', 'v', '\\','\'', '"', '?', 'b' ):
             return None
         return 'CHAREND'
@@ -452,7 +469,9 @@ def SMM(input, dfa):
         if (state in dfa.accept):
             scanned.append(Token(state, seenInput))
         else:
-            return (None, ord(input[0]))
+            if input:
+                m = ord(input[0])
+                return (None, m)
 
     return (scanned, "success")
 

cfg/lr1GenInput.cfg

@@ -160,7 +160,7 @@ primaryNoArrayAccess
 arrayID
 methodOrFieldID
 start
-203
+207
 start BOF packageDcl importDcls topDcls EOF
 packageDcl PACKAGE name SEMICO
 packageDcl PACKAGE ID SEMICO
@@ -295,9 +295,9 @@ arrayCreationExpr NEW name LSQRBRACK RSQRBRACK
 arrayCreationExpr NEW ID LSQRBRACK RSQRBRACK
 primary arrayAccess
 primary primaryNoArrayAccess
-primaryNoArrayAccess literal methodOrFieldInvocs
+primaryNoArrayAccess literal
 primaryNoArrayAccess LPAREN expr RPAREN
-primaryNoArrayAccess classInstanceCreate methodOrFieldInvocs
+primaryNoArrayAccess classInstanceCreate
 primaryNoArrayAccess fieldAccess
 primaryNoArrayAccess methodInvoc
 classInstanceCreate unqualCreate 
@@ -311,9 +311,10 @@ methodOrFieldInvocs PERIOD methodOrFieldInvoc methodOrFieldInvocs
 methodOrFieldInvoc methodInvoc
 methodOrFieldInvoc fieldInvoc
 fieldInvoc methodOrFieldID
-methodInvoc methodOrFieldID LPAREN args RPAREN
+methodInvoc primary PERIOD ID LPAREN args RPAREN
+methodInvoc ID PERIOD ID LPAREN args RPAREN
+methodInvoc name LPAREN args RPAREN
 methodOrFieldID ID
-methodOrFieldID name
 literal LITERALBOOL
 literal LITERALCHAR
 literal LITERALSTRING
@@ -325,6 +326,7 @@ expr condOrExpr
 assignment leftHandSide ASSIGN expr
 leftHandSide fieldAccess
 leftHandSide arrayAccess
+fieldAccess primary PERIOD ID
 condOrExpr condAndrExpr
 condOrExpr condOrExpr OR condAndrExpr
 condAndrExpr inclusiveOrExpr