Skip to content

Commit

Permalink
Improve .f import
Browse files Browse the repository at this point in the history 
re #21
  • Loading branch information
@wmeeus
Wim Meeus authored and wmeeus committed Sep 13, 2023
1 parent f6e5692 commit 325c861
Show file tree
Hide file tree
Showing 11 changed files with 364 additions and 230 deletions.
17 changes: 7 additions & 10 deletions src/SigasiProjectCreator/DotF/DotF.g4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,9 @@ cmd_options
;

cmd_option
: filename NL
| filename filecont cmd_option
| plus_option plus_option_arg* NL
| plus_option plus_option_arg* continuation cmd_option
| dash_option NL
| dash_option continuation cmd_option
: plus_option plus_option_arg?
| dash_option filename?
| filename
| NL
;

Expand All @@ -27,11 +24,11 @@ plus_option_arg: PLUS_OPTION;
dash_option: DASH_OPTION;

PLUS_OPTION
: '+' ~[+\\\n]+
: '+' ~[ +\\\n]+
;

DASH_OPTION
: '-' ~[\\\n]+
: '-' ~[ \\\n]+
;

filename
Expand All @@ -52,9 +49,9 @@ FILEPATH: FILEPATH_CHAR ('-' | FILEPATH_CHAR)* ;

QUOTED_FILEPATH: '"' (':' | FILEPATH_CHAR) ('-' | ':' | ' ' | FILEPATH_CHAR)* '"' ;

fragment FILEPATH_CHAR: [a-zA-Z0-9_/\\.${}*] ;
fragment FILEPATH_CHAR: [a-zA-Z0-9_/\\.${}()*] ;

CONT : WS '\\';
CONT : WS '\\' -> skip;

LT : [.,?!] ;

Expand Down
2 changes: 1 addition & 1 deletion src/SigasiProjectCreator/DotF/DotF.interp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,4 @@ filecont


