diff --git a/src/main/antlr4/astRefactor/astRefactor.g4 b/src/main/antlr4/astRefactor/astRefactor.g4 index bd24c170..a8399a89 100644 --- a/src/main/antlr4/astRefactor/astRefactor.g4 +++ b/src/main/antlr4/astRefactor/astRefactor.g4 @@ -100,7 +100,6 @@ CLASS : 'class'; ACCESSMODIFIER : ('public' | 'private'); WHITESPACE : ' '; NEWLINE : ('\r'? '\n' | '\r')+ ; -ARGUMENTLIST : 'argumentlist'; GENERICDECLLIST : 'List'; SOURCEFILE : (UPPERCASE | LOWERCASE)+'.java'; ASSIGNTOFIELD : 'assigntofield'; @@ -108,10 +107,8 @@ ASSIGNLEFTSIDE : 'assignleftside'; WHILESTMT : 'while()'; DOSTMT : 'do()'; GENERICTYPEVAR : 'generictypevar'; -PARAMLIST : 'paramlist'; -FORMALPARAMETER : ('int' | 'String' | 'char'); +FORMALPARAMETER : ('int' | 'String' | 'double' | 'float' | 'boolean'); FIELDDECLARATION : 'fielddeclaration'; -FIELD : 'field'; CONSTRUCTOR : 'constructor'; VOID : 'void'; REFTYPE : 'reftype'; @@ -120,8 +117,8 @@ WILDCARDTYPE : 'wildcardtype'; SUPERWILDCARDTYPE : 'superwildcardtype'; TYPEPLACEHOLDER : 'typeplaceholder'; GENERICREFTYPE : 'genericreftype'; -THIS : 'this'; -SUPER : 'super'; +THIS : 'this()'; +SUPER : 'super()'; FIELDVAR : 'fieldvar'; NEWARRAY : 'new ArrayList<>()'; LITERAL : 'literal';