diff --git a/java/src/processing/mode/java/preproc/JavaParser.g4 b/java/src/processing/mode/java/preproc/JavaParser.g4 index 4157fcde7..0926365d1 100644 --- a/java/src/processing/mode/java/preproc/JavaParser.g4 +++ b/java/src/processing/mode/java/preproc/JavaParser.g4 @@ -299,8 +299,13 @@ literal | NULL_LITERAL ; -baseStringLiteral: STRING_LITERAL; -multilineStringLiteral: MULTI_STRING_LIT; +baseStringLiteral + : STRING_LITERAL + ; + +multilineStringLiteral + : MULTI_STRING_LIT + ; stringLiteral : baseStringLiteral diff --git a/java/src/processing/mode/java/preproc/Processing.g4 b/java/src/processing/mode/java/preproc/Processing.g4 index 20f9c828e..d71ae324a 100644 --- a/java/src/processing/mode/java/preproc/Processing.g4 +++ b/java/src/processing/mode/java/preproc/Processing.g4 @@ -23,7 +23,7 @@ processingSketch : javaProcessingSketch | staticProcessingSketch | activeProcessingSketch - | warnMixedModes + | warnMixedModes ; // java mode, is a compilation unit @@ -44,8 +44,8 @@ activeProcessingSketch // User incorrectly mixing modes. Included to allow for kind error message. warnMixedModes : (importDeclaration | classBodyDeclaration | blockStatement)* blockStatement classBodyDeclaration (importDeclaration | classBodyDeclaration | blockStatement)* - | (importDeclaration | classBodyDeclaration | blockStatement)* classBodyDeclaration blockStatement (importDeclaration | classBodyDeclaration | blockStatement)* - ; + | (importDeclaration | classBodyDeclaration | blockStatement)* classBodyDeclaration blockStatement (importDeclaration | classBodyDeclaration | blockStatement)* + ; variableDeclaratorId : warnTypeAsVariableName @@ -73,12 +73,12 @@ methodCall // "color" is a special Processing primitive (== int) functionWithPrimitiveTypeName : ( 'boolean' - | 'byte' - | 'char' - | 'float' - | 'int' + | 'byte' + | 'char' + | 'float' + | 'int' | 'color' - ) '(' expressionList? ')' + ) '(' expressionList? ')' ; // adding support for "color" primitive