Skip to content
Snippets Groups Projects
Commit 22ebe365 authored by Nicholas Robinson's avatar Nicholas Robinson
Browse files

cfg updates

- casts & castExprType
- instanceof
- method and field invocs
- params separated by commas
- public abstract class
parent 45be2f18
No related branches found
No related tags found
No related merge requests found
......@@ -62,7 +62,7 @@ COMMA
PERIOD
COMPID
IMPORTALL
98
99
start
packageDcl
importDcls
......@@ -157,12 +157,13 @@ multExpr
unaryExpr
unaryNotPlusMinus
castExpr
castExprType
postfixExpr
primaryNoArrayAccess
arrayID
methodOrFieldID
start
200
205
start BOF packageDcl importDcls topDcls EOF
packageDcl PACKAGE name SEMICO
packageDcl PACKAGE ID SEMICO
......@@ -184,6 +185,7 @@ superInterface
superInterface IMPLEMENTS interfaceTypelist
classBody LBRACK classBodyDcls RBRACK
classMod PUBLIC
classMod PUBLIC ABSTRACT
classMod ABSTRACT
classMod FINAL
classBodyDcls classBodyDcl classBodyDcls
......@@ -228,7 +230,8 @@ names COMMA name names
names
name COMPID
name IMPORTALL
params param params
params param
params param COMMA params
params
param type ID
type primitiveType
......@@ -296,8 +299,8 @@ arrayCreationExpr NEW primitiveType LSQRBRACK RSQRBRACK
arrayCreationExpr NEW name LSQRBRACK RSQRBRACK
arrayCreationExpr NEW ID LSQRBRACK RSQRBRACK
primary arrayAccess
primary primaryNoArrayAccess
primaryNoArrayAccess literal
primary primaryNoArrayAccess
primaryNoArrayAccess literal methodOrFieldInvocs
primaryNoArrayAccess LPAREN expr RPAREN
primaryNoArrayAccess classInstanceCreate methodOrFieldInvocs
primaryNoArrayAccess fieldAccess
......@@ -347,6 +350,7 @@ relationalExpr relationalExpr LT addExpr
relationalExpr relationalExpr GT addExpr
relationalExpr relationalExpr EQUAL addExpr
relationalExpr relationalExpr NE addExpr
relationalExpr relationalExpr INSTANCEOF refType
addExpr multExpr
addExpr addExpr ADD multExpr
addExpr addExpr SUB multExpr
......@@ -359,7 +363,9 @@ unaryExpr unaryNotPlusMinus
unaryNotPlusMinus postfixExpr
unaryNotPlusMinus NOT unaryExpr
unaryNotPlusMinus castExpr
castExpr LPAREN primitiveType RPAREN unaryExpr
castExpr LPAREN expr RPAREN unaryNotPlusMinus
castExpr LPAREN primitiveType RPAREN unaryNotPlusMinus
castExpr LPAREN arrayType RPAREN unaryNotPlusMinus
postfixExpr primaryAndArray
postfixExpr ID
postfixExpr name
\ No newline at end of file
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment