Skip to content

Commit bcf5d3b

Browse files
mike-lischkemike-lischke
committed
Some fixes
1 parent 3acc87c commit bcf5d3b

File tree

359 files changed

+1109
-1437
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

359 files changed

+1109
-1437
lines changed

‎_scripts/templates/st.Arithmetic.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
// Template generated code from trgen <version>
22

3-
43
// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
54
// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
65

‎ada/ada2005/Ada2005Lexer.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
*/
2323

24-
2524
// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
2625
// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
2726
// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true

‎ada/ada2012/AdaLexer.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
*/
2323

24-
2524
// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
2625
// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
2726
// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true

‎ada/ada83/Ada83Lexer.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
*/
2323

24-
2524
// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
2625
// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
2726
// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true

‎ada/ada95/Ada95Lexer.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
2121
THE SOFTWARE.
2222
*/
2323

24-
2524
// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
2625
// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
2726
// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true

‎alef/alef.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232

3333
// http://doc.cat-v.org/plan_9/2nd_edition/papers/alef/ref
3434

35-
3635
// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
3736
// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
3837

‎algol60/algol60.g4‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
// $antlr-format alignTrailingComments true, columnLimit 150, minEmptyLines 1, maxEmptyLinesToKeep 1, reflowComments false, useTab false
32
// $antlr-format allowShortRulesOnASingleLine false, allowShortBlocksOnASingleLine true, alignSemicolons hanging, alignColons hanging
43

‎antlr/antlr2/ANTLRv2Lexer.g4‎

Lines changed: 53 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ tokens {
8282
ACTION_CONTENT
8383
}
8484

85-
DOC_COMMENT: '/**' .*? ('*/' | EOF)-> channel(OFF_CHANNEL);
85+
DOC_COMMENT: '/**' .*? ('*/' | EOF) -> channel(OFF_CHANNEL);
8686

87-
SL_COMMENT: '//' ~ [\r\n]*-> channel(OFF_CHANNEL);
87+
SL_COMMENT: '//' ~ [\r\n]* -> channel(OFF_CHANNEL);
8888

89-
ML_COMMENT: '/*' .*? '*/'-> channel(OFF_CHANNEL);
89+
ML_COMMENT: '/*' .*? '*/' -> channel(OFF_CHANNEL);
9090

9191
INT: '0' .. '9'+;
9292

@@ -117,13 +117,13 @@ fragment ESC:
117117

118118
fragment XDIGIT: '0' .. '9' | 'a' .. 'f' | 'A' .. 'F';
119119

120-
BEGIN_ARGUMENT: LBrack{ this.handleBeginArgument(); };
120+
BEGIN_ARGUMENT: LBrack { this.handleBeginArgument(); };
121121

122-
BEGIN_ACTION: LBrace-> pushMode (Actionx);
122+
BEGIN_ACTION: LBrace -> pushMode (Actionx);
123123

124-
OPTIONS: 'options'-> pushMode (Options);
124+
OPTIONS: 'options' -> pushMode (Options);
125125

126-
TOKENS: 'tokens'-> pushMode (Tokens);
126+
TOKENS: 'tokens' -> pushMode (Tokens);
127127

128128
HEADER : 'header';
129129
CLASS : 'class';
@@ -174,7 +174,7 @@ DOLLAR : Dollar;
174174
PEQ : PlusAssign;
175175
NOT : Tilde;
176176

177-
WS: (' ' | '\t' | '\r'? '\n')+-> channel(OFF_CHANNEL);
177+
WS: (' ' | '\t' | '\r'? '\n')+ -> channel(OFF_CHANNEL);
178178

179179
TOKEN_REF: 'A' .. 'Z' ('a' .. 'z' | 'A' .. 'Z' | '_' | '0' .. '9')*;
180180

@@ -310,18 +310,18 @@ fragment Tilde : '~';
310310

311311
mode Argument;
312312
// E.g., [int x, List<String> a[]]
313-
NESTED_ARGUMENT: LBrack-> type (ARGUMENT_CONTENT), pushMode (Argument);
313+
NESTED_ARGUMENT: LBrack -> type (ARGUMENT_CONTENT), pushMode (Argument);
314314

315-
ARGUMENT_ESCAPE: EscAny-> type (ARGUMENT_CONTENT);
315+
ARGUMENT_ESCAPE: EscAny -> type (ARGUMENT_CONTENT);
316316