atn:
[4, 1, 14, 76, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 1, 0, 5, 0, 18, 8, 0, 10, 0, 12, 0, 21, 9, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 32, 8, 1, 10, 1, 12, 1, 35, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 41, 8, 1, 10, 1, 12, 1, 44, 9, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 1, 57, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 3, 6, 69, 8, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 0, 0, 8, 0, 2, 4, 6, 8, 10, 12, 14, 0, 1, 1, 0, 6, 7, 77, 0, 19, 1, 0, 0, 0, 2, 56, 1, 0, 0, 0, 4, 58, 1, 0, 0, 0, 6, 60, 1, 0, 0, 0, 8, 62, 1, 0, 0, 0, 10, 64, 1, 0, 0, 0, 12, 66, 1, 0, 0, 0, 14, 72, 1, 0, 0, 0, 16, 18, 3, 2, 1, 0, 17, 16, 1, 0, 0, 0, 18, 21, 1, 0, 0, 0, 19, 17, 1, 0, 0, 0, 19, 20, 1, 0, 0, 0, 20, 1, 1, 0, 0, 0, 21, 19, 1, 0, 0, 0, 22, 23, 3, 10, 5, 0, 23, 24, 5, 11, 0, 0, 24, 57, 1, 0, 0, 0, 25, 26, 3, 10, 5, 0, 26, 27, 3, 14, 7, 0, 27, 28, 3, 2, 1, 0, 28, 57, 1, 0, 0, 0, 29, 33, 3, 4, 2, 0, 30, 32, 3, 6, 3, 0, 31, 30, 1, 0, 0, 0, 32, 35, 1, 0, 0, 0, 33, 31, 1, 0, 0, 0, 33, 34, 1, 0, 0, 0, 34, 36, 1, 0, 0, 0, 35, 33, 1, 0, 0, 0, 36, 37, 5, 11, 0, 0, 37, 57, 1, 0, 0, 0, 38, 42, 3, 4, 2, 0, 39, 41, 3, 6, 3, 0, 40, 39, 1, 0, 0, 0, 41, 44, 1, 0, 0, 0, 42, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 45, 1, 0, 0, 0, 44, 42, 1, 0, 0, 0, 45, 46, 3, 12, 6, 0, 46, 47, 3, 2, 1, 0, 47, 57, 1, 0, 0, 0, 48, 49, 3, 8, 4, 0, 49, 50, 5, 11, 0, 0, 50, 57, 1, 0, 0, 0, 51, 52, 3, 8, 4, 0, 52, 53, 3, 12, 6, 0, 53, 54, 3, 2, 1, 0, 54, 57, 1, 0, 0, 0, 55, 57, 5, 11, 0, 0, 56, 22, 1, 0, 0, 0, 56, 25, 1, 0, 0, 0, 56, 29, 1, 0, 0, 0, 56, 38, 1, 0, 0, 0, 56, 48, 1, 0, 0, 0, 56, 51, 1, 0, 0, 0, 56, 55, 1, 0, 0, 0, 57, 3, 1, 0, 0, 0, 58, 59, 5, 2, 0, 0, 59, 5, 1, 0, 0, 0, 60, 61, 5, 2, 0, 0, 61, 7, 1, 0, 0, 0, 62, 63, 5, 3, 0, 0, 63, 9, 1, 0, 0, 0, 64, 65, 7, 0, 0, 0, 65, 11, 1, 0, 0, 0, 66, 68, 5, 1, 0, 0, 67, 69, 5, 10, 0, 0, 68, 67, 1, 0, 0, 0, 68, 69, 1, 0, 0, 0, 69, 70, 1, 0, 0, 0, 70, 71, 5, 11, 0, 0, 71, 13, 1, 0, 0, 0, 72, 73, 5, 8, 0, 0, 73, 74, 5, 11, 0, 0, 74, 15, 1, 0, 0, 0, 5, 19, 33, 42, 56, 68]
[4, 1, 14, 52, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 1, 0, 5, 0, 18, 8, 0, 10, 0, 12, 0, 21, 9, 0, 1, 1, 1, 1, 3, 1, 25, 8, 1, 1, 1, 1, 1, 3, 1, 29, 8, 1, 1, 1, 1, 1, 3, 1, 33, 8, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 3, 6, 45, 8, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 7, 1, 7, 0, 0, 8, 0, 2, 4, 6, 8, 10, 12, 14, 0, 1, 1, 0, 6, 7, 50, 0, 19, 1, 0, 0, 0, 2, 32, 1, 0, 0, 0, 4, 34, 1, 0, 0, 0, 6, 36, 1, 0, 0, 0, 8, 38, 1, 0, 0, 0, 10, 40, 1, 0, 0, 0, 12, 42, 1, 0, 0, 0, 14, 48, 1, 0, 0, 0, 16, 18, 3, 2, 1, 0, 17, 16, 1, 0, 0, 0, 18, 21, 1, 0, 0, 0, 19, 17, 1, 0, 0, 0, 19, 20, 1, 0, 0, 0, 20, 1, 1, 0, 0, 0, 21, 19, 1, 0, 0, 0, 22, 24, 3, 4, 2, 0, 23, 25, 3, 6, 3, 0, 24, 23, 1, 0, 0, 0, 24, 25, 1, 0, 0, 0, 25, 33, 1, 0, 0, 0, 26, 28, 3, 8, 4, 0, 27, 29, 3, 10, 5, 0, 28, 27, 1, 0, 0, 0, 28, 29, 1, 0, 0, 0, 29, 33, 1, 0, 0, 0, 30, 33, 3, 10, 5, 0, 31, 33, 5, 11, 0, 0, 32, 22, 1, 0, 0, 0, 32, 26, 1, 0, 0, 0, 32, 30, 1, 0, 0, 0, 32, 31, 1, 0, 0, 0, 33, 3, 1, 0, 0, 0, 34, 35, 5, 2, 0, 0, 35, 5, 1, 0, 0, 0, 36, 37, 5, 2, 0, 0, 37, 7, 1, 0, 0, 0, 38, 39, 5, 3, 0, 0, 39, 9, 1, 0, 0, 0, 40, 41, 7, 0, 0, 0, 41, 11, 1, 0, 0, 0, 42, 44, 5, 1, 0, 0, 43, 45, 5, 10, 0, 0, 44, 43, 1, 0, 0, 0, 44, 45, 1, 0, 0, 0, 45, 46, 1, 0, 0, 0, 46, 47, 5, 11, 0, 0, 47, 13, 1, 0, 0, 0, 48, 49, 5, 8, 0, 0, 49, 50, 5, 11, 0, 0, 50, 15, 1, 0, 0, 0, 5, 19, 24, 28, 32, 44]
2 changes: 1 addition & 1 deletion src/SigasiProjectCreator/DotF/DotFLexer.interp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,4 @@ mode names:
DEFAULT_MODE

