diff options
Diffstat (limited to 'gen')
| -rw-r--r-- | gen/ANF.interp | 12 | ||||
| -rw-r--r-- | gen/ANF.tokens | 17 | ||||
| -rw-r--r-- | gen/ANFLexer.interp | 16 | ||||
| -rw-r--r-- | gen/ANFLexer.py | 115 | ||||
| -rw-r--r-- | gen/ANFLexer.tokens | 17 | ||||
| -rw-r--r-- | gen/ANFListener.py | 9 | ||||
| -rw-r--r-- | gen/ANFParser.py | 207 | ||||
| -rw-r--r-- | gen/ANFVisitor.py | 5 |
8 files changed, 268 insertions, 130 deletions
diff --git a/gen/ANF.interp b/gen/ANF.interp index 0b5f142..9a99c83 100644 --- a/gen/ANF.interp +++ b/gen/ANF.interp @@ -16,11 +16,15 @@ null '&&' '||' '^^' -':' ',' +':' 'let' '=' 'in' +'if' +'then' +'else' +null null null null @@ -48,8 +52,12 @@ null null null null +null +null +null IDENT NUMBER +STRING WS rule names: @@ -59,4 +67,4 @@ cexp atn: -[4, 1, 24, 116, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 89, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 96, 8, 1, 10, 1, 12, 1, 99, 9, 1, 1, 1, 1, 1, 1, 1, 3, 1, 104, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 114, 8, 2, 1, 2, 0, 0, 3, 0, 2, 4, 0, 0, 131, 0, 88, 1, 0, 0, 0, 2, 103, 1, 0, 0, 0, 4, 113, 1, 0, 0, 0, 6, 89, 5, 1, 0, 0, 7, 89, 5, 2, 0, 0, 8, 89, 5, 22, 0, 0, 9, 89, 5, 23, 0, 0, 10, 11, 5, 3, 0, 0, 11, 12, 3, 0, 0, 0, 12, 13, 5, 4, 0, 0, 13, 14, 3, 0, 0, 0, 14, 15, 5, 5, 0, 0, 15, 89, 1, 0, 0, 0, 16, 17, 5, 3, 0, 0, 17, 18, 3, 0, 0, 0, 18, 19, 5, 6, 0, 0, 19, 20, 3, 0, 0, 0, 20, 21, 5, 5, 0, 0, 21, 89, 1, 0, 0, 0, 22, 23, 5, 3, 0, 0, 23, 24, 3, 0, 0, 0, 24, 25, 5, 7, 0, 0, 25, 26, 3, 0, 0, 0, 26, 27, 5, 5, 0, 0, 27, 89, 1, 0, 0, 0, 28, 29, 5, 3, 0, 0, 29, 30, 3, 0, 0, 0, 30, 31, 5, 8, 0, 0, 31, 32, 3, 0, 0, 0, 32, 33, 5, 5, 0, 0, 33, 89, 1, 0, 0, 0, 34, 35, 5, 3, 0, 0, 35, 36, 3, 0, 0, 0, 36, 37, 5, 9, 0, 0, 37, 38, 3, 0, 0, 0, 38, 39, 5, 5, 0, 0, 39, 89, 1, 0, 0, 0, 40, 41, 5, 3, 0, 0, 41, 42, 3, 0, 0, 0, 42, 43, 5, 10, 0, 0, 43, 44, 3, 0, 0, 0, 44, 45, 5, 5, 0, 0, 45, 89, 1, 0, 0, 0, 46, 47, 5, 3, 0, 0, 47, 48, 3, 0, 0, 0, 48, 49, 5, 11, 0, 0, 49, 50, 3, 0, 0, 0, 50, 51, 5, 5, 0, 0, 51, 89, 1, 0, 0, 0, 52, 53, 5, 3, 0, 0, 53, 54, 3, 0, 0, 0, 54, 55, 5, 12, 0, 0, 55, 56, 3, 0, 0, 0, 56, 57, 5, 5, 0, 0, 57, 89, 1, 0, 0, 0, 58, 59, 5, 3, 0, 0, 59, 60, 3, 0, 0, 0, 60, 61, 5, 13, 0, 0, 61, 62, 3, 0, 0, 0, 62, 63, 5, 5, 0, 0, 63, 89, 1, 0, 0, 0, 64, 65, 5, 3, 0, 0, 65, 66, 3, 0, 0, 0, 66, 67, 5, 14, 0, 0, 67, 68, 3, 0, 0, 0, 68, 69, 5, 5, 0, 0, 69, 89, 1, 0, 0, 0, 70, 71, 5, 3, 0, 0, 71, 72, 3, 0, 0, 0, 72, 73, 5, 15, 0, 0, 73, 74, 3, 0, 0, 0, 74, 75, 5, 5, 0, 0, 75, 89, 1, 0, 0, 0, 76, 77, 5, 3, 0, 0, 77, 78, 3, 0, 0, 0, 78, 79, 5, 16, 0, 0, 79, 80, 3, 0, 0, 0, 80, 81, 5, 5, 0, 0, 81, 89, 1, 0, 0, 0, 82, 83, 5, 3, 0, 0, 83, 84, 5, 22, 0, 0, 84, 85, 5, 17, 0, 0, 85, 86, 3, 4, 2, 0, 86, 87, 5, 5, 0, 0, 87, 89, 1, 0, 0, 0, 88, 6, 1, 0, 0, 0, 88, 7, 1, 0, 0, 0, 88, 8, 1, 0, 0, 0, 88, 9, 1, 0, 0, 0, 88, 10, 1, 0, 0, 0, 88, 16, 1, 0, 0, 0, 88, 22, 1, 0, 0, 0, 88, 28, 1, 0, 0, 0, 88, 34, 1, 0, 0, 0, 88, 40, 1, 0, 0, 0, 88, 46, 1, 0, 0, 0, 88, 52, 1, 0, 0, 0, 88, 58, 1, 0, 0, 0, 88, 64, 1, 0, 0, 0, 88, 70, 1, 0, 0, 0, 88, 76, 1, 0, 0, 0, 88, 82, 1, 0, 0, 0, 89, 1, 1, 0, 0, 0, 90, 91, 5, 22, 0, 0, 91, 92, 5, 3, 0, 0, 92, 97, 3, 0, 0, 0, 93, 94, 5, 18, 0, 0, 94, 96, 3, 0, 0, 0, 95, 93, 1, 0, 0, 0, 96, 99, 1, 0, 0, 0, 97, 95, 1, 0, 0, 0, 97, 98, 1, 0, 0, 0, 98, 100, 1, 0, 0, 0, 99, 97, 1, 0, 0, 0, 100, 101, 5, 5, 0, 0, 101, 104, 1, 0, 0, 0, 102, 104, 3, 0, 0, 0, 103, 90, 1, 0, 0, 0, 103, 102, 1, 0, 0, 0, 104, 3, 1, 0, 0, 0, 105, 106, 5, 19, 0, 0, 106, 107, 5, 22, 0, 0, 107, 108, 5, 20, 0, 0, 108, 109, 3, 2, 1, 0, 109, 110, 5, 21, 0, 0, 110, 111, 3, 4, 2, 0, 111, 114, 1, 0, 0, 0, 112, 114, 3, 2, 1, 0, 113, 105, 1, 0, 0, 0, 113, 112, 1, 0, 0, 0, 114, 5, 1, 0, 0, 0, 4, 88, 97, 103, 113] \ No newline at end of file +[4, 1, 28, 130, 2, 0, 7, 0, 2, 1, 7, 1, 2, 2, 7, 2, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 5, 0, 87, 8, 0, 10, 0, 12, 0, 90, 9, 0, 1, 0, 1, 0, 1, 0, 1, 0, 3, 0, 96, 8, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 5, 1, 103, 8, 1, 10, 1, 12, 1, 106, 9, 1, 1, 1, 1, 1, 1, 1, 3, 1, 111, 8, 1, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 1, 2, 3, 2, 128, 8, 2, 1, 2, 0, 0, 3, 0, 2, 4, 0, 0, 147, 0, 95, 1, 0, 0, 0, 2, 110, 1, 0, 0, 0, 4, 127, 1, 0, 0, 0, 6, 96, 5, 1, 0, 0, 7, 96, 5, 2, 0, 0, 8, 96, 5, 25, 0, 0, 9, 96, 5, 26, 0, 0, 10, 11, 5, 3, 0, 0, 11, 12, 3, 0, 0, 0, 12, 13, 5, 4, 0, 0, 13, 14, 3, 0, 0, 0, 14, 15, 5, 5, 0, 0, 15, 96, 1, 0, 0, 0, 16, 17, 5, 3, 0, 0, 17, 18, 3, 0, 0, 0, 18, 19, 5, 6, 0, 0, 19, 20, 3, 0, 0, 0, 20, 21, 5, 5, 0, 0, 21, 96, 1, 0, 0, 0, 22, 23, 5, 3, 0, 0, 23, 24, 3, 0, 0, 0, 24, 25, 5, 7, 0, 0, 25, 26, 3, 0, 0, 0, 26, 27, 5, 5, 0, 0, 27, 96, 1, 0, 0, 0, 28, 29, 5, 3, 0, 0, 29, 30, 3, 0, 0, 0, 30, 31, 5, 8, 0, 0, 31, 32, 3, 0, 0, 0, 32, 33, 5, 5, 0, 0, 33, 96, 1, 0, 0, 0, 34, 35, 5, 3, 0, 0, 35, 36, 3, 0, 0, 0, 36, 37, 5, 9, 0, 0, 37, 38, 3, 0, 0, 0, 38, 39, 5, 5, 0, 0, 39, 96, 1, 0, 0, 0, 40, 41, 5, 3, 0, 0, 41, 42, 3, 0, 0, 0, 42, 43, 5, 10, 0, 0, 43, 44, 3, 0, 0, 0, 44, 45, 5, 5, 0, 0, 45, 96, 1, 0, 0, 0, 46, 47, 5, 3, 0, 0, 47, 48, 3, 0, 0, 0, 48, 49, 5, 11, 0, 0, 49, 50, 3, 0, 0, 0, 50, 51, 5, 5, 0, 0, 51, 96, 1, 0, 0, 0, 52, 53, 5, 3, 0, 0, 53, 54, 3, 0, 0, 0, 54, 55, 5, 12, 0, 0, 55, 56, 3, 0, 0, 0, 56, 57, 5, 5, 0, 0, 57, 96, 1, 0, 0, 0, 58, 59, 5, 3, 0, 0, 59, 60, 3, 0, 0, 0, 60, 61, 5, 13, 0, 0, 61, 62, 3, 0, 0, 0, 62, 63, 5, 5, 0, 0, 63, 96, 1, 0, 0, 0, 64, 65, 5, 3, 0, 0, 65, 66, 3, 0, 0, 0, 66, 67, 5, 14, 0, 0, 67, 68, 3, 0, 0, 0, 68, 69, 5, 5, 0, 0, 69, 96, 1, 0, 0, 0, 70, 71, 5, 3, 0, 0, 71, 72, 3, 0, 0, 0, 72, 73, 5, 15, 0, 0, 73, 74, 3, 0, 0, 0, 74, 75, 5, 5, 0, 0, 75, 96, 1, 0, 0, 0, 76, 77, 5, 3, 0, 0, 77, 78, 3, 0, 0, 0, 78, 79, 5, 16, 0, 0, 79, 80, 3, 0, 0, 0, 80, 81, 5, 5, 0, 0, 81, 96, 1, 0, 0, 0, 82, 83, 5, 3, 0, 0, 83, 88, 5, 25, 0, 0, 84, 85, 5, 17, 0, 0, 85, 87, 5, 25, 0, 0, 86, 84, 1, 0, 0, 0, 87, 90, 1, 0, 0, 0, 88, 86, 1, 0, 0, 0, 88, 89, 1, 0, 0, 0, 89, 91, 1, 0, 0, 0, 90, 88, 1, 0, 0, 0, 91, 92, 5, 18, 0, 0, 92, 93, 3, 4, 2, 0, 93, 94, 5, 5, 0, 0, 94, 96, 1, 0, 0, 0, 95, 6, 1, 0, 0, 0, 95, 7, 1, 0, 0, 0, 95, 8, 1, 0, 0, 0, 95, 9, 1, 0, 0, 0, 95, 10, 1, 0, 0, 0, 95, 16, 1, 0, 0, 0, 95, 22, 1, 0, 0, 0, 95, 28, 1, 0, 0, 0, 95, 34, 1, 0, 0, 0, 95, 40, 1, 0, 0, 0, 95, 46, 1, 0, 0, 0, 95, 52, 1, 0, 0, 0, 95, 58, 1, 0, 0, 0, 95, 64, 1, 0, 0, 0, 95, 70, 1, 0, 0, 0, 95, 76, 1, 0, 0, 0, 95, 82, 1, 0, 0, 0, 96, 1, 1, 0, 0, 0, 97, 98, 5, 25, 0, 0, 98, 99, 5, 3, 0, 0, 99, 104, 3, 0, 0, 0, 100, 101, 5, 17, 0, 0, 101, 103, 3, 0, 0, 0, 102, 100, 1, 0, 0, 0, 103, 106, 1, 0, 0, 0, 104, 102, 1, 0, 0, 0, 104, 105, 1, 0, 0, 0, 105, 107, 1, 0, 0, 0, 106, 104, 1, 0, 0, 0, 107, 108, 5, 5, 0, 0, 108, 111, 1, 0, 0, 0, 109, 111, 3, 0, 0, 0, 110, 97, 1, 0, 0, 0, 110, 109, 1, 0, 0, 0, 111, 3, 1, 0, 0, 0, 112, 113, 5, 19, 0, 0, 113, 114, 5, 25, 0, 0, 114, 115, 5, 20, 0, 0, 115, 116, 3, 2, 1, 0, 116, 117, 5, 21, 0, 0, 117, 118, 3, 4, 2, 0, 118, 128, 1, 0, 0, 0, 119, 120, 5, 22, 0, 0, 120, 121, 3, 0, 0, 0, 121, 122, 5, 23, 0, 0, 122, 123, 3, 4, 2, 0, 123, 124, 5, 24, 0, 0, 124, 125, 3, 4, 2, 0, 125, 128, 1, 0, 0, 0, 126, 128, 3, 2, 1, 0, 127, 112, 1, 0, 0, 0, 127, 119, 1, 0, 0, 0, 127, 126, 1, 0, 0, 0, 128, 5, 1, 0, 0, 0, 5, 88, 95, 104, 110, 127] \ No newline at end of file diff --git a/gen/ANF.tokens b/gen/ANF.tokens index 9b90376..e34ce0c 100644 --- a/gen/ANF.tokens +++ b/gen/ANF.tokens @@ -19,9 +19,13 @@ T__17=18 T__18=19 T__19=20 T__20=21 -IDENT=22 -NUMBER=23 -WS=24 +T__21=22 +T__22=23 +T__23=24 +IDENT=25 +NUMBER=26 +STRING=27 +WS=28 'true'=1 'false'=2 '('=3 @@ -38,8 +42,11 @@ WS=24 '&&'=14 '||'=15 '^^'=16 -':'=17 -','=18 +','=17 +':'=18 'let'=19 '='=20 'in'=21 +'if'=22 +'then'=23 +'else'=24 diff --git a/gen/ANFLexer.interp b/gen/ANFLexer.interp index 018eb54..ade4a5b 100644 --- a/gen/ANFLexer.interp +++ b/gen/ANFLexer.interp @@ -16,11 +16,15 @@ null '&&' '||' '^^' -':' ',' +':' 'let' '=' 'in' +'if' +'then' +'else' +null null null null @@ -48,8 +52,12 @@ null null null null +null +null +null IDENT NUMBER +STRING WS rule names: @@ -74,8 +82,12 @@ T__17 T__18 T__19 T__20 +T__21 +T__22 +T__23 IDENT NUMBER +STRING Letter Digit WS @@ -88,4 +100,4 @@ mode names: DEFAULT_MODE atn: -[4, 0, 24, 135, 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, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 5, 21, 115, 8, 21, 10, 21, 12, 21, 118, 9, 21, 1, 22, 4, 22, 121, 8, 22, 11, 22, 12, 22, 122, 1, 23, 1, 23, 1, 24, 1, 24, 1, 25, 4, 25, 130, 8, 25, 11, 25, 12, 25, 131, 1, 25, 1, 25, 0, 0, 26, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 0, 49, 0, 51, 24, 1, 0, 2, 2, 0, 65, 90, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 136, 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, 15, 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, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 1, 53, 1, 0, 0, 0, 3, 58, 1, 0, 0, 0, 5, 64, 1, 0, 0, 0, 7, 66, 1, 0, 0, 0, 9, 68, 1, 0, 0, 0, 11, 70, 1, 0, 0, 0, 13, 72, 1, 0, 0, 0, 15, 74, 1, 0, 0, 0, 17, 76, 1, 0, 0, 0, 19, 78, 1, 0, 0, 0, 21, 80, 1, 0, 0, 0, 23, 83, 1, 0, 0, 0, 25, 86, 1, 0, 0, 0, 27, 89, 1, 0, 0, 0, 29, 92, 1, 0, 0, 0, 31, 95, 1, 0, 0, 0, 33, 98, 1, 0, 0, 0, 35, 100, 1, 0, 0, 0, 37, 102, 1, 0, 0, 0, 39, 106, 1, 0, 0, 0, 41, 108, 1, 0, 0, 0, 43, 111, 1, 0, 0, 0, 45, 120, 1, 0, 0, 0, 47, 124, 1, 0, 0, 0, 49, 126, 1, 0, 0, 0, 51, 129, 1, 0, 0, 0, 53, 54, 5, 116, 0, 0, 54, 55, 5, 114, 0, 0, 55, 56, 5, 117, 0, 0, 56, 57, 5, 101, 0, 0, 57, 2, 1, 0, 0, 0, 58, 59, 5, 102, 0, 0, 59, 60, 5, 97, 0, 0, 60, 61, 5, 108, 0, 0, 61, 62, 5, 115, 0, 0, 62, 63, 5, 101, 0, 0, 63, 4, 1, 0, 0, 0, 64, 65, 5, 40, 0, 0, 65, 6, 1, 0, 0, 0, 66, 67, 5, 43, 0, 0, 67, 8, 1, 0, 0, 0, 68, 69, 5, 41, 0, 0, 69, 10, 1, 0, 0, 0, 70, 71, 5, 45, 0, 0, 71, 12, 1, 0, 0, 0, 72, 73, 5, 42, 0, 0, 73, 14, 1, 0, 0, 0, 74, 75, 5, 47, 0, 0, 75, 16, 1, 0, 0, 0, 76, 77, 5, 62, 0, 0, 77, 18, 1, 0, 0, 0, 78, 79, 5, 60, 0, 0, 79, 20, 1, 0, 0, 0, 80, 81, 5, 61, 0, 0, 81, 82, 5, 61, 0, 0, 82, 22, 1, 0, 0, 0, 83, 84, 5, 60, 0, 0, 84, 85, 5, 60, 0, 0, 85, 24, 1, 0, 0, 0, 86, 87, 5, 62, 0, 0, 87, 88, 5, 62, 0, 0, 88, 26, 1, 0, 0, 0, 89, 90, 5, 38, 0, 0, 90, 91, 5, 38, 0, 0, 91, 28, 1, 0, 0, 0, 92, 93, 5, 124, 0, 0, 93, 94, 5, 124, 0, 0, 94, 30, 1, 0, 0, 0, 95, 96, 5, 94, 0, 0, 96, 97, 5, 94, 0, 0, 97, 32, 1, 0, 0, 0, 98, 99, 5, 58, 0, 0, 99, 34, 1, 0, 0, 0, 100, 101, 5, 44, 0, 0, 101, 36, 1, 0, 0, 0, 102, 103, 5, 108, 0, 0, 103, 104, 5, 101, 0, 0, 104, 105, 5, 116, 0, 0, 105, 38, 1, 0, 0, 0, 106, 107, 5, 61, 0, 0, 107, 40, 1, 0, 0, 0, 108, 109, 5, 105, 0, 0, 109, 110, 5, 110, 0, 0, 110, 42, 1, 0, 0, 0, 111, 116, 3, 47, 23, 0, 112, 115, 3, 47, 23, 0, 113, 115, 3, 49, 24, 0, 114, 112, 1, 0, 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, 44, 1, 0, 0, 0, 118, 116, 1, 0, 0, 0, 119, 121, 3, 49, 24, 0, 120, 119, 1, 0, 0, 0, 121, 122, 1, 0, 0, 0, 122, 120, 1, 0, 0, 0, 122, 123, 1, 0, 0, 0, 123, 46, 1, 0, 0, 0, 124, 125, 7, 0, 0, 0, 125, 48, 1, 0, 0, 0, 126, 127, 2, 48, 57, 0, 127, 50, 1, 0, 0, 0, 128, 130, 7, 1, 0, 0, 129, 128, 1, 0, 0, 0, 130, 131, 1, 0, 0, 0, 131, 129, 1, 0, 0, 0, 131, 132, 1, 0, 0, 0, 132, 133, 1, 0, 0, 0, 133, 134, 6, 25, 0, 0, 134, 52, 1, 0, 0, 0, 5, 0, 114, 116, 122, 131, 1, 6, 0, 0] \ No newline at end of file +[4, 0, 28, 167, 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, 2, 15, 7, 15, 2, 16, 7, 16, 2, 17, 7, 17, 2, 18, 7, 18, 2, 19, 7, 19, 2, 20, 7, 20, 2, 21, 7, 21, 2, 22, 7, 22, 2, 23, 7, 23, 2, 24, 7, 24, 2, 25, 7, 25, 2, 26, 7, 26, 2, 27, 7, 27, 2, 28, 7, 28, 2, 29, 7, 29, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 1, 2, 1, 3, 1, 3, 1, 4, 1, 4, 1, 5, 1, 5, 1, 6, 1, 6, 1, 7, 1, 7, 1, 8, 1, 8, 1, 9, 1, 9, 1, 10, 1, 10, 1, 10, 1, 11, 1, 11, 1, 11, 1, 12, 1, 12, 1, 12, 1, 13, 1, 13, 1, 13, 1, 14, 1, 14, 1, 14, 1, 15, 1, 15, 1, 15, 1, 16, 1, 16, 1, 17, 1, 17, 1, 18, 1, 18, 1, 18, 1, 18, 1, 19, 1, 19, 1, 20, 1, 20, 1, 20, 1, 21, 1, 21, 1, 21, 1, 22, 1, 22, 1, 22, 1, 22, 1, 22, 1, 23, 1, 23, 1, 23, 1, 23, 1, 23, 1, 24, 1, 24, 1, 24, 5, 24, 136, 8, 24, 10, 24, 12, 24, 139, 9, 24, 1, 25, 4, 25, 142, 8, 25, 11, 25, 12, 25, 143, 1, 26, 1, 26, 1, 26, 1, 26, 5, 26, 150, 8, 26, 10, 26, 12, 26, 153, 9, 26, 1, 26, 1, 26, 1, 27, 1, 27, 1, 28, 1, 28, 1, 29, 4, 29, 162, 8, 29, 11, 29, 12, 29, 163, 1, 29, 1, 29, 0, 0, 30, 1, 1, 3, 2, 5, 3, 7, 4, 9, 5, 11, 6, 13, 7, 15, 8, 17, 9, 19, 10, 21, 11, 23, 12, 25, 13, 27, 14, 29, 15, 31, 16, 33, 17, 35, 18, 37, 19, 39, 20, 41, 21, 43, 22, 45, 23, 47, 24, 49, 25, 51, 26, 53, 27, 55, 0, 57, 0, 59, 28, 1, 0, 3, 2, 0, 34, 34, 94, 94, 2, 0, 65, 90, 97, 122, 3, 0, 9, 10, 13, 13, 32, 32, 170, 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, 15, 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, 0, 31, 1, 0, 0, 0, 0, 33, 1, 0, 0, 0, 0, 35, 1, 0, 0, 0, 0, 37, 1, 0, 0, 0, 0, 39, 1, 0, 0, 0, 0, 41, 1, 0, 0, 0, 0, 43, 1, 0, 0, 0, 0, 45, 1, 0, 0, 0, 0, 47, 1, 0, 0, 0, 0, 49, 1, 0, 0, 0, 0, 51, 1, 0, 0, 0, 0, 53, 1, 0, 0, 0, 0, 59, 1, 0, 0, 0, 1, 61, 1, 0, 0, 0, 3, 66, 1, 0, 0, 0, 5, 72, 1, 0, 0, 0, 7, 74, 1, 0, 0, 0, 9, 76, 1, 0, 0, 0, 11, 78, 1, 0, 0, 0, 13, 80, 1, 0, 0, 0, 15, 82, 1, 0, 0, 0, 17, 84, 1, 0, 0, 0, 19, 86, 1, 0, 0, 0, 21, 88, 1, 0, 0, 0, 23, 91, 1, 0, 0, 0, 25, 94, 1, 0, 0, 0, 27, 97, 1, 0, 0, 0, 29, 100, 1, 0, 0, 0, 31, 103, 1, 0, 0, 0, 33, 106, 1, 0, 0, 0, 35, 108, 1, 0, 0, 0, 37, 110, 1, 0, 0, 0, 39, 114, 1, 0, 0, 0, 41, 116, 1, 0, 0, 0, 43, 119, 1, 0, 0, 0, 45, 122, 1, 0, 0, 0, 47, 127, 1, 0, 0, 0, 49, 132, 1, 0, 0, 0, 51, 141, 1, 0, 0, 0, 53, 145, 1, 0, 0, 0, 55, 156, 1, 0, 0, 0, 57, 158, 1, 0, 0, 0, 59, 161, 1, 0, 0, 0, 61, 62, 5, 116, 0, 0, 62, 63, 5, 114, 0, 0, 63, 64, 5, 117, 0, 0, 64, 65, 5, 101, 0, 0, 65, 2, 1, 0, 0, 0, 66, 67, 5, 102, 0, 0, 67, 68, 5, 97, 0, 0, 68, 69, 5, 108, 0, 0, 69, 70, 5, 115, 0, 0, 70, 71, 5, 101, 0, 0, 71, 4, 1, 0, 0, 0, 72, 73, 5, 40, 0, 0, 73, 6, 1, 0, 0, 0, 74, 75, 5, 43, 0, 0, 75, 8, 1, 0, 0, 0, 76, 77, 5, 41, 0, 0, 77, 10, 1, 0, 0, 0, 78, 79, 5, 45, 0, 0, 79, 12, 1, 0, 0, 0, 80, 81, 5, 42, 0, 0, 81, 14, 1, 0, 0, 0, 82, 83, 5, 47, 0, 0, 83, 16, 1, 0, 0, 0, 84, 85, 5, 62, 0, 0, 85, 18, 1, 0, 0, 0, 86, 87, 5, 60, 0, 0, 87, 20, 1, 0, 0, 0, 88, 89, 5, 61, 0, 0, 89, 90, 5, 61, 0, 0, 90, 22, 1, 0, 0, 0, 91, 92, 5, 60, 0, 0, 92, 93, 5, 60, 0, 0, 93, 24, 1, 0, 0, 0, 94, 95, 5, 62, 0, 0, 95, 96, 5, 62, 0, 0, 96, 26, 1, 0, 0, 0, 97, 98, 5, 38, 0, 0, 98, 99, 5, 38, 0, 0, 99, 28, 1, 0, 0, 0, 100, 101, 5, 124, 0, 0, 101, 102, 5, 124, 0, 0, 102, 30, 1, 0, 0, 0, 103, 104, 5, 94, 0, 0, 104, 105, 5, 94, 0, 0, 105, 32, 1, 0, 0, 0, 106, 107, 5, 44, 0, 0, 107, 34, 1, 0, 0, 0, 108, 109, 5, 58, 0, 0, 109, 36, 1, 0, 0, 0, 110, 111, 5, 108, 0, 0, 111, 112, 5, 101, 0, 0, 112, 113, 5, 116, 0, 0, 113, 38, 1, 0, 0, 0, 114, 115, 5, 61, 0, 0, 115, 40, 1, 0, 0, 0, 116, 117, 5, 105, 0, 0, 117, 118, 5, 110, 0, 0, 118, 42, 1, 0, 0, 0, 119, 120, 5, 105, 0, 0, 120, 121, 5, 102, 0, 0, 121, 44, 1, 0, 0, 0, 122, 123, 5, 116, 0, 0, 123, 124, 5, 104, 0, 0, 124, 125, 5, 101, 0, 0, 125, 126, 5, 110, 0, 0, 126, 46, 1, 0, 0, 0, 127, 128, 5, 101, 0, 0, 128, 129, 5, 108, 0, 0, 129, 130, 5, 115, 0, 0, 130, 131, 5, 101, 0, 0, 131, 48, 1, 0, 0, 0, 132, 137, 3, 55, 27, 0, 133, 136, 3, 55, 27, 0, 134, 136, 3, 57, 28, 0, 135, 133, 1, 0, 0, 0, 135, 134, 1, 0, 0, 0, 136, 139, 1, 0, 0, 0, 137, 135, 1, 0, 0, 0, 137, 138, 1, 0, 0, 0, 138, 50, 1, 0, 0, 0, 139, 137, 1, 0, 0, 0, 140, 142, 3, 57, 28, 0, 141, 140, 1, 0, 0, 0, 142, 143, 1, 0, 0, 0, 143, 141, 1, 0, 0, 0, 143, 144, 1, 0, 0, 0, 144, 52, 1, 0, 0, 0, 145, 151, 5, 34, 0, 0, 146, 150, 7, 0, 0, 0, 147, 148, 5, 92, 0, 0, 148, 150, 9, 0, 0, 0, 149, 146, 1, 0, 0, 0, 149, 147, 1, 0, 0, 0, 150, 153, 1, 0, 0, 0, 151, 149, 1, 0, 0, 0, 151, 152, 1, 0, 0, 0, 152, 154, 1, 0, 0, 0, 153, 151, 1, 0, 0, 0, 154, 155, 5, 34, 0, 0, 155, 54, 1, 0, 0, 0, 156, 157, 7, 1, 0, 0, 157, 56, 1, 0, 0, 0, 158, 159, 2, 48, 57, 0, 159, 58, 1, 0, 0, 0, 160, 162, 7, 2, 0, 0, 161, 160, 1, 0, 0, 0, 162, 163, 1, 0, 0, 0, 163, 161, 1, 0, 0, 0, 163, 164, 1, 0, 0, 0, 164, 165, 1, 0, 0, 0, 165, 166, 6, 29, 0, 0, 166, 60, 1, 0, 0, 0, 7, 0, 135, 137, 143, 149, 151, 163, 1, 6, 0, 0] \ No newline at end of file diff --git a/gen/ANFLexer.py b/gen/ANFLexer.py index baf7806..2e8b074 100644 --- a/gen/ANFLexer.py +++ b/gen/ANFLexer.py @@ -10,51 +10,63 @@ else: def serializedATN(): return [ - 4,0,24,135,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,28,167,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,2,15,7,15,2,16,7,16,2,17,7,17,2,18,7,18,2,19,7, - 19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,1, - 0,1,0,1,0,1,0,1,0,1,1,1,1,1,1,1,1,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1, - 4,1,5,1,5,1,6,1,6,1,7,1,7,1,8,1,8,1,9,1,9,1,10,1,10,1,10,1,11,1, - 11,1,11,1,12,1,12,1,12,1,13,1,13,1,13,1,14,1,14,1,14,1,15,1,15,1, - 15,1,16,1,16,1,17,1,17,1,18,1,18,1,18,1,18,1,19,1,19,1,20,1,20,1, - 20,1,21,1,21,1,21,5,21,115,8,21,10,21,12,21,118,9,21,1,22,4,22,121, - 8,22,11,22,12,22,122,1,23,1,23,1,24,1,24,1,25,4,25,130,8,25,11,25, - 12,25,131,1,25,1,25,0,0,26,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17, - 9,19,10,21,11,23,12,25,13,27,14,29,15,31,16,33,17,35,18,37,19,39, - 20,41,21,43,22,45,23,47,0,49,0,51,24,1,0,2,2,0,65,90,97,122,3,0, - 9,10,13,13,32,32,136,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,15,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,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0,0,0,0,37,1,0, - 0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,0,0,45,1,0,0,0,0,51,1,0, - 0,0,1,53,1,0,0,0,3,58,1,0,0,0,5,64,1,0,0,0,7,66,1,0,0,0,9,68,1,0, - 0,0,11,70,1,0,0,0,13,72,1,0,0,0,15,74,1,0,0,0,17,76,1,0,0,0,19,78, - 1,0,0,0,21,80,1,0,0,0,23,83,1,0,0,0,25,86,1,0,0,0,27,89,1,0,0,0, - 29,92,1,0,0,0,31,95,1,0,0,0,33,98,1,0,0,0,35,100,1,0,0,0,37,102, - 1,0,0,0,39,106,1,0,0,0,41,108,1,0,0,0,43,111,1,0,0,0,45,120,1,0, - 0,0,47,124,1,0,0,0,49,126,1,0,0,0,51,129,1,0,0,0,53,54,5,116,0,0, - 54,55,5,114,0,0,55,56,5,117,0,0,56,57,5,101,0,0,57,2,1,0,0,0,58, - 59,5,102,0,0,59,60,5,97,0,0,60,61,5,108,0,0,61,62,5,115,0,0,62,63, - 5,101,0,0,63,4,1,0,0,0,64,65,5,40,0,0,65,6,1,0,0,0,66,67,5,43,0, - 0,67,8,1,0,0,0,68,69,5,41,0,0,69,10,1,0,0,0,70,71,5,45,0,0,71,12, - 1,0,0,0,72,73,5,42,0,0,73,14,1,0,0,0,74,75,5,47,0,0,75,16,1,0,0, - 0,76,77,5,62,0,0,77,18,1,0,0,0,78,79,5,60,0,0,79,20,1,0,0,0,80,81, - 5,61,0,0,81,82,5,61,0,0,82,22,1,0,0,0,83,84,5,60,0,0,84,85,5,60, - 0,0,85,24,1,0,0,0,86,87,5,62,0,0,87,88,5,62,0,0,88,26,1,0,0,0,89, - 90,5,38,0,0,90,91,5,38,0,0,91,28,1,0,0,0,92,93,5,124,0,0,93,94,5, - 124,0,0,94,30,1,0,0,0,95,96,5,94,0,0,96,97,5,94,0,0,97,32,1,0,0, - 0,98,99,5,58,0,0,99,34,1,0,0,0,100,101,5,44,0,0,101,36,1,0,0,0,102, - 103,5,108,0,0,103,104,5,101,0,0,104,105,5,116,0,0,105,38,1,0,0,0, - 106,107,5,61,0,0,107,40,1,0,0,0,108,109,5,105,0,0,109,110,5,110, - 0,0,110,42,1,0,0,0,111,116,3,47,23,0,112,115,3,47,23,0,113,115,3, - 49,24,0,114,112,1,0,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,44,1,0,0,0,118,116,1,0,0,0,119,121,3, - 49,24,0,120,119,1,0,0,0,121,122,1,0,0,0,122,120,1,0,0,0,122,123, - 1,0,0,0,123,46,1,0,0,0,124,125,7,0,0,0,125,48,1,0,0,0,126,127,2, - 48,57,0,127,50,1,0,0,0,128,130,7,1,0,0,129,128,1,0,0,0,130,131,1, - 0,0,0,131,129,1,0,0,0,131,132,1,0,0,0,132,133,1,0,0,0,133,134,6, - 25,0,0,134,52,1,0,0,0,5,0,114,116,122,131,1,6,0,0 + 19,2,20,7,20,2,21,7,21,2,22,7,22,2,23,7,23,2,24,7,24,2,25,7,25,2, + 26,7,26,2,27,7,27,2,28,7,28,2,29,7,29,1,0,1,0,1,0,1,0,1,0,1,1,1, + 1,1,1,1,1,1,1,1,1,1,2,1,2,1,3,1,3,1,4,1,4,1,5,1,5,1,6,1,6,1,7,1, + 7,1,8,1,8,1,9,1,9,1,10,1,10,1,10,1,11,1,11,1,11,1,12,1,12,1,12,1, + 13,1,13,1,13,1,14,1,14,1,14,1,15,1,15,1,15,1,16,1,16,1,17,1,17,1, + 18,1,18,1,18,1,18,1,19,1,19,1,20,1,20,1,20,1,21,1,21,1,21,1,22,1, + 22,1,22,1,22,1,22,1,23,1,23,1,23,1,23,1,23,1,24,1,24,1,24,5,24,136, + 8,24,10,24,12,24,139,9,24,1,25,4,25,142,8,25,11,25,12,25,143,1,26, + 1,26,1,26,1,26,5,26,150,8,26,10,26,12,26,153,9,26,1,26,1,26,1,27, + 1,27,1,28,1,28,1,29,4,29,162,8,29,11,29,12,29,163,1,29,1,29,0,0, + 30,1,1,3,2,5,3,7,4,9,5,11,6,13,7,15,8,17,9,19,10,21,11,23,12,25, + 13,27,14,29,15,31,16,33,17,35,18,37,19,39,20,41,21,43,22,45,23,47, + 24,49,25,51,26,53,27,55,0,57,0,59,28,1,0,3,2,0,34,34,94,94,2,0,65, + 90,97,122,3,0,9,10,13,13,32,32,170,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,15,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,0,31,1,0,0,0,0,33,1,0,0,0,0,35,1,0, + 0,0,0,37,1,0,0,0,0,39,1,0,0,0,0,41,1,0,0,0,0,43,1,0,0,0,0,45,1,0, + 0,0,0,47,1,0,0,0,0,49,1,0,0,0,0,51,1,0,0,0,0,53,1,0,0,0,0,59,1,0, + 0,0,1,61,1,0,0,0,3,66,1,0,0,0,5,72,1,0,0,0,7,74,1,0,0,0,9,76,1,0, + 0,0,11,78,1,0,0,0,13,80,1,0,0,0,15,82,1,0,0,0,17,84,1,0,0,0,19,86, + 1,0,0,0,21,88,1,0,0,0,23,91,1,0,0,0,25,94,1,0,0,0,27,97,1,0,0,0, + 29,100,1,0,0,0,31,103,1,0,0,0,33,106,1,0,0,0,35,108,1,0,0,0,37,110, + 1,0,0,0,39,114,1,0,0,0,41,116,1,0,0,0,43,119,1,0,0,0,45,122,1,0, + 0,0,47,127,1,0,0,0,49,132,1,0,0,0,51,141,1,0,0,0,53,145,1,0,0,0, + 55,156,1,0,0,0,57,158,1,0,0,0,59,161,1,0,0,0,61,62,5,116,0,0,62, + 63,5,114,0,0,63,64,5,117,0,0,64,65,5,101,0,0,65,2,1,0,0,0,66,67, + 5,102,0,0,67,68,5,97,0,0,68,69,5,108,0,0,69,70,5,115,0,0,70,71,5, + 101,0,0,71,4,1,0,0,0,72,73,5,40,0,0,73,6,1,0,0,0,74,75,5,43,0,0, + 75,8,1,0,0,0,76,77,5,41,0,0,77,10,1,0,0,0,78,79,5,45,0,0,79,12,1, + 0,0,0,80,81,5,42,0,0,81,14,1,0,0,0,82,83,5,47,0,0,83,16,1,0,0,0, + 84,85,5,62,0,0,85,18,1,0,0,0,86,87,5,60,0,0,87,20,1,0,0,0,88,89, + 5,61,0,0,89,90,5,61,0,0,90,22,1,0,0,0,91,92,5,60,0,0,92,93,5,60, + 0,0,93,24,1,0,0,0,94,95,5,62,0,0,95,96,5,62,0,0,96,26,1,0,0,0,97, + 98,5,38,0,0,98,99,5,38,0,0,99,28,1,0,0,0,100,101,5,124,0,0,101,102, + 5,124,0,0,102,30,1,0,0,0,103,104,5,94,0,0,104,105,5,94,0,0,105,32, + 1,0,0,0,106,107,5,44,0,0,107,34,1,0,0,0,108,109,5,58,0,0,109,36, + 1,0,0,0,110,111,5,108,0,0,111,112,5,101,0,0,112,113,5,116,0,0,113, + 38,1,0,0,0,114,115,5,61,0,0,115,40,1,0,0,0,116,117,5,105,0,0,117, + 118,5,110,0,0,118,42,1,0,0,0,119,120,5,105,0,0,120,121,5,102,0,0, + 121,44,1,0,0,0,122,123,5,116,0,0,123,124,5,104,0,0,124,125,5,101, + 0,0,125,126,5,110,0,0,126,46,1,0,0,0,127,128,5,101,0,0,128,129,5, + 108,0,0,129,130,5,115,0,0,130,131,5,101,0,0,131,48,1,0,0,0,132,137, + 3,55,27,0,133,136,3,55,27,0,134,136,3,57,28,0,135,133,1,0,0,0,135, + 134,1,0,0,0,136,139,1,0,0,0,137,135,1,0,0,0,137,138,1,0,0,0,138, + 50,1,0,0,0,139,137,1,0,0,0,140,142,3,57,28,0,141,140,1,0,0,0,142, + 143,1,0,0,0,143,141,1,0,0,0,143,144,1,0,0,0,144,52,1,0,0,0,145,151, + 5,34,0,0,146,150,7,0,0,0,147,148,5,92,0,0,148,150,9,0,0,0,149,146, + 1,0,0,0,149,147,1,0,0,0,150,153,1,0,0,0,151,149,1,0,0,0,151,152, + 1,0,0,0,152,154,1,0,0,0,153,151,1,0,0,0,154,155,5,34,0,0,155,54, + 1,0,0,0,156,157,7,1,0,0,157,56,1,0,0,0,158,159,2,48,57,0,159,58, + 1,0,0,0,160,162,7,2,0,0,161,160,1,0,0,0,162,163,1,0,0,0,163,161, + 1,0,0,0,163,164,1,0,0,0,164,165,1,0,0,0,165,166,6,29,0,0,166,60, + 1,0,0,0,7,0,135,137,143,149,151,163,1,6,0,0 ] class ANFLexer(Lexer): @@ -84,9 +96,13 @@ class ANFLexer(Lexer): T__18 = 19 T__19 = 20 T__20 = 21 - IDENT = 22 - NUMBER = 23 - WS = 24 + T__21 = 22 + T__22 = 23 + T__23 = 24 + IDENT = 25 + NUMBER = 26 + STRING = 27 + WS = 28 channelNames = [ u"DEFAULT_TOKEN_CHANNEL", u"HIDDEN" ] @@ -95,15 +111,16 @@ class ANFLexer(Lexer): literalNames = [ "<INVALID>", "'true'", "'false'", "'('", "'+'", "')'", "'-'", "'*'", "'/'", "'>'", "'<'", "'=='", "'<<'", "'>>'", "'&&'", "'||'", "'^^'", - "':'", "','", "'let'", "'='", "'in'" ] + "','", "':'", "'let'", "'='", "'in'", "'if'", "'then'", "'else'" ] symbolicNames = [ "<INVALID>", - "IDENT", "NUMBER", "WS" ] + "IDENT", "NUMBER", "STRING", "WS" ] ruleNames = [ "T__0", "T__1", "T__2", "T__3", "T__4", "T__5", "T__6", "T__7", "T__8", "T__9", "T__10", "T__11", "T__12", "T__13", "T__14", "T__15", "T__16", "T__17", "T__18", "T__19", - "T__20", "IDENT", "NUMBER", "Letter", "Digit", "WS" ] + "T__20", "T__21", "T__22", "T__23", "IDENT", "NUMBER", + "STRING", "Letter", "Digit", "WS" ] grammarFileName = "ANF.g4" diff --git a/gen/ANFLexer.tokens b/gen/ANFLexer.tokens index 9b90376..e34ce0c 100644 --- a/gen/ANFLexer.tokens +++ b/gen/ANFLexer.tokens @@ -19,9 +19,13 @@ T__17=18 T__18=19 T__19=20 T__20=21 -IDENT=22 -NUMBER=23 -WS=24 +T__21=22 +T__22=23 +T__23=24 +IDENT=25 +NUMBER=26 +STRING=27 +WS=28 'true'=1 'false'=2 '('=3 @@ -38,8 +42,11 @@ WS=24 '&&'=14 '||'=15 '^^'=16 -':'=17 -','=18 +','=17 +':'=18 'let'=19 '='=20 'in'=21 +'if'=22 +'then'=23 +'else'=24 diff --git a/gen/ANFListener.py b/gen/ANFListener.py index cb5ec92..23c8c41 100644 --- a/gen/ANFListener.py +++ b/gen/ANFListener.py @@ -188,6 +188,15 @@ class ANFListener(ParseTreeListener): pass + # Enter a parse tree produced by ANFParser#if. + def enterIf(self, ctx:ANFParser.IfContext): + pass + + # Exit a parse tree produced by ANFParser#if. + def exitIf(self, ctx:ANFParser.IfContext): + pass + + # Enter a parse tree produced by ANFParser#fc. def enterFc(self, ctx:ANFParser.FcContext): pass diff --git a/gen/ANFParser.py b/gen/ANFParser.py index b26614b..2b7df41 100644 --- a/gen/ANFParser.py +++ b/gen/ANFParser.py @@ -10,44 +10,49 @@ else: def serializedATN(): return [ - 4,1,24,116,2,0,7,0,2,1,7,1,2,2,7,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, + 4,1,28,130,2,0,7,0,2,1,7,1,2,2,7,2,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1, - 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,3,0,89,8,0,1,1,1,1,1,1, - 1,1,1,1,5,1,96,8,1,10,1,12,1,99,9,1,1,1,1,1,1,1,3,1,104,8,1,1,2, - 1,2,1,2,1,2,1,2,1,2,1,2,1,2,3,2,114,8,2,1,2,0,0,3,0,2,4,0,0,131, - 0,88,1,0,0,0,2,103,1,0,0,0,4,113,1,0,0,0,6,89,5,1,0,0,7,89,5,2,0, - 0,8,89,5,22,0,0,9,89,5,23,0,0,10,11,5,3,0,0,11,12,3,0,0,0,12,13, - 5,4,0,0,13,14,3,0,0,0,14,15,5,5,0,0,15,89,1,0,0,0,16,17,5,3,0,0, - 17,18,3,0,0,0,18,19,5,6,0,0,19,20,3,0,0,0,20,21,5,5,0,0,21,89,1, + 0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,1,0,5,0,87,8,0,10,0,12,0,90,9,0,1, + 0,1,0,1,0,1,0,3,0,96,8,0,1,1,1,1,1,1,1,1,1,1,5,1,103,8,1,10,1,12, + 1,106,9,1,1,1,1,1,1,1,3,1,111,8,1,1,2,1,2,1,2,1,2,1,2,1,2,1,2,1, + 2,1,2,1,2,1,2,1,2,1,2,1,2,1,2,3,2,128,8,2,1,2,0,0,3,0,2,4,0,0,147, + 0,95,1,0,0,0,2,110,1,0,0,0,4,127,1,0,0,0,6,96,5,1,0,0,7,96,5,2,0, + 0,8,96,5,25,0,0,9,96,5,26,0,0,10,11,5,3,0,0,11,12,3,0,0,0,12,13, + 5,4,0,0,13,14,3,0,0,0,14,15,5,5,0,0,15,96,1,0,0,0,16,17,5,3,0,0, + 17,18,3,0,0,0,18,19,5,6,0,0,19,20,3,0,0,0,20,21,5,5,0,0,21,96,1, 0,0,0,22,23,5,3,0,0,23,24,3,0,0,0,24,25,5,7,0,0,25,26,3,0,0,0,26, - 27,5,5,0,0,27,89,1,0,0,0,28,29,5,3,0,0,29,30,3,0,0,0,30,31,5,8,0, - 0,31,32,3,0,0,0,32,33,5,5,0,0,33,89,1,0,0,0,34,35,5,3,0,0,35,36, - 3,0,0,0,36,37,5,9,0,0,37,38,3,0,0,0,38,39,5,5,0,0,39,89,1,0,0,0, + 27,5,5,0,0,27,96,1,0,0,0,28,29,5,3,0,0,29,30,3,0,0,0,30,31,5,8,0, + 0,31,32,3,0,0,0,32,33,5,5,0,0,33,96,1,0,0,0,34,35,5,3,0,0,35,36, + 3,0,0,0,36,37,5,9,0,0,37,38,3,0,0,0,38,39,5,5,0,0,39,96,1,0,0,0, 40,41,5,3,0,0,41,42,3,0,0,0,42,43,5,10,0,0,43,44,3,0,0,0,44,45,5, - 5,0,0,45,89,1,0,0,0,46,47,5,3,0,0,47,48,3,0,0,0,48,49,5,11,0,0,49, - 50,3,0,0,0,50,51,5,5,0,0,51,89,1,0,0,0,52,53,5,3,0,0,53,54,3,0,0, - 0,54,55,5,12,0,0,55,56,3,0,0,0,56,57,5,5,0,0,57,89,1,0,0,0,58,59, + 5,0,0,45,96,1,0,0,0,46,47,5,3,0,0,47,48,3,0,0,0,48,49,5,11,0,0,49, + 50,3,0,0,0,50,51,5,5,0,0,51,96,1,0,0,0,52,53,5,3,0,0,53,54,3,0,0, + 0,54,55,5,12,0,0,55,56,3,0,0,0,56,57,5,5,0,0,57,96,1,0,0,0,58,59, 5,3,0,0,59,60,3,0,0,0,60,61,5,13,0,0,61,62,3,0,0,0,62,63,5,5,0,0, - 63,89,1,0,0,0,64,65,5,3,0,0,65,66,3,0,0,0,66,67,5,14,0,0,67,68,3, - 0,0,0,68,69,5,5,0,0,69,89,1,0,0,0,70,71,5,3,0,0,71,72,3,0,0,0,72, - 73,5,15,0,0,73,74,3,0,0,0,74,75,5,5,0,0,75,89,1,0,0,0,76,77,5,3, + 63,96,1,0,0,0,64,65,5,3,0,0,65,66,3,0,0,0,66,67,5,14,0,0,67,68,3, + 0,0,0,68,69,5,5,0,0,69,96,1,0,0,0,70,71,5,3,0,0,71,72,3,0,0,0,72, + 73,5,15,0,0,73,74,3,0,0,0,74,75,5,5,0,0,75,96,1,0,0,0,76,77,5,3, 0,0,77,78,3,0,0,0,78,79,5,16,0,0,79,80,3,0,0,0,80,81,5,5,0,0,81, - 89,1,0,0,0,82,83,5,3,0,0,83,84,5,22,0,0,84,85,5,17,0,0,85,86,3,4, - 2,0,86,87,5,5,0,0,87,89,1,0,0,0,88,6,1,0,0,0,88,7,1,0,0,0,88,8,1, - 0,0,0,88,9,1,0,0,0,88,10,1,0,0,0,88,16,1,0,0,0,88,22,1,0,0,0,88, - 28,1,0,0,0,88,34,1,0,0,0,88,40,1,0,0,0,88,46,1,0,0,0,88,52,1,0,0, - 0,88,58,1,0,0,0,88,64,1,0,0,0,88,70,1,0,0,0,88,76,1,0,0,0,88,82, - 1,0,0,0,89,1,1,0,0,0,90,91,5,22,0,0,91,92,5,3,0,0,92,97,3,0,0,0, - 93,94,5,18,0,0,94,96,3,0,0,0,95,93,1,0,0,0,96,99,1,0,0,0,97,95,1, - 0,0,0,97,98,1,0,0,0,98,100,1,0,0,0,99,97,1,0,0,0,100,101,5,5,0,0, - 101,104,1,0,0,0,102,104,3,0,0,0,103,90,1,0,0,0,103,102,1,0,0,0,104, - 3,1,0,0,0,105,106,5,19,0,0,106,107,5,22,0,0,107,108,5,20,0,0,108, - 109,3,2,1,0,109,110,5,21,0,0,110,111,3,4,2,0,111,114,1,0,0,0,112, - 114,3,2,1,0,113,105,1,0,0,0,113,112,1,0,0,0,114,5,1,0,0,0,4,88,97, - 103,113 + 96,1,0,0,0,82,83,5,3,0,0,83,88,5,25,0,0,84,85,5,17,0,0,85,87,5,25, + 0,0,86,84,1,0,0,0,87,90,1,0,0,0,88,86,1,0,0,0,88,89,1,0,0,0,89,91, + 1,0,0,0,90,88,1,0,0,0,91,92,5,18,0,0,92,93,3,4,2,0,93,94,5,5,0,0, + 94,96,1,0,0,0,95,6,1,0,0,0,95,7,1,0,0,0,95,8,1,0,0,0,95,9,1,0,0, + 0,95,10,1,0,0,0,95,16,1,0,0,0,95,22,1,0,0,0,95,28,1,0,0,0,95,34, + 1,0,0,0,95,40,1,0,0,0,95,46,1,0,0,0,95,52,1,0,0,0,95,58,1,0,0,0, + 95,64,1,0,0,0,95,70,1,0,0,0,95,76,1,0,0,0,95,82,1,0,0,0,96,1,1,0, + 0,0,97,98,5,25,0,0,98,99,5,3,0,0,99,104,3,0,0,0,100,101,5,17,0,0, + 101,103,3,0,0,0,102,100,1,0,0,0,103,106,1,0,0,0,104,102,1,0,0,0, + 104,105,1,0,0,0,105,107,1,0,0,0,106,104,1,0,0,0,107,108,5,5,0,0, + 108,111,1,0,0,0,109,111,3,0,0,0,110,97,1,0,0,0,110,109,1,0,0,0,111, + 3,1,0,0,0,112,113,5,19,0,0,113,114,5,25,0,0,114,115,5,20,0,0,115, + 116,3,2,1,0,116,117,5,21,0,0,117,118,3,4,2,0,118,128,1,0,0,0,119, + 120,5,22,0,0,120,121,3,0,0,0,121,122,5,23,0,0,122,123,3,4,2,0,123, + 124,5,24,0,0,124,125,3,4,2,0,125,128,1,0,0,0,126,128,3,2,1,0,127, + 112,1,0,0,0,127,119,1,0,0,0,127,126,1,0,0,0,128,5,1,0,0,0,5,88,95, + 104,110,127 ] class ANFParser ( Parser ): @@ -62,15 +67,16 @@ class ANFParser ( Parser ): literalNames = [ "<INVALID>", "'true'", "'false'", "'('", "'+'", "')'", "'-'", "'*'", "'/'", "'>'", "'<'", "'=='", "'<<'", - "'>>'", "'&&'", "'||'", "'^^'", "':'", "','", "'let'", - "'='", "'in'" ] + "'>>'", "'&&'", "'||'", "'^^'", "','", "':'", "'let'", + "'='", "'in'", "'if'", "'then'", "'else'" ] symbolicNames = [ "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", - "<INVALID>", "<INVALID>", "IDENT", "NUMBER", "WS" ] + "<INVALID>", "<INVALID>", "<INVALID>", "<INVALID>", + "<INVALID>", "IDENT", "NUMBER", "STRING", "WS" ] RULE_aexp = 0 RULE_funcall = 1 @@ -100,9 +106,13 @@ class ANFParser ( Parser ): T__18=19 T__19=20 T__20=21 - IDENT=22 - NUMBER=23 - WS=24 + T__21=22 + T__22=23 + T__23=24 + IDENT=25 + NUMBER=26 + STRING=27 + WS=28 def __init__(self, input:TokenStream, output:TextIO = sys.stdout): super().__init__(input, output) @@ -508,8 +518,11 @@ class ANFParser ( Parser ): super().__init__(parser) self.copyFrom(ctx) - def IDENT(self): - return self.getToken(ANFParser.IDENT, 0) + def IDENT(self, i:int=None): + if i is None: + return self.getTokens(ANFParser.IDENT) + else: + return self.getToken(ANFParser.IDENT, i) def cexp(self): return self.getTypedRuleContext(ANFParser.CexpContext,0) @@ -590,10 +603,11 @@ class ANFParser ( Parser ): localctx = ANFParser.AexpContext(self, self._ctx, self.state) self.enterRule(localctx, 0, self.RULE_aexp) + self._la = 0 # Token type try: - self.state = 88 + self.state = 95 self._errHandler.sync(self) - la_ = self._interp.adaptivePredict(self._input,0,self._ctx) + la_ = self._interp.adaptivePredict(self._input,1,self._ctx) if la_ == 1: localctx = ANFParser.TrueContext(self, localctx) self.enterOuterAlt(localctx, 1) @@ -809,11 +823,23 @@ class ANFParser ( Parser ): self.match(ANFParser.T__2) self.state = 83 self.match(ANFParser.IDENT) - self.state = 84 - self.match(ANFParser.T__16) - self.state = 85 + self.state = 88 + self._errHandler.sync(self) + _la = self._input.LA(1) + while _la==17: + self.state = 84 + self.match(ANFParser.T__16) + self.state = 85 + self.match(ANFParser.IDENT) + self.state = 90 + self._errHandler.sync(self) + _la = self._input.LA(1) + + self.state = 91 + self.match(ANFParser.T__17) + self.state = 92 self.cexp() - self.state = 86 + self.state = 93 self.match(ANFParser.T__4) pass @@ -906,38 +932,38 @@ class ANFParser ( Parser ): self.enterRule(localctx, 2, self.RULE_funcall) self._la = 0 # Token type try: - self.state = 103 + self.state = 110 self._errHandler.sync(self) - la_ = self._interp.adaptivePredict(self._input,2,self._ctx) + la_ = self._interp.adaptivePredict(self._input,3,self._ctx) if la_ == 1: localctx = ANFParser.CallContext(self, localctx) self.enterOuterAlt(localctx, 1) - self.state = 90 + self.state = 97 self.match(ANFParser.IDENT) - self.state = 91 + self.state = 98 self.match(ANFParser.T__2) - self.state = 92 + self.state = 99 self.aexp() - self.state = 97 + self.state = 104 self._errHandler.sync(self) _la = self._input.LA(1) - while _la==18: - self.state = 93 - self.match(ANFParser.T__17) - self.state = 94 + while _la==17: + self.state = 100 + self.match(ANFParser.T__16) + self.state = 101 self.aexp() - self.state = 99 + self.state = 106 self._errHandler.sync(self) _la = self._input.LA(1) - self.state = 100 + self.state = 107 self.match(ANFParser.T__4) pass elif la_ == 2: localctx = ANFParser.AtomContext(self, localctx) self.enterOuterAlt(localctx, 2) - self.state = 102 + self.state = 109 self.aexp() pass @@ -998,6 +1024,37 @@ class ANFParser ( Parser ): return visitor.visitChildren(self) + class IfContext(CexpContext): + + def __init__(self, parser, ctx:ParserRuleContext): # actually a ANFParser.CexpContext + super().__init__(parser) + self.copyFrom(ctx) + + def aexp(self): + return self.getTypedRuleContext(ANFParser.AexpContext,0) + + def cexp(self, i:int=None): + if i is None: + return self.getTypedRuleContexts(ANFParser.CexpContext) + else: + return self.getTypedRuleContext(ANFParser.CexpContext,i) + + + def enterRule(self, listener:ParseTreeListener): + if hasattr( listener, "enterIf" ): + listener.enterIf(self) + + def exitRule(self, listener:ParseTreeListener): + if hasattr( listener, "exitIf" ): + listener.exitIf(self) + + def accept(self, visitor:ParseTreeVisitor): + if hasattr( visitor, "visitIf" ): + return visitor.visitIf(self) + else: + return visitor.visitChildren(self) + + class FcContext(CexpContext): def __init__(self, parser, ctx:ParserRuleContext): # actually a ANFParser.CexpContext @@ -1029,29 +1086,45 @@ class ANFParser ( Parser ): localctx = ANFParser.CexpContext(self, self._ctx, self.state) self.enterRule(localctx, 4, self.RULE_cexp) try: - self.state = 113 + self.state = 127 self._errHandler.sync(self) token = self._input.LA(1) if token in [19]: localctx = ANFParser.LetContext(self, localctx) self.enterOuterAlt(localctx, 1) - self.state = 105 + self.state = 112 self.match(ANFParser.T__18) - self.state = 106 + self.state = 113 self.match(ANFParser.IDENT) - self.state = 107 + self.state = 114 self.match(ANFParser.T__19) - self.state = 108 + self.state = 115 self.funcall() - self.state = 109 + self.state = 116 self.match(ANFParser.T__20) - self.state = 110 + self.state = 117 self.cexp() pass - elif token in [1, 2, 3, 22, 23]: - localctx = ANFParser.FcContext(self, localctx) + elif token in [22]: + localctx = ANFParser.IfContext(self, localctx) self.enterOuterAlt(localctx, 2) - self.state = 112 + self.state = 119 + self.match(ANFParser.T__21) + self.state = 120 + self.aexp() + self.state = 121 + self.match(ANFParser.T__22) + self.state = 122 + self.cexp() + self.state = 123 + self.match(ANFParser.T__23) + self.state = 124 + self.cexp() + pass + elif token in [1, 2, 3, 25, 26]: + localctx = ANFParser.FcContext(self, localctx) + self.enterOuterAlt(localctx, 3) + self.state = 126 self.funcall() pass else: diff --git a/gen/ANFVisitor.py b/gen/ANFVisitor.py index 778df85..9d48f29 100644 --- a/gen/ANFVisitor.py +++ b/gen/ANFVisitor.py @@ -109,6 +109,11 @@ class ANFVisitor(ParseTreeVisitor): return self.visitChildren(ctx) + # Visit a parse tree produced by ANFParser#if. + def visitIf(self, ctx:ANFParser.IfContext): + return self.visitChildren(ctx) + + # Visit a parse tree produced by ANFParser#fc. def visitFc(self, ctx:ANFParser.FcContext): return self.visitChildren(ctx) |