Skip to content

Commit 8ff88f7

Browse files
committed
Minor style improvements in antlr grammars.
1 parent eccfe46 commit 8ff88f7

2 files changed

Lines changed: 15 additions & 10 deletions

File tree

java/src/processing/mode/java/preproc/JavaParser.g4

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -299,8 +299,13 @@ literal
299299
| NULL_LITERAL
300300
;
301301

302-
baseStringLiteral: STRING_LITERAL;
303-
multilineStringLiteral: MULTI_STRING_LIT;
302+
baseStringLiteral
303+
: STRING_LITERAL
304+
;
305+
306+
multilineStringLiteral
307+
: MULTI_STRING_LIT
308+
;
304309

305310
stringLiteral
306311
: baseStringLiteral

java/src/processing/mode/java/preproc/Processing.g4

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ processingSketch
2323
: javaProcessingSketch
2424
| staticProcessingSketch
2525
| activeProcessingSketch
26-
| warnMixedModes
26+
| warnMixedModes
2727
;
2828

2929
// java mode, is a compilation unit
@@ -44,8 +44,8 @@ activeProcessingSketch
4444
// User incorrectly mixing modes. Included to allow for kind error message.
4545
warnMixedModes
4646
: (importDeclaration | classBodyDeclaration | blockStatement)* blockStatement classBodyDeclaration (importDeclaration | classBodyDeclaration | blockStatement)*
47-
| (importDeclaration | classBodyDeclaration | blockStatement)* classBodyDeclaration blockStatement (importDeclaration | classBodyDeclaration | blockStatement)*
48-
;
47+
| (importDeclaration | classBodyDeclaration | blockStatement)* classBodyDeclaration blockStatement (importDeclaration | classBodyDeclaration | blockStatement)*
48+
;
4949

5050
variableDeclaratorId
5151
: warnTypeAsVariableName
@@ -73,12 +73,12 @@ methodCall
7373
// "color" is a special Processing primitive (== int)
7474
functionWithPrimitiveTypeName
7575
: ( 'boolean'
76-
| 'byte'
77-
| 'char'
78-
| 'float'
79-
| 'int'
76+
| 'byte'
77+
| 'char'
78+
| 'float'
79+
| 'int'
8080
| 'color'
81-
) '(' expressionList? ')'
81+
) '(' expressionList? ')'
8282
;
8383

8484
// adding support for "color" primitive

0 commit comments

Comments
 (0)