atn:
[4, 0, 14, 128, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 1, 0, 1, 0, 1, 1, 1, 1, 4, 1, 36, 8, 1, 11, 1, 12, 1, 37, 1, 2, 1, 2, 4, 2, 42, 8, 2, 11, 2, 12, 2, 43, 1, 3, 1, 3, 1, 3, 1, 3, 5, 3, 50, 8, 3, 10, 3, 12, 3, 53, 9, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 64, 8, 4, 10, 4, 12, 4, 67, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 74, 8, 5, 10, 5, 12, 5, 77, 9, 5, 1, 6, 1, 6, 1, 6, 3, 6, 82, 8, 6, 1, 6, 1, 6, 5, 6, 86, 8, 6, 10, 6, 12, 6, 89, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 4, 10, 101, 8, 10, 11, 10, 12, 10, 102, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13, 1, 13, 5, 13, 113, 8, 13, 10, 13, 12, 13, 116, 9, 13, 1, 13, 1, 13, 1, 14, 1, 14, 5, 14, 122, 8, 14, 10, 14, 12, 14, 125, 9, 14, 1, 14, 1, 14, 1, 51, 0, 15, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 0, 17, 8, 19, 9, 21, 10, 23, 11, 25, 12, 27, 13, 29, 14, 1, 0, 8, 3, 0, 10, 10, 43, 43, 92, 92, 2, 0, 10, 10, 92, 92, 1, 0, 10, 10, 3, 0, 32, 32, 45, 45, 58, 58, 8, 0, 36, 36, 42, 42, 46, 57, 65, 90, 92, 92, 95, 95, 97, 123, 125, 125, 4, 0, 33, 33, 44, 44, 46, 46, 63, 63, 3, 0, 9, 9, 13, 13, 32, 32, 1, 0, 92, 92, 138, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 1, 31, 1, 0, 0, 0, 3, 33, 1, 0, 0, 0, 5, 39, 1, 0, 0, 0, 7, 45, 1, 0, 0, 0, 9, 59, 1, 0, 0, 0, 11, 70, 1, 0, 0, 0, 13, 78, 1, 0, 0, 0, 15, 92, 1, 0, 0, 0, 17, 94, 1, 0, 0, 0, 19, 97, 1, 0, 0, 0, 21, 100, 1, 0, 0, 0, 23, 106, 1, 0, 0, 0, 25, 108, 1, 0, 0, 0, 27, 110, 1, 0, 0, 0, 29, 119, 1, 0, 0, 0, 31, 32, 5, 92, 0, 0, 32, 2, 1, 0, 0, 0, 33, 35, 5, 43, 0, 0, 34, 36, 8, 0, 0, 0, 35, 34, 1, 0, 0, 0, 36, 37, 1, 0, 0, 0, 37, 35, 1, 0, 0, 0, 37, 38, 1, 0, 0, 0, 38, 4, 1, 0, 0, 0, 39, 41, 5, 45, 0, 0, 40, 42, 8, 1, 0, 0, 41, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 41, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 6, 1, 0, 0, 0, 45, 46, 5, 47, 0, 0, 46, 47, 5, 42, 0, 0, 47, 51, 1, 0, 0, 0, 48, 50, 9, 0, 0, 0, 49, 48, 1, 0, 0, 0, 50, 53, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 52, 54, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 54, 55, 5, 42, 0, 0, 55, 56, 5, 47, 0, 0, 56, 57, 1, 0, 0, 0, 57, 58, 6, 3, 0, 0, 58, 8, 1, 0, 0, 0, 59, 60, 5, 47, 0, 0, 60, 61, 5, 47, 0, 0, 61, 65, 1, 0, 0, 0, 62, 64, 8, 2, 0, 0, 63, 62, 1, 0, 0, 0, 64, 67, 1, 0, 0, 0, 65, 63, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 68, 1, 0, 0, 0, 67, 65, 1, 0, 0, 0, 68, 69, 6, 4, 0, 0, 69, 10, 1, 0, 0, 0, 70, 75, 3, 15, 7, 0, 71, 74, 5, 45, 0, 0, 72, 74, 3, 15, 7, 0, 73, 71, 1, 0, 0, 0, 73, 72, 1, 0, 0, 0, 74, 77, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 12, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 81, 5, 34, 0, 0, 79, 82, 5, 58, 0, 0, 80, 82, 3, 15, 7, 0, 81, 79, 1, 0, 0, 0, 81, 80, 1, 0, 0, 0, 82, 87, 1, 0, 0, 0, 83, 86, 7, 3, 0, 0, 84, 86, 3, 15, 7, 0, 85, 83, 1, 0, 0, 0, 85, 84, 1, 0, 0, 0, 86, 89, 1, 0, 0, 0, 87, 85, 1, 0, 0, 0, 87, 88, 1, 0, 0, 0, 88, 90, 1, 0, 0, 0, 89, 87, 1, 0, 0, 0, 90, 91, 5, 34, 0, 0, 91, 14, 1, 0, 0, 0, 92, 93, 7, 4, 0, 0, 93, 16, 1, 0, 0, 0, 94, 95, 3, 21, 10, 0, 95, 96, 5, 92, 0, 0, 96, 18, 1, 0, 0, 0, 97, 98, 7, 5, 0, 0, 98, 20, 1, 0, 0, 0, 99, 101, 7, 6, 0, 0, 100, 99, 1, 0, 0, 0, 101, 102, 1, 0, 0, 0, 102, 100, 1, 0, 0, 0, 102, 103, 1, 0, 0, 0, 103, 104, 1, 0, 0, 0, 104, 105, 6, 10, 0, 0, 105, 22, 1, 0, 0, 0, 106, 107, 7, 2, 0, 0, 107, 24, 1, 0, 0, 0, 108, 109, 7, 7, 0, 0, 109, 26, 1, 0, 0, 0, 110, 114, 5, 35, 0, 0, 111, 113, 8, 2, 0, 0, 112, 111, 1, 0, 0, 0, 113, 116, 1, 0, 0, 0, 114, 112, 1, 0, 0, 0, 114, 115, 1, 0, 0, 0, 115, 117, 1, 0, 0, 0, 116, 114, 1, 0, 0, 0, 117, 118, 6, 13, 0, 0, 118, 28, 1, 0, 0, 0, 119, 123, 5, 33, 0, 0, 120, 122, 8, 2, 0, 0, 121, 120, 1, 0, 0, 0, 122, 125, 1, 0, 0, 0, 123, 121, 1, 0, 0, 0, 123, 124, 1, 0, 0, 0, 124, 126, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 126, 127, 6, 14, 0, 0, 127, 30, 1, 0, 0, 0, 13, 0, 37, 43, 51, 65, 73, 75, 81, 85, 87, 102, 114, 123, 1, 6, 0, 0]
[4, 0, 14, 130, 6, -1, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 2, 3, 7, 3, 2, 4, 7, 4, 2, 5, 7, 5, 2, 6, 7, 6, 2, 7, 7, 7, 2, 8, 7, 8, 2, 9, 7, 9, 2, 10, 7, 10, 2, 11, 7, 11, 2, 12, 7, 12, 2, 13, 7, 13, 2, 14, 7, 14, 1, 0, 1, 0, 1, 1, 1, 1, 4, 1, 36, 8, 1, 11, 1, 12, 1, 37, 1, 2, 1, 2, 4, 2, 42, 8, 2, 11, 2, 12, 2, 43, 1, 3, 1, 3, 1, 3, 1, 3, 5, 3, 50, 8, 3, 10, 3, 12, 3, 53, 9, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 4, 1, 4, 1, 4, 1, 4, 5, 4, 64, 8, 4, 10, 4, 12, 4, 67, 9, 4, 1, 4, 1, 4, 1, 5, 1, 5, 1, 5, 5, 5, 74, 8, 5, 10, 5, 12, 5, 77, 9, 5, 1, 6, 1, 6, 1, 6, 3, 6, 82, 8, 6, 1, 6, 1, 6, 5, 6, 86, 8, 6, 10, 6, 12, 6, 89, 9, 6, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 8, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 4, 10, 103, 8, 10, 11, 10, 12, 10, 104, 1, 10, 1, 10, 1, 11, 1, 11, 1, 12, 1, 12, 1, 13, 1, 13, 5, 13, 115, 8, 13, 10, 13, 12, 13, 118, 9, 13, 1, 13, 1, 13, 1, 14, 1, 14, 5, 14, 124, 8, 14, 10, 14, 12, 14, 127, 9, 14, 1, 14, 1, 14, 1, 51, 0, 15, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 0, 17, 8, 19, 9, 21, 10, 23, 11, 25, 12, 27, 13, 29, 14, 1, 0, 8, 4, 0, 10, 10, 32, 32, 43, 43, 92, 92, 3, 0, 10, 10, 32, 32, 92, 92, 1, 0, 10, 10, 3, 0, 32, 32, 45, 45, 58, 58, 8, 0, 36, 36, 40, 42, 46, 57, 65, 90, 92, 92, 95, 95, 97, 123, 125, 125, 4, 0, 33, 33, 44, 44, 46, 46, 63, 63, 3, 0, 9, 9, 13, 13, 32, 32, 1, 0, 92, 92, 140, 0, 1, 1, 0, 0, 0, 0, 3, 1, 0, 0, 0, 0, 5, 1, 0, 0, 0, 0, 7, 1, 0, 0, 0, 0, 9, 1, 0, 0, 0, 0, 11, 1, 0, 0, 0, 0, 13, 1, 0, 0, 0, 0, 17, 1, 0, 0, 0, 0, 19, 1, 0, 0, 0, 0, 21, 1, 0, 0, 0, 0, 23, 1, 0, 0, 0, 0, 25, 1, 0, 0, 0, 0, 27, 1, 0, 0, 0, 0, 29, 1, 0, 0, 0, 1, 31, 1, 0, 0, 0, 3, 33, 1, 0, 0, 0, 5, 39, 1, 0, 0, 0, 7, 45, 1, 0, 0, 0, 9, 59, 1, 0, 0, 0, 11, 70, 1, 0, 0, 0, 13, 78, 1, 0, 0, 0, 15, 92, 1, 0, 0, 0, 17, 94, 1, 0, 0, 0, 19, 99, 1, 0, 0, 0, 21, 102, 1, 0, 0, 0, 23, 108, 1, 0, 0, 0, 25, 110, 1, 0, 0, 0, 27, 112, 1, 0, 0, 0, 29, 121, 1, 0, 0, 0, 31, 32, 5, 92, 0, 0, 32, 2, 1, 0, 0, 0, 33, 35, 5, 43, 0, 0, 34, 36, 8, 0, 0, 0, 35, 34, 1, 0, 0, 0, 36, 37, 1, 0, 0, 0, 37, 35, 1, 0, 0, 0, 37, 38, 1, 0, 0, 0, 38, 4, 1, 0, 0, 0, 39, 41, 5, 45, 0, 0, 40, 42, 8, 1, 0, 0, 41, 40, 1, 0, 0, 0, 42, 43, 1, 0, 0, 0, 43, 41, 1, 0, 0, 0, 43, 44, 1, 0, 0, 0, 44, 6, 1, 0, 0, 0, 45, 46, 5, 47, 0, 0, 46, 47, 5, 42, 0, 0, 47, 51, 1, 0, 0, 0, 48, 50, 9, 0, 0, 0, 49, 48, 1, 0, 0, 0, 50, 53, 1, 0, 0, 0, 51, 52, 1, 0, 0, 0, 51, 49, 1, 0, 0, 0, 52, 54, 1, 0, 0, 0, 53, 51, 1, 0, 0, 0, 54, 55, 5, 42, 0, 0, 55, 56, 5, 47, 0, 0, 56, 57, 1, 0, 0, 0, 57, 58, 6, 3, 0, 0, 58, 8, 1, 0, 0, 0, 59, 60, 5, 47, 0, 0, 60, 61, 5, 47, 0, 0, 61, 65, 1, 0, 0, 0, 62, 64, 8, 2, 0, 0, 63, 62, 1, 0, 0, 0, 64, 67, 1, 0, 0, 0, 65, 63, 1, 0, 0, 0, 65, 66, 1, 0, 0, 0, 66, 68, 1, 0, 0, 0, 67, 65, 1, 0, 0, 0, 68, 69, 6, 4, 0, 0, 69, 10, 1, 0, 0, 0, 70, 75, 3, 15, 7, 0, 71, 74, 5, 45, 0, 0, 72, 74, 3, 15, 7, 0, 73, 71, 1, 0, 0, 0, 73, 72, 1, 0, 0, 0, 74, 77, 1, 0, 0, 0, 75, 73, 1, 0, 0, 0, 75, 76, 1, 0, 0, 0, 76, 12, 1, 0, 0, 0, 77, 75, 1, 0, 0, 0, 78, 81, 5, 34, 0, 0, 79, 82, 5, 58, 0, 0, 80, 82, 3, 15, 7, 0, 81, 79, 1, 0, 0, 0, 81, 80, 1, 0, 0, 0, 82, 87, 1, 0, 0, 0, 83, 86, 7, 3, 0, 0, 84, 86, 3, 15, 7, 0, 85, 83, 1, 0, 0, 0, 85, 84, 1, 0, 0, 0, 86, 89, 1, 0, 0, 0, 87, 85, 1, 0, 0, 0, 87, 88, 1, 0, 0, 0, 88, 90, 1, 0, 0, 0, 89, 87, 1, 0, 0, 0, 90, 91, 5, 34, 0, 0, 91, 14, 1, 0, 0, 0, 92, 93, 7, 4, 0, 0, 93, 16, 1, 0, 0, 0, 94, 95, 3, 21, 10, 0, 95, 96, 5, 92, 0, 0, 96, 97, 1, 0, 0, 0, 97, 98, 6, 8, 0, 0, 98, 18, 1, 0, 0, 0, 99, 100, 7, 5, 0, 0, 100, 20, 1, 0, 0, 0, 101, 103, 7, 6, 0, 0, 102, 101, 1, 0, 0, 0, 103, 104, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 106, 1, 0, 0, 0, 106, 107, 6, 10, 0, 0, 107, 22, 1, 0, 0, 0, 108, 109, 7, 2, 0, 0, 109, 24, 1, 0, 0, 0, 110, 111, 7, 7, 0, 0, 111, 26, 1, 0, 0, 0, 112, 116, 5, 35, 0, 0, 113, 115, 8, 2, 0, 0, 114, 113, 1, 0, 0, 0, 115, 118, 1, 0, 0, 0, 116, 114, 1, 0, 0, 0, 116, 117, 1, 0, 0, 0, 117, 119, 1, 0, 0, 0, 118, 116, 1, 0, 0, 0, 119, 120, 6, 13, 0, 0, 120, 28, 1, 0, 0, 0, 121, 125, 5, 33, 0, 0, 122, 124, 8, 2, 0, 0, 123, 122, 1, 0, 0, 0, 124, 127, 1, 0, 0, 0, 125, 123, 1, 0, 0, 0, 125, 126, 1, 0, 0, 0, 126, 128, 1, 0, 0, 0, 127, 125, 1, 0, 0, 0, 128, 129, 6, 14, 0, 0, 129, 30, 1, 0, 0, 0, 13, 0, 37, 43, 51, 65, 73, 75, 81, 85, 87, 104, 116, 125, 1, 6, 0, 0]
85 changes: 43 additions & 42 deletions src/SigasiProjectCreator/DotF/DotFLexer.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated from DotF.g4 by ANTLR 4.11.1
# Generated from DotF.g4 by ANTLR 4.13.0
from antlr4 import *
from io import StringIO
import sys
Expand All @@ -10,52 +10,53 @@