317-
ARGUMENT_STRING_LITERAL: DQuoteLiteral-> type (ARGUMENT_CONTENT);
317+
ARGUMENT_STRING_LITERAL: DQuoteLiteral -> type (ARGUMENT_CONTENT);
318318

319-
ARGUMENT_CHAR_LITERAL: SQuoteLiteral-> type (ARGUMENT_CONTENT);
319+
ARGUMENT_CHAR_LITERAL: SQuoteLiteral -> type (ARGUMENT_CONTENT);
320320

321-
END_ARGUMENT: RBrack{ this.handleEndArgument(); };
321+
END_ARGUMENT: RBrack { this.handleEndArgument(); };
322322
// added this to return non-EOF token type here. EOF does something weird
323323

324-
UNTERMINATED_ARGUMENT: EOF-> popMode;
324+
UNTERMINATED_ARGUMENT: EOF -> popMode;
325325

326326
ARGUMENT_CONTENT: .;
327327

@@ -336,94 +336,94 @@ ARGUMENT_CONTENT: .;
336336
// in their own alts so as not to inadvertantly match {}.
337337

338338
mode Actionx;
339-
NESTED_ACTION: LBrace-> type (ACTION_CONTENT), pushMode (Actionx);
339+
NESTED_ACTION: LBrace -> type (ACTION_CONTENT), pushMode (Actionx);
340340

341-
ACTION_ESCAPE: EscAny-> type (ACTION_CONTENT);
341+
ACTION_ESCAPE: EscAny -> type (ACTION_CONTENT);
342342

343-
ACTION_STRING_LITERAL: DQuoteLiteral-> type (ACTION_CONTENT);
343+
ACTION_STRING_LITERAL: DQuoteLiteral -> type (ACTION_CONTENT);
344344

345-
ACTION_CHAR_LITERAL: SQuoteLiteral-> type (ACTION_CONTENT);
345+
ACTION_CHAR_LITERAL: SQuoteLiteral -> type (ACTION_CONTENT);
346346

347-
ACTION_DOC_COMMENT: DocComment-> type (ACTION_CONTENT);
347+
ACTION_DOC_COMMENT: DocComment -> type (ACTION_CONTENT);
348348

349-
ACTION_BLOCK_COMMENT: BlockComment-> type (ACTION_CONTENT);
349+
ACTION_BLOCK_COMMENT: BlockComment -> type (ACTION_CONTENT);
350350

351-
ACTION_LINE_COMMENT: LineComment-> type (ACTION_CONTENT);
351+
ACTION_LINE_COMMENT: LineComment -> type (ACTION_CONTENT);
352352

353-
END_ACTION: RBrace{ this.handleEndAction(); };
353+
END_ACTION: RBrace { this.handleEndAction(); };
354354

355-
UNTERMINATED_ACTION: EOF-> popMode;
355+
UNTERMINATED_ACTION: EOF -> popMode;
356356

357357
ACTION_CONTENT: .;
358358

359359
// -------------------------
360360

361361
mode Options;
362-
OPT_DOC_COMMENT: DocComment-> type (DOC_COMMENT), channel (OFF_CHANNEL);
362+
OPT_DOC_COMMENT: DocComment -> type (DOC_COMMENT), channel (OFF_CHANNEL);
363363

364-
OPT_BLOCK_COMMENT: BlockComment-> type (ML_COMMENT), channel (OFF_CHANNEL);
364+
OPT_BLOCK_COMMENT: BlockComment -> type (ML_COMMENT), channel (OFF_CHANNEL);
365365

366-
OPT_LINE_COMMENT: LineComment-> type (SL_COMMENT), channel (OFF_CHANNEL);
366+
OPT_LINE_COMMENT: LineComment -> type (SL_COMMENT), channel (OFF_CHANNEL);
367367

368-
OPT_LBRACE: LBrace{ this.handleOptionsLBrace(); };
368+
OPT_LBRACE: LBrace { this.handleOptionsLBrace(); };
369369

370-
OPT_RBRACE: RBrace-> type (RBRACE), popMode;
370+
OPT_RBRACE: RBrace -> type (RBRACE), popMode;
371371

372-
OPT_ID: Id-> type (ID);
372+
OPT_ID: Id -> type (ID);
373373

374-
OPT_DOT: Dot-> type (DOT);
374+
OPT_DOT: Dot -> type (DOT);
375375

