fieldAccess & methodInvoc stuff

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