def serializedATN():
return [
4,0,14,128,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,
4,0,14,130,6,-1,2,0,7,0,2,1,7,1,2,2,7,2,2,3,7,3,2,4,7,4,2,5,7,5,
2,6,7,6,2,7,7,7,2,8,7,8,2,9,7,9,2,10,7,10,2,11,7,11,2,12,7,12,2,
13,7,13,2,14,7,14,1,0,1,0,1,1,1,1,4,1,36,8,1,11,1,12,1,37,1,2,1,
2,4,2,42,8,2,11,2,12,2,43,1,3,1,3,1,3,1,3,5,3,50,8,3,10,3,12,3,53,
9,3,1,3,1,3,1,3,1,3,1,3,1,4,1,4,1,4,1,4,5,4,64,8,4,10,4,12,4,67,
9,4,1,4,1,4,1,5,1,5,1,5,5,5,74,8,5,10,5,12,5,77,9,5,1,6,1,6,1,6,
3,6,82,8,6,1,6,1,6,5,6,86,8,6,10,6,12,6,89,9,6,1,6,1,6,1,7,1,7,1,
8,1,8,1,8,1,9,1,9,1,10,4,10,101,8,10,11,10,12,10,102,1,10,1,10,1,
11,1,11,1,12,1,12,1,13,1,13,5,13,113,8,13,10,13,12,13,116,9,13,1,
13,1,13,1,14,1,14,5,14,122,8,14,10,14,12,14,125,9,14,1,14,1,14,1,
51,0,15,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,0,17,8,19,9,21,10,23,11,
25,12,27,13,29,14,1,0,8,3,0,10,10,43,43,92,92,2,0,10,10,92,92,1,
0,10,10,3,0,32,32,45,45,58,58,8,0,36,36,42,42,46,57,65,90,92,92,
95,95,97,123,125,125,4,0,33,33,44,44,46,46,63,63,3,0,9,9,13,13,32,
32,1,0,92,92,138,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,0,0,0,0,7,1,0,0,0,
0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,17,1,0,0,0,0,19,1,0,0,0,
0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,0,0,0,29,1,0,0,0,
1,31,1,0,0,0,3,33,1,0,0,0,5,39,1,0,0,0,7,45,1,0,0,0,9,59,1,0,0,0,
11,70,1,0,0,0,13,78,1,0,0,0,15,92,1,0,0,0,17,94,1,0,0,0,19,97,1,
0,0,0,21,100,1,0,0,0,23,106,1,0,0,0,25,108,1,0,0,0,27,110,1,0,0,
0,29,119,1,0,0,0,31,32,5,92,0,0,32,2,1,0,0,0,33,35,5,43,0,0,34,36,
8,0,0,0,35,34,1,0,0,0,36,37,1,0,0,0,37,35,1,0,0,0,37,38,1,0,0,0,
38,4,1,0,0,0,39,41,5,45,0,0,40,42,8,1,0,0,41,40,1,0,0,0,42,43,1,
0,0,0,43,41,1,0,0,0,43,44,1,0,0,0,44,6,1,0,0,0,45,46,5,47,0,0,46,
47,5,42,0,0,47,51,1,0,0,0,48,50,9,0,0,0,49,48,1,0,0,0,50,53,1,0,
0,0,51,52,1,0,0,0,51,49,1,0,0,0,52,54,1,0,0,0,53,51,1,0,0,0,54,55,
5,42,0,0,55,56,5,47,0,0,56,57,1,0,0,0,57,58,6,3,0,0,58,8,1,0,0,0,
59,60,5,47,0,0,60,61,5,47,0,0,61,65,1,0,0,0,62,64,8,2,0,0,63,62,
1,0,0,0,64,67,1,0,0,0,65,63,1,0,0,0,65,66,1,0,0,0,66,68,1,0,0,0,
67,65,1,0,0,0,68,69,6,4,0,0,69,10,1,0,0,0,70,75,3,15,7,0,71,74,5,
45,0,0,72,74,3,15,7,0,73,71,1,0,0,0,73,72,1,0,0,0,74,77,1,0,0,0,
75,73,1,0,0,0,75,76,1,0,0,0,76,12,1,0,0,0,77,75,1,0,0,0,78,81,5,
34,0,0,79,82,5,58,0,0,80,82,3,15,7,0,81,79,1,0,0,0,81,80,1,0,0,0,
82,87,1,0,0,0,83,86,7,3,0,0,84,86,3,15,7,0,85,83,1,0,0,0,85,84,1,
0,0,0,86,89,1,0,0,0,87,85,1,0,0,0,87,88,1,0,0,0,88,90,1,0,0,0,89,
87,1,0,0,0,90,91,5,34,0,0,91,14,1,0,0,0,92,93,7,4,0,0,93,16,1,0,
0,0,94,95,3,21,10,0,95,96,5,92,0,0,96,18,1,0,0,0,97,98,7,5,0,0,98,
20,1,0,0,0,99,101,7,6,0,0,100,99,1,0,0,0,101,102,1,0,0,0,102,100,
1,0,0,0,102,103,1,0,0,0,103,104,1,0,0,0,104,105,6,10,0,0,105,22,
1,0,0,0,106,107,7,2,0,0,107,24,1,0,0,0,108,109,7,7,0,0,109,26,1,
0,0,0,110,114,5,35,0,0,111,113,8,2,0,0,112,111,1,0,0,0,113,116,1,
0,0,0,114,112,1,0,0,0,114,115,1,0,0,0,115,117,1,0,0,0,116,114,1,
0,0,0,117,118,6,13,0,0,118,28,1,0,0,0,119,123,5,33,0,0,120,122,8,
2,0,0,121,120,1,0,0,0,122,125,1,0,0,0,123,121,1,0,0,0,123,124,1,
0,0,0,124,126,1,0,0,0,125,123,1,0,0,0,126,127,6,14,0,0,127,30,1,
0,0,0,13,0,37,43,51,65,73,75,81,85,87,102,114,123,1,6,0,0
8,1,8,1,8,1,8,1,8,1,9,1,9,1,10,4,10,103,8,10,11,10,12,10,104,1,10,
1,10,1,11,1,11,1,12,1,12,1,13,1,13,5,13,115,8,13,10,13,12,13,118,
9,13,1,13,1,13,1,14,1,14,5,14,124,8,14,10,14,12,14,127,9,14,1,14,
1,14,1,51,0,15,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,0,17,8,19,9,21,10,
23,11,25,12,27,13,29,14,1,0,8,4,0,10,10,32,32,43,43,92,92,3,0,10,
10,32,32,92,92,1,0,10,10,3,0,32,32,45,45,58,58,8,0,36,36,40,42,46,
57,65,90,92,92,95,95,97,123,125,125,4,0,33,33,44,44,46,46,63,63,
3,0,9,9,13,13,32,32,1,0,92,92,140,0,1,1,0,0,0,0,3,1,0,0,0,0,5,1,
0,0,0,0,7,1,0,0,0,0,9,1,0,0,0,0,11,1,0,0,0,0,13,1,0,0,0,0,17,1,0,
0,0,0,19,1,0,0,0,0,21,1,0,0,0,0,23,1,0,0,0,0,25,1,0,0,0,0,27,1,0,
0,0,0,29,1,0,0,0,1,31,1,0,0,0,3,33,1,0,0,0,5,39,1,0,0,0,7,45,1,0,
0,0,9,59,1,0,0,0,11,70,1,0,0,0,13,78,1,0,0,0,15,92,1,0,0,0,17,94,
1,0,0,0,19,99,1,0,0,0,21,102,1,0,0,0,23,108,1,0,0,0,25,110,1,0,0,
0,27,112,1,0,0,0,29,121,1,0,0,0,31,32,5,92,0,0,32,2,1,0,0,0,33,35,
5,43,0,0,34,36,8,0,0,0,35,34,1,0,0,0,36,37,1,0,0,0,37,35,1,0,0,0,
37,38,1,0,0,0,38,4,1,0,0,0,39,41,5,45,0,0,40,42,8,1,0,0,41,40,1,
0,0,0,42,43,1,0,0,0,43,41,1,0,0,0,43,44,1,0,0,0,44,6,1,0,0,0,45,
46,5,47,0,0,46,47,5,42,0,0,47,51,1,0,0,0,48,50,9,0,0,0,49,48,1,0,
0,0,50,53,1,0,0,0,51,52,1,0,0,0,51,49,1,0,0,0,52,54,1,0,0,0,53,51,
1,0,0,0,54,55,5,42,0,0,55,56,5,47,0,0,56,57,1,0,0,0,57,58,6,3,0,
0,58,8,1,0,0,0,59,60,5,47,0,0,60,61,5,47,0,0,61,65,1,0,0,0,62,64,
8,2,0,0,63,62,1,0,0,0,64,67,1,0,0,0,65,63,1,0,0,0,65,66,1,0,0,0,
66,68,1,0,0,0,67,65,1,0,0,0,68,69,6,4,0,0,69,10,1,0,0,0,70,75,3,
15,7,0,71,74,5,45,0,0,72,74,3,15,7,0,73,71,1,0,0,0,73,72,1,0,0,0,
74,77,1,0,0,0,75,73,1,0,0,0,75,76,1,0,0,0,76,12,1,0,0,0,77,75,1,
0,0,0,78,81,5,34,0,0,79,82,5,58,0,0,80,82,3,15,7,0,81,79,1,0,0,0,
81,80,1,0,0,0,82,87,1,0,0,0,83,86,7,3,0,0,84,86,3,15,7,0,85,83,1,
0,0,0,85,84,1,0,0,0,86,89,1,0,0,0,87,85,1,0,0,0,87,88,1,0,0,0,88,
90,1,0,0,0,89,87,1,0,0,0,90,91,5,34,0,0,91,14,1,0,0,0,92,93,7,4,
0,0,93,16,1,0,0,0,94,95,3,21,10,0,95,96,5,92,0,0,96,97,1,0,0,0,97,
98,6,8,0,0,98,18,1,0,0,0,99,100,7,5,0,0,100,20,1,0,0,0,101,103,7,
6,0,0,102,101,1,0,0,0,103,104,1,0,0,0,104,102,1,0,0,0,104,105,1,
0,0,0,105,106,1,0,0,0,106,107,6,10,0,0,107,22,1,0,0,0,108,109,7,
2,0,0,109,24,1,0,0,0,110,111,7,7,0,0,111,26,1,0,0,0,112,116,5,35,
0,0,113,115,8,2,0,0,114,113,1,0,0,0,115,118,1,0,0,0,116,114,1,0,
0,0,116,117,1,0,0,0,117,119,1,0,0,0,118,116,1,0,0,0,119,120,6,13,
0,0,120,28,1,0,0,0,121,125,5,33,0,0,122,124,8,2,0,0,123,122,1,0,
0,0,124,127,1,0,0,0,125,123,1,0,0,0,125,126,1,0,0,0,126,128,1,0,
0,0,127,125,1,0,0,0,128,129,6,14,0,0,129,30,1,0,0,0,13,0,37,43,51,
65,73,75,81,85,87,104,116,125,1,6,0,0
]

class DotFLexer(Lexer):
Expand Down Expand Up @@ -99,7 +100,7 @@ class DotFLexer(Lexer):

def __init__(self, input=None, output:TextIO = sys.stdout):
super().__init__(input, output)
self.checkVersion("4.11.1")
self.checkVersion("4.13.0")
self._interp = LexerATNSimulator(self, self.atn, self.decisionsToDFA, PredictionContextCache())
self._actions = None
self._predicates = None
Expand Down
4 changes: 2 additions & 2 deletions src/SigasiProjectCreator/DotF/DotFListener.py
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated from DotF.g4 by ANTLR 4.11.1
# Generated from DotF.g4 by ANTLR 4.13.0
from antlr4 import *
if __name__ is not None and "." in __name__:
if "." in __name__:
from .DotFParser import DotFParser
else:
from DotFParser import DotFParser
Expand Down
Loading

0 comments on commit 325c861

Please sign in to comment.