Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reformatting all grammars #3843

Merged
merged 5 commits into from
Nov 29, 2023
Merged

Reformatting all grammars #3843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a83b5af
Ran all grammars through the formatter
mike-lischke Nov 22, 2023
f377360
Some fixes
mike-lischke Nov 22, 2023
7da2619
For now keep the antlr/example grammars as is
mike-lischke Nov 25, 2023
41dabd0
Fixed symbolic conflicts
mike-lischke Nov 25, 2023
2f21e2b
Fix tests
mike-lischke Nov 27, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
143 changes: 115 additions & 28 deletions _scripts/templates/st.Arithmetic.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,119 @@
// Template generated code from trgen <version>

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

grammar Arithmetic;

file_ : expression (SEMI expression)* EOF;
expression : expression POW expression | expression (TIMES | DIV) expression | expression (PLUS | MINUS) expression | LPAREN expression RPAREN | (PLUS | MINUS)* atom ;
atom : scientific | variable ;
scientific : SCIENTIFIC_NUMBER ;
variable : VARIABLE ;

VARIABLE : VALID_ID_START VALID_ID_CHAR* ;
SCIENTIFIC_NUMBER : NUMBER (E SIGN? UNSIGNED_INTEGER)? ;
LPAREN : '(' ;
RPAREN : ')' ;
PLUS : '+' ;
MINUS : '-' ;
TIMES : '*' ;
DIV : '/' ;
GT : '>' ;
LT : '\<' ;
EQ : '=' ;
POINT : '.' ;
POW : '^' ;
SEMI : ';' ;
WS : [ \r\n\t] + -> channel(HIDDEN) ;

fragment VALID_ID_START : ('a' .. 'z') | ('A' .. 'Z') | '_' ;
fragment VALID_ID_CHAR : VALID_ID_START | ('0' .. '9') ;
fragment NUMBER : ('0' .. '9') + ('.' ('0' .. '9') +)? ;
fragment UNSIGNED_INTEGER : ('0' .. '9')+ ;
fragment E : 'E' | 'e' ;
fragment SIGN : ('+' | '-') ;
file_
: expression (SEMI expression)* EOF
;

expression
: expression POW expression
| expression (TIMES | DIV) expression
| expression (PLUS | MINUS) expression
| LPAREN expression RPAREN
| (PLUS | MINUS)* atom
;

atom
: scientific
| variable
;

scientific
: SCIENTIFIC_NUMBER
;

variable
: VARIABLE
;

VARIABLE
: VALID_ID_START VALID_ID_CHAR*
;

SCIENTIFIC_NUMBER
: NUMBER (E SIGN? UNSIGNED_INTEGER)?
;

LPAREN
: '('
;

RPAREN
: ')'
;

PLUS
: '+'
;

MINUS
: '-'
;

TIMES
: '*'
;

DIV
: '/'
;

GT
: '>'
;

LT
: '\<'
;

EQ
: '='
;

POINT
: '.'
;

POW
: '^'
;

SEMI
: ';'
;

WS
: [ \r\n\t]+ -> channel(HIDDEN)
;

fragment VALID_ID_START
: ('a' .. 'z')
| ('A' .. 'Z')
| '_'
;

fragment VALID_ID_CHAR
: VALID_ID_START
| ('0' .. '9')
;

fragment NUMBER
: ('0' .. '9')+ ('.' ('0' .. '9')+)?
;

fragment UNSIGNED_INTEGER
: ('0' .. '9')+
;

fragment E
: 'E'
| 'e'
;

fragment SIGN
: ('+' | '-')
;
225 changes: 105 additions & 120 deletions abb/abbLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,122 +1,107 @@
// $antlr-format alignTrailingComments true, columnLimit 150, maxEmptyLinesToKeep 1, reflowComments false, useTab false
// $antlr-format allowShortRulesOnASingleLine true, allowShortBlocksOnASingleLine true, minEmptyLines 0, alignSemicolons ownLine
// $antlr-format alignColons trailing, singleLineOverrulesHangingColon true, alignLexerCommands true, alignLabels true, alignTrailers true

lexer grammar abbLexer;

options { caseInsensitive = true; }

MODULE : 'module' ;
ENDMODULE : 'endmodule' ;
PROC: 'PROC';
ENDPROC: 'ENDPROC';
LOCAL: 'LOCAL';
CONST: 'CONST';
PERS: 'PERS';
VAR: 'VAR';
TOOLDATA: 'TOOLDATA';
WOBJDATA: 'WOBJDATA';
SPEEDDATA: 'SPEEDDATA';
ZONEDATA: 'ZONEDATA';
CLOCK: 'CLOCK';
BOOL: 'BOOL';
ON_CALL: '\\ON';
OFF_CALL: '\\OFF';

SLASH : '/' ;
EQUALS : ':=' ;
COMMA : ',';
CURLY_OPEN : '{';
CURLY_CLOSE : '}';
COLON : ':';
SEMICOLON : ';';
BRACKET_OPEN : '(';
BRACKET_CLOSE : ')';
SQUARE_OPEN : '[';
SQUARE_CLOSE : ']';
DOT : '.';
DOUBLEDOT : '..';
REL_BIGGER : '>';
REL_BIGGER_OR_EQUAL : '>=';
REL_SMALLER : '<';
REL_SMALLER_OR_EQUAL: '<=';
REL_EQUAL : '==';
REL_NOTEQUAL : '<>';
PLUS : '+';
MINUS : '-';
MULTIPLY : '*';
PERCENT : '%';
HASH : '#';

