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

cfg/lr1GenInput.cfg

@@ -156,7 +156,7 @@ postfixExpr
 primaryNoArrayAccess
 arrayID
 start
-205
+202
 start BOF packageDcl importDcls topDcls EOF
 packageDcl PACKAGE name SEMICO
 packageDcl PACKAGE ID SEMICO
@@ -181,13 +181,14 @@ classMod PUBLIC
 classMod PUBLIC ABSTRACT
 classMod ABSTRACT
 classMod FINAL
+classMod PUBLIC FINAL
 classBodyDcls classBodyDcl classBodyDcls
 classBodyDcls
 classBodyDcl fieldDcl
 classBodyDcl methodDcl
 classBodyDcl constructorDcl
 classBodyDcl SEMICO
-fieldDcl methodMod type variableDcl SEMICO
+fieldDcl methodMod variableDcl SEMICO
 constructorDcl methodMod ID LPAREN params RPAREN methodBody
 methodDcl methodMod methodHead methodBody
 methodHead type ID LPAREN params RPAREN
@@ -241,11 +242,8 @@ refType arrayType
 arrayType primitiveType LSQRBRACK RSQRBRACK
 arrayType name LSQRBRACK RSQRBRACK
 arrayType ID LSQRBRACK RSQRBRACK
-variableDcl ID
-variableDcl ID ASSIGN variableInit
-variableDcl name ASSIGN variableInit
+variableDcl type ID
 variableDcl type ID ASSIGN variableInit
-variableDcl type name ASSIGN variableInit
 variableInit expr
 args exprs
 args
@@ -308,7 +306,6 @@ arrayAccess name LSQRBRACK expr RSQRBRACK
 arrayAccess ID LSQRBRACK expr RSQRBRACK
 arrayAccess primaryNoArrayAccess LSQRBRACK expr RSQRBRACK
 methodInvoc primary PERIOD ID LPAREN args RPAREN
-methodInvoc ID PERIOD ID LPAREN args RPAREN
 methodInvoc name LPAREN args RPAREN
 methodInvoc ID LPAREN args RPAREN
 literal LITERALBOOL
@@ -322,6 +319,8 @@ expr condOrExpr
 assignment leftHandSide ASSIGN expr
 leftHandSide fieldAccess
 leftHandSide arrayAccess
+leftHandSide ID
+leftHandSide name
 fieldAccess primary PERIOD ID
 condOrExpr condAndrExpr
 condOrExpr condOrExpr OR condAndrExpr
@@ -334,8 +333,6 @@ exclusiveOrExpr exclusiveOrExpr EXP andExpr
 andExpr eqExpr
 andExpr andExpr BITAND eqExpr
 eqExpr relationalExpr
-eqExpr EQUAL relationalExpr
-eqExpr NE relationalExpr
 relationalExpr addExpr
 relationalExpr relationalExpr LE addExpr
 relationalExpr relationalExpr GE addExpr