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

Need to git pull the latest CFG

Test.py

@@ -32,10 +32,10 @@ def main():
         for token in tokens:
             if (token.name and token.lex):
                 s += '(' + token.name + ',' + token.lex + '), '
-        print(s)
+        # print(s)
     
         # Parsing
-        print("Parsing starts")
+        # print("Parsing starts")
 
         try:
             (steps, errorString) = parse(tokens)
@@ -48,8 +48,8 @@ def main():
             print("**********************************************************")
             continue
         
-        print("All Steps:")
-        print(steps)
+        # print("All Steps:")
+        # print(steps)
 
         print("**********************************************************")
 

cfg/README

@@ -2,3 +2,4 @@ compile Jlr1.java into it's own folder called 'jlar'
 javac Jlr1.java
 
 cat lr1GenInput.cfg | java jlalr.Jlr1
+cat cs444/cfg/lr1GenInput.cfg | java jlalr.Jlr1 > cs444/cfg/trans.txt
\ No newline at end of file

cfg/lr1GenInput.cfg

@@ -62,7 +62,7 @@ COMMA
 PERIOD
 COMPID
 IMPORTALL
-95
+98
 start
 packageDcl
 importDcls
@@ -137,6 +137,9 @@ unqualClassCreate
 unqualCreate
 fieldAccess
 arrayAccess
+methodOrFieldInvocs
+methodOrFieldInvoc
+fieldInvoc
 methodInvoc
 literal
 expr
@@ -157,9 +160,9 @@ castExpr
 postfixExpr
 primaryNoArrayAccess
 arrayID
-methodID
+methodOrFieldID
 start
-199
+205
 start BOF packageDcl importDcls topDcls EOF
 packageDcl PACKAGE name SEMICO
 packageDcl PACKAGE ID SEMICO
@@ -264,7 +267,7 @@ statement ifElseStatement
 statement forStatement
 statement whileStatement
 statement variableDcl SEMICO
-statement primitiveType variableDcl SEMICO
+statement type variableDcl SEMICO
 noTailStatement block
 noTailStatement SEMICO
 noTailStatement exprStatement
@@ -300,19 +303,23 @@ primary arrayAccess
 primary primaryNoArrayAccess 
 primaryNoArrayAccess literal
 primaryNoArrayAccess LPAREN expr RPAREN
-primaryNoArrayAccess classInstanceCreate
+primaryNoArrayAccess classInstanceCreate methodOrFieldInvocs
 primaryNoArrayAccess fieldAccess
 primaryNoArrayAccess methodInvoc
 classInstanceCreate unqualCreate 
 unqualCreate NEW name LPAREN args RPAREN
 unqualCreate NEW ID LPAREN args RPAREN
-arrayAccess arrayID LSQRBRACK expr RSQRBRACK
+arrayAccess name LSQRBRACK expr RSQRBRACK
+arrayAccess ID LSQRBRACK expr RSQRBRACK
 arrayAccess primaryNoArrayAccess LSQRBRACK expr RSQRBRACK
-arrayID name
-arrayID ID
-methodInvoc methodID LPAREN args RPAREN
-methodID ID
-methodID name
+methodOrFieldInvocs
+methodOrFieldInvocs PERIOD methodOrFieldInvoc methodOrFieldInvocs
+methodOrFieldInvoc methodInvoc
+methodOrFieldInvoc fieldInvoc
+fieldInvoc methodOrFieldID
+methodInvoc methodOrFieldID LPAREN args RPAREN
+methodOrFieldID ID
+methodOrFieldID name
 literal LITERALBOOL
 literal LITERALCHAR
 literal LITERALSTRING
@@ -342,6 +349,8 @@ relationalExpr relationalExpr LE addExpr
 relationalExpr relationalExpr GE addExpr
 relationalExpr relationalExpr LT addExpr
 relationalExpr relationalExpr GT addExpr
+relationalExpr relationalExpr EQUAL addExpr
+relationalExpr relationalExpr NE addExpr
 addExpr multExpr
 addExpr addExpr ADD multExpr
 addExpr addExpr SUB multExpr