WS
: (' ' | '\t' | '\u000C') -> skip
;

NEWLINE
: '\r'? '\n'
;

LINE_COMMENT
: '!' ~ ('\n' | '\r')* -> skip
;

BOOLLITERAL
: 'FALSE'
| 'TRUE'
;

CHARLITERAL
: '\'' (EscapeSequence | ~ ('\'' | '\\' | '\r' | '\n')) '\''
;

STRINGLITERAL
: '"' (EscapeSequence | ~ ('\\' | '"' | '\r' | '\n'))* '"'
;

fragment EscapeSequence
: '\\' ('b' | 't' | 'n' | 'f' | 'r' | '"' | '\'' | '\\' | '0' .. '3' '0' .. '7' '0' .. '7' | '0' .. '7' '0' .. '7' | '0' .. '7')
;

FLOATLITERAL
: ('0' .. '9') + '.' ('0' .. '9')* Exponent? | '.' ('0' .. '9') + Exponent? | ('0' .. '9') + Exponent
;

fragment Exponent
: 'E' ('+' | '-')? ('0' .. '9') +
;

INTLITERAL
: ('0' .. '9') + | HexPrefix HexDigit + HexSuffix | BinPrefix BinDigit + BinSuffix
;

fragment HexPrefix
: '\'' 'H'
;

fragment HexDigit
: '0' .. '9' | 'A' .. 'F'
;

fragment HexSuffix
: '\''
;

fragment BinPrefix
: '\'' 'B'
;

fragment BinDigit
: '0' | '1'
;

fragment BinSuffix
: '\''
;

IDENTIFIER
: IdentifierStart IdentifierPart*
;

fragment IdentifierStart
: 'A' .. 'Z' | '_'
;

fragment IdentifierPart
: IdentifierStart | '0' .. '9'
;
options {
caseInsensitive = true;
}

MODULE : 'module';
ENDMODULE : 'endmodule';
PROC : 'PROC';
ENDPROC : 'ENDPROC';
LOCAL : 'LOCAL';
CONST : 'CONST';
PERS : 'PERS';
VAR : 'VAR';
TOOLDATA : 'TOOLDATA';
WOBJDATA : 'WOBJDATA';
SPEEDDATA : 'SPEEDDATA';
ZONEDATA : 'ZONEDATA';
CLOCK : 'CLOCK';
BOOL : 'BOOL';
ON_CALL : '\\ON';
OFF_CALL : '\\OFF';

SLASH : '/';
EQUALS : ':=';
COMMA : ',';
CURLY_OPEN : '{';
CURLY_CLOSE : '}';
COLON : ':';
SEMICOLON : ';';
BRACKET_OPEN : '(';
BRACKET_CLOSE : ')';
SQUARE_OPEN : '[';
SQUARE_CLOSE : ']';
DOT : '.';
DOUBLEDOT : '..';
REL_BIGGER : '>';
REL_BIGGER_OR_EQUAL : '>=';
REL_SMALLER : '<';
REL_SMALLER_OR_EQUAL : '<=';
REL_EQUAL : '==';
REL_NOTEQUAL : '<>';
PLUS : '+';
MINUS : '-';
MULTIPLY : '*';
PERCENT : '%';
HASH : '#';

WS: (' ' | '\t' | '\u000C') -> skip;

NEWLINE: '\r'? '\n';

LINE_COMMENT: '!' ~ ('\n' | '\r')* -> skip;

BOOLLITERAL: 'FALSE' | 'TRUE';

CHARLITERAL: '\'' (EscapeSequence | ~ ('\'' | '\\' | '\r' | '\n')) '\'';

STRINGLITERAL: '"' (EscapeSequence | ~ ('\\' | '"' | '\r' | '\n'))* '"';

fragment EscapeSequence:
'\\' (
'b'
| 't'
| 'n'
| 'f'
| 'r'
| '"'
| '\''
| '\\'
| '0' .. '3' '0' .. '7' '0' .. '7'
| '0' .. '7' '0' .. '7'
| '0' .. '7'
)
;

FLOATLITERAL:
('0' .. '9')+ '.' ('0' .. '9')* Exponent?
| '.' ('0' .. '9')+ Exponent?
| ('0' .. '9')+ Exponent
;

fragment Exponent: 'E' ('+' | '-')? ('0' .. '9')+;

INTLITERAL: ('0' .. '9')+ | HexPrefix HexDigit+ HexSuffix | BinPrefix BinDigit+ BinSuffix;

fragment HexPrefix: '\'' 'H';

fragment HexDigit: '0' .. '9' | 'A' .. 'F';

fragment HexSuffix: '\'';

fragment BinPrefix: '\'' 'B';

fragment BinDigit: '0' | '1';

fragment BinSuffix: '\'';

IDENTIFIER: IdentifierStart IdentifierPart*;

fragment IdentifierStart: 'A' .. 'Z' | '_';

fragment IdentifierPart: IdentifierStart | '0' .. '9';
Loading
Loading