376-
OPT_ASSIGN: Equal-> type (EQUAL);
376+
OPT_ASSIGN: Equal -> type (EQUAL);
377377

378-
OPT_STRING_LITERAL: SQuoteLiteral-> type (CHAR_LITERAL);
378+
OPT_STRING_LITERAL: SQuoteLiteral -> type (CHAR_LITERAL);
379379

380-
OPT_STRING_LITERAL2: DQuoteLiteral-> type (STRING_LITERAL);
380+
OPT_STRING_LITERAL2: DQuoteLiteral -> type (STRING_LITERAL);
381381

382-
OPT_RANGE: Range-> type(RANGE);
382+
OPT_RANGE: Range -> type(RANGE);
383383

384-
OPT_INT: DecimalNumeral-> type (INT);
384+
OPT_INT: DecimalNumeral -> type (INT);
385385

386-
OPT_STAR: Star-> type (STAR);
386+
OPT_STAR: Star -> type (STAR);
387387

388-
OPT_SEMI: Semi-> type (SEMI);
388+
OPT_SEMI: Semi -> type (SEMI);
389389

390-
OPT_WS: Ws+-> type (WS), channel (OFF_CHANNEL);
390+
OPT_WS: Ws+ -> type (WS), channel (OFF_CHANNEL);
391391

392392
// -------------------------
393393

394394
mode Tokens;
395-
TOK_DOC_COMMENT: DocComment-> type (DOC_COMMENT), channel (OFF_CHANNEL);
395+
TOK_DOC_COMMENT: DocComment -> type (DOC_COMMENT), channel (OFF_CHANNEL);
396396

397-
TOK_BLOCK_COMMENT: BlockComment-> type (ML_COMMENT), channel (OFF_CHANNEL);
397+
TOK_BLOCK_COMMENT: BlockComment -> type (ML_COMMENT), channel (OFF_CHANNEL);
398398

399-
TOK_LINE_COMMENT: LineComment-> type (SL_COMMENT), channel (OFF_CHANNEL);
399+
TOK_LINE_COMMENT: LineComment -> type (SL_COMMENT), channel (OFF_CHANNEL);
400400

401-
TOK_LBRACE: LBrace-> type (LBRACE);
401+
TOK_LBRACE: LBrace -> type (LBRACE);
402402

403-
TOK_RBRACE: RBrace-> type (RBRACE), popMode;
403+
TOK_RBRACE: RBrace -> type (RBRACE), popMode;
404404

405-
TOK_ID: Id-> type (TOKEN_REF);
405+
TOK_ID: Id -> type (TOKEN_REF);
406406

407-
TOK_EQ: Equal-> type (EQUAL);
407+
TOK_EQ: Equal -> type (EQUAL);
408408

409-
TOK_CL: '\'' LITERAL_CHAR '\''-> type(CHAR_LITERAL);
409+
TOK_CL: '\'' LITERAL_CHAR '\'' -> type(CHAR_LITERAL);
410410

411-
TOK_SL: '"' LIT_STR* '"'-> type(STRING_LITERAL);
411+
TOK_SL: '"' LIT_STR* '"' -> type(STRING_LITERAL);
412412

413-
TOK_SEMI: Semi-> type (SEMI);
413+
TOK_SEMI: Semi -> type (SEMI);
414414

415-
TOK_RANGE: Range-> type(RANGE);
415+
TOK_RANGE: Range -> type(RANGE);
416416

417-
TOK_WS: Ws+-> type (WS), channel (OFF_CHANNEL);
417+
TOK_WS: Ws+ -> type (WS), channel (OFF_CHANNEL);
418418

419419
// -------------------------
420420

421421
mode LexerCharSet;
422-
LEXER_CHAR_SET_BODY: (~ [\]\\] | EscAny)+-> more;
422+
LEXER_CHAR_SET_BODY: (~ [\]\\] | EscAny)+ -> more;
423423

424-
LEXER_CHAR_SET: RBrack-> popMode;
424+
LEXER_CHAR_SET: RBrack -> popMode;
425425

426-
UNTERMINATED_CHAR_SET: EOF-> popMode;
426+
UNTERMINATED_CHAR_SET: EOF -> popMode;
427427

428428
// ------------------------------------------------------------------------------
429429
// Grammar specific Keywords, Punctuation, etc.

0 commit comments

Comments
 (0)