fixed some J1 bugs (for statements) in the CFG

cfg/lr1GenInput.cfg

@@ -62,7 +62,7 @@ COMMA
 PERIOD
 COMPID
 IMPORTALL
-91
+92
 start
 packageDcl
 importDcls
@@ -120,6 +120,7 @@ ifElseStatement
 ifStatement
 forStatement
 forInit
+forExpr
 returnStatement
 statementNoShortIf
 ifElseStatementNoShortIf
@@ -155,7 +156,7 @@ postfixExpr
 primaryNoArrayAccess
 arrayID
 start
-199
+205
 start BOF packageDcl importDcls topDcls EOF
 packageDcl PACKAGE name SEMICO
 packageDcl PACKAGE ID SEMICO
@@ -243,6 +244,8 @@ arrayType ID LSQRBRACK RSQRBRACK
 variableDcl ID
 variableDcl ID ASSIGN variableInit
 variableDcl name ASSIGN variableInit
+variableDcl type ID ASSIGN variableInit
+variableDcl type name ASSIGN variableInit
 variableInit expr
 args exprs
 args
@@ -257,7 +260,6 @@ statement ifElseStatement
 statement forStatement
 statement whileStatement
 statement variableDcl SEMICO
-statement type variableDcl SEMICO
 noTailStatement block
 noTailStatement SEMICO
 noTailStatement exprStatement
@@ -268,18 +270,22 @@ statementExpr methodInvoc
 whileStatement WHILE LPAREN expr RPAREN statement
 ifElseStatement IF LPAREN expr RPAREN statementNoShortIf ELSE statement
 ifStatement IF LPAREN expr RPAREN statement
-forStatement FOR LPAREN forInit SEMICO expr SEMICO forInit RPAREN statement
+forStatement FOR LPAREN forInit SEMICO forExpr SEMICO forInit RPAREN statement
 forInit statementExpr
 forInit variableDcl
+forInit
+forExpr expr
+forExpr
 returnStatement RETURN expr SEMICO
 returnStatement RETURN SEMICO
 statementNoShortIf noTailStatement
 statementNoShortIf ifElseStatementNoShortIf
 statementNoShortIf whileStatementNoShortIf
 statementNoShortIf forStatementNoShortIf
+statementNoShortIf variableDcl SEMICO
 ifElseStatementNoShortIf IF LPAREN expr RPAREN statementNoShortIf ELSE statementNoShortIf
 whileStatementNoShortIf WHILE LPAREN expr RPAREN statementNoShortIf
-forStatementNoShortIf FOR LPAREN forInit SEMICO expr SEMICO forInit RPAREN statementNoShortIf
+forStatementNoShortIf FOR LPAREN forInit SEMICO forExpr SEMICO forInit RPAREN statementNoShortIf
 primaryAndArray primary
 primaryAndArray arrayCreationExpr
 arrayCreationExpr NEW primitiveType LSQRBRACK expr  RSQRBRACK
@@ -304,6 +310,7 @@ 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
 literal LITERALCHAR
 literal LITERALSTRING