nitrix/klang
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

removed "then" from if statement

Browse Source
This commit is contained in:
Marvin Kaiser
2019-10-29 10:32:17 +01:00
parent d43fa90bc3
commit dfefee8a71
7 changed files with 102 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/antlr4/de/hsrm/compiler/Klang/.antlr/Klang.interp
View File

@@ -2,7 +2,6 @@ token literal names:
null null
'print' 'print'
'if' 'if'
'then'
'else' 'else'
';' ';'
'{' '{'
@@ -18,7 +17,6 @@ token symbolic names:
null null
PRINT PRINT
IF IF
THEN
ELSE ELSE
SCOL SCOL
OBRK OBRK
@@ -42,4 +40,4 @@ atom
atn: atn:
[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 15, 71, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 3, 2, 3, 2, 3, 3, 7, 3, 22, 10, 3, 12, 3, 14, 3, 25, 11, 3, 3, 4, 3, 4, 7, 4, 29, 10, 4, 12, 4, 14, 4, 32, 11, 4, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 38, 10, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 5, 7, 50, 10, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 5, 8, 67, 10, 8, 3, 9, 3, 9, 3, 9, 2, 2, 10, 2, 4, 6, 8, 10, 12, 14, 16, 2, 3, 3, 2, 11, 12, 2, 70, 2, 18, 3, 2, 2, 2, 4, 23, 3, 2, 2, 2, 6, 26, 3, 2, 2, 2, 8, 37, 3, 2, 2, 2, 10, 39, 3, 2, 2, 2, 12, 43, 3, 2, 2, 2, 14, 66, 3, 2, 2, 2, 16, 68, 3, 2, 2, 2, 18, 19, 5, 4, 3, 2, 19, 3, 3, 2, 2, 2, 20, 22, 5, 8, 5, 2, 21, 20, 3, 2, 2, 2, 22, 25, 3, 2, 2, 2, 23, 21, 3, 2, 2, 2, 23, 24, 3, 2, 2, 2, 24, 5, 3, 2, 2, 2, 25, 23, 3, 2, 2, 2, 26, 30, 7, 8, 2, 2, 27, 29, 5, 8, 5, 2, 28, 27, 3, 2, 2, 2, 29, 32, 3, 2, 2, 2, 30, 28, 3, 2, 2, 2, 30, 31, 3, 2, 2, 2, 31, 33, 3, 2, 2, 2, 32, 30, 3, 2, 2, 2, 33, 34, 7, 9, 2, 2, 34, 7, 3, 2, 2, 2, 35, 38, 5, 10, 6, 2, 36, 38, 5, 12, 7, 2, 37, 35, 3, 2, 2, 2, 37, 36, 3, 2, 2, 2, 38, 9, 3, 2, 2, 2, 39, 40, 7, 3, 2, 2, 40, 41, 5, 14, 8, 2, 41, 42, 7, 7, 2, 2, 42, 11, 3, 2, 2, 2, 43, 44, 7, 4, 2, 2, 44, 45, 5, 14, 8, 2, 45, 46, 7, 5, 2, 2, 46, 49, 5, 6, 4, 2, 47, 48, 7, 6, 2, 2, 48, 50, 5, 6, 4, 2, 49, 47, 3, 2, 2, 2, 49, 50, 3, 2, 2, 2, 50, 13, 3, 2, 2, 2, 51, 52, 5, 16, 9, 2, 52, 53, 7, 10, 2, 2, 53, 54, 5, 16, 9, 2, 54, 67, 3, 2, 2, 2, 55, 56, 5, 16, 9, 2, 56, 57, 9, 2, 2, 2, 57, 58, 5, 16, 9, 2, 58, 67, 3, 2, 2, 2, 59, 60, 5, 16, 9, 2, 60, 61, 7, 13, 2, 2, 61, 62, 5, 16, 9, 2, 62, 67, 3, 2, 2, 2, 63, 64, 7, 12, 2, 2, 64, 67, 5, 16, 9, 2, 65, 67, 5, 16, 9, 2, 66, 51, 3, 2, 2, 2, 66, 55, 3, 2, 2, 2, 66, 59, 3, 2, 2, 2, 66, 63, 3, 2, 2, 2, 66, 65, 3, 2, 2, 2, 67, 15, 3, 2, 2, 2, 68, 69, 7, 14, 2, 2, 69, 17, 3, 2, 2, 2, 7, 23, 30, 37, 49, 66] [3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 14, 70, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 3, 2, 3, 2, 3, 3, 7, 3, 22, 10, 3, 12, 3, 14, 3, 25, 11, 3, 3, 4, 3, 4, 7, 4, 29, 10, 4, 12, 4, 14, 4, 32, 11, 4, 3, 4, 3, 4, 3, 5, 3, 5, 5, 5, 38, 10, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 5, 7, 49, 10, 7, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 3, 8, 5, 8, 66, 10, 8, 3, 9, 3, 9, 3, 9, 2, 2, 10, 2, 4, 6, 8, 10, 12, 14, 16, 2, 3, 3, 2, 10, 11, 2, 69, 2, 18, 3, 2, 2, 2, 4, 23, 3, 2, 2, 2, 6, 26, 3, 2, 2, 2, 8, 37, 3, 2, 2, 2, 10, 39, 3, 2, 2, 2, 12, 43, 3, 2, 2, 2, 14, 65, 3, 2, 2, 2, 16, 67, 3, 2, 2, 2, 18, 19, 5, 4, 3, 2, 19, 3, 3, 2, 2, 2, 20, 22, 5, 8, 5, 2, 21, 20, 3, 2, 2, 2, 22, 25, 3, 2, 2, 2, 23, 21, 3, 2, 2, 2, 23, 24, 3, 2, 2, 2, 24, 5, 3, 2, 2, 2, 25, 23, 3, 2, 2, 2, 26, 30, 7, 7, 2, 2, 27, 29, 5, 8, 5, 2, 28, 27, 3, 2, 2, 2, 29, 32, 3, 2, 2, 2, 30, 28, 3, 2, 2, 2, 30, 31, 3, 2, 2, 2, 31, 33, 3, 2, 2, 2, 32, 30, 3, 2, 2, 2, 33, 34, 7, 8, 2, 2, 34, 7, 3, 2, 2, 2, 35, 38, 5, 10, 6, 2, 36, 38, 5, 12, 7, 2, 37, 35, 3, 2, 2, 2, 37, 36, 3, 2, 2, 2, 38, 9, 3, 2, 2, 2, 39, 40, 7, 3, 2, 2, 40, 41, 5, 14, 8, 2, 41, 42, 7, 6, 2, 2, 42, 11, 3, 2, 2, 2, 43, 44, 7, 4, 2, 2, 44, 45, 5, 14, 8, 2, 45, 48, 5, 6, 4, 2, 46, 47, 7, 5, 2, 2, 47, 49, 5, 6, 4, 2, 48, 46, 3, 2, 2, 2, 48, 49, 3, 2, 2, 2, 49, 13, 3, 2, 2, 2, 50, 51, 5, 16, 9, 2, 51, 52, 7, 9, 2, 2, 52, 53, 5, 16, 9, 2, 53, 66, 3, 2, 2, 2, 54, 55, 5, 16, 9, 2, 55, 56, 9, 2, 2, 2, 56, 57, 5, 16, 9, 2, 57, 66, 3, 2, 2, 2, 58, 59, 5, 16, 9, 2, 59, 60, 7, 12, 2, 2, 60, 61, 5, 16, 9, 2, 61, 66, 3, 2, 2, 2, 62, 63, 7, 11, 2, 2, 63, 66, 5, 16, 9, 2, 64, 66, 5, 16, 9, 2, 65, 50, 3, 2, 2, 2, 65, 54, 3, 2, 2, 2, 65, 58, 3, 2, 2, 2, 65, 62, 3, 2, 2, 2, 65, 64, 3, 2, 2, 2, 66, 15, 3, 2, 2, 2, 67, 68, 7, 13, 2, 2, 68, 17, 3, 2, 2, 2, 7, 23, 30, 37, 48, 65]

38
src/main/antlr4/de/hsrm/compiler/Klang/.antlr/Klang.tokens
View File

@@ -1,24 +1,22 @@
PRINT=1 PRINT=1
IF=2 IF=2
THEN=3 ELSE=3
ELSE=4 SCOL=4
SCOL=5 OBRK=5
OBRK=6 CBRK=6
CBRK=7 MULT=7
MULT=8 ADD=8
ADD=9 SUB=9
SUB=10 MOD=10
MOD=11 INTEGER_LITERAL=11
INTEGER_LITERAL=12 WS=12
WS=13
'print'=1 'print'=1
'if'=2 'if'=2
'then'=3 'else'=3
'else'=4 ';'=4
';'=5 '{'=5
'{'=6 '}'=6
'}'=7 '*'=7
'*'=8 '+'=8
'+'=9 '-'=9
'-'=10 '%'=10
'%'=11

5
src/main/antlr4/de/hsrm/compiler/Klang/.antlr/KlangLexer.interp
View File

@@ -2,7 +2,6 @@ token literal names:
null null
'print' 'print'
'if' 'if'
'then'
'else' 'else'
';' ';'
'{' '{'
@@ -18,7 +17,6 @@ token symbolic names:
null null
PRINT PRINT
IF IF
THEN
ELSE ELSE
SCOL SCOL
OBRK OBRK
@@ -33,7 +31,6 @@ WS
rule names: rule names:
PRINT PRINT
IF IF
THEN
ELSE ELSE
SCOL SCOL
OBRK OBRK
@@ -53,4 +50,4 @@ mode names:
DEFAULT_MODE DEFAULT_MODE
atn: atn:
[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 15, 71, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 4, 14, 9, 14, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 3, 12, 3, 13, 6, 13, 64, 10, 13, 13, 13, 14, 13, 65, 3, 14, 3, 14, 3, 14, 3, 14, 2, 2, 15, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 27, 15, 3, 2, 4, 3, 2, 50, 59, 5, 2, 11, 12, 15, 15, 34, 34, 2, 71, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 2, 27, 3, 2, 2, 2, 3, 29, 3, 2, 2, 2, 5, 35, 3, 2, 2, 2, 7, 38, 3, 2, 2, 2, 9, 43, 3, 2, 2, 2, 11, 48, 3, 2, 2, 2, 13, 50, 3, 2, 2, 2, 15, 52, 3, 2, 2, 2, 17, 54, 3, 2, 2, 2, 19, 56, 3, 2, 2, 2, 21, 58, 3, 2, 2, 2, 23, 60, 3, 2, 2, 2, 25, 63, 3, 2, 2, 2, 27, 67, 3, 2, 2, 2, 29, 30, 7, 114, 2, 2, 30, 31, 7, 116, 2, 2, 31, 32, 7, 107, 2, 2, 32, 33, 7, 112, 2, 2, 33, 34, 7, 118, 2, 2, 34, 4, 3, 2, 2, 2, 35, 36, 7, 107, 2, 2, 36, 37, 7, 104, 2, 2, 37, 6, 3, 2, 2, 2, 38, 39, 7, 118, 2, 2, 39, 40, 7, 106, 2, 2, 40, 41, 7, 103, 2, 2, 41, 42, 7, 112, 2, 2, 42, 8, 3, 2, 2, 2, 43, 44, 7, 103, 2, 2, 44, 45, 7, 110, 2, 2, 45, 46, 7, 117, 2, 2, 46, 47, 7, 103, 2, 2, 47, 10, 3, 2, 2, 2, 48, 49, 7, 61, 2, 2, 49, 12, 3, 2, 2, 2, 50, 51, 7, 125, 2, 2, 51, 14, 3, 2, 2, 2, 52, 53, 7, 127, 2, 2, 53, 16, 3, 2, 2, 2, 54, 55, 7, 44, 2, 2, 55, 18, 3, 2, 2, 2, 56, 57, 7, 45, 2, 2, 57, 20, 3, 2, 2, 2, 58, 59, 7, 47, 2, 2, 59, 22, 3, 2, 2, 2, 60, 61, 7, 39, 2, 2, 61, 24, 3, 2, 2, 2, 62, 64, 9, 2, 2, 2, 63, 62, 3, 2, 2, 2, 64, 65, 3, 2, 2, 2, 65, 63, 3, 2, 2, 2, 65, 66, 3, 2, 2, 2, 66, 26, 3, 2, 2, 2, 67, 68, 9, 3, 2, 2, 68, 69, 3, 2, 2, 2, 69, 70, 8, 14, 2, 2, 70, 28, 3, 2, 2, 2, 4, 2, 65, 3, 8, 2, 2] [3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 14, 64, 8, 1, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 4, 8, 9, 8, 4, 9, 9, 9, 4, 10, 9, 10, 4, 11, 9, 11, 4, 12, 9, 12, 4, 13, 9, 13, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 3, 3, 4, 3, 4, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 3, 8, 3, 9, 3, 9, 3, 10, 3, 10, 3, 11, 3, 11, 3, 12, 6, 12, 57, 10, 12, 13, 12, 14, 12, 58, 3, 13, 3, 13, 3, 13, 3, 13, 2, 2, 14, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 19, 11, 21, 12, 23, 13, 25, 14, 3, 2, 4, 3, 2, 50, 59, 5, 2, 11, 12, 15, 15, 34, 34, 2, 64, 2, 3, 3, 2, 2, 2, 2, 5, 3, 2, 2, 2, 2, 7, 3, 2, 2, 2, 2, 9, 3, 2, 2, 2, 2, 11, 3, 2, 2, 2, 2, 13, 3, 2, 2, 2, 2, 15, 3, 2, 2, 2, 2, 17, 3, 2, 2, 2, 2, 19, 3, 2, 2, 2, 2, 21, 3, 2, 2, 2, 2, 23, 3, 2, 2, 2, 2, 25, 3, 2, 2, 2, 3, 27, 3, 2, 2, 2, 5, 33, 3, 2, 2, 2, 7, 36, 3, 2, 2, 2, 9, 41, 3, 2, 2, 2, 11, 43, 3, 2, 2, 2, 13, 45, 3, 2, 2, 2, 15, 47, 3, 2, 2, 2, 17, 49, 3, 2, 2, 2, 19, 51, 3, 2, 2, 2, 21, 53, 3, 2, 2, 2, 23, 56, 3, 2, 2, 2, 25, 60, 3, 2, 2, 2, 27, 28, 7, 114, 2, 2, 28, 29, 7, 116, 2, 2, 29, 30, 7, 107, 2, 2, 30, 31, 7, 112, 2, 2, 31, 32, 7, 118, 2, 2, 32, 4, 3, 2, 2, 2, 33, 34, 7, 107, 2, 2, 34, 35, 7, 104, 2, 2, 35, 6, 3, 2, 2, 2, 36, 37, 7, 103, 2, 2, 37, 38, 7, 110, 2, 2, 38, 39, 7, 117, 2, 2, 39, 40, 7, 103, 2, 2, 40, 8, 3, 2, 2, 2, 41, 42, 7, 61, 2, 2, 42, 10, 3, 2, 2, 2, 43, 44, 7, 125, 2, 2, 44, 12, 3, 2, 2, 2, 45, 46, 7, 127, 2, 2, 46, 14, 3, 2, 2, 2, 47, 48, 7, 44, 2, 2, 48, 16, 3, 2, 2, 2, 49, 50, 7, 45, 2, 2, 50, 18, 3, 2, 2, 2, 51, 52, 7, 47, 2, 2, 52, 20, 3, 2, 2, 2, 53, 54, 7, 39, 2, 2, 54, 22, 3, 2, 2, 2, 55, 57, 9, 2, 2, 2, 56, 55, 3, 2, 2, 2, 57, 58, 3, 2, 2, 2, 58, 56, 3, 2, 2, 2, 58, 59, 3, 2, 2, 2, 59, 24, 3, 2, 2, 2, 60, 61, 9, 3, 2, 2, 61, 62, 3, 2, 2, 2, 62, 63, 8, 13, 2, 2, 63, 26, 3, 2, 2, 2, 4, 2, 58, 3, 8, 2, 2]

50
src/main/antlr4/de/hsrm/compiler/Klang/.antlr/KlangLexer.java
View File

@@ -16,8 +16,8 @@ public class KlangLexer extends Lexer {
protected static final PredictionContextCache _sharedContextCache = protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache(); new PredictionContextCache();
public static final int public static final int
PRINT=1, IF=2, THEN=3, ELSE=4, SCOL=5, OBRK=6, CBRK=7, MULT=8, ADD=9, PRINT=1, IF=2, ELSE=3, SCOL=4, OBRK=5, CBRK=6, MULT=7, ADD=8, SUB=9, MOD=10,
SUB=10, MOD=11, INTEGER_LITERAL=12, WS=13; INTEGER_LITERAL=11, WS=12;
public static String[] channelNames = { public static String[] channelNames = {
"DEFAULT_TOKEN_CHANNEL", "HIDDEN" "DEFAULT_TOKEN_CHANNEL", "HIDDEN"
}; };
@@ -27,17 +27,17 @@ public class KlangLexer extends Lexer {
}; };
public static final String[] ruleNames = { public static final String[] ruleNames = {
"PRINT", "IF", "THEN", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD", "PRINT", "IF", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD", "SUB", "MOD",
"SUB", "MOD", "INTEGER_LITERAL", "WS" "INTEGER_LITERAL", "WS"
}; };
private static final String[] _LITERAL_NAMES = { private static final String[] _LITERAL_NAMES = {
null, "'print'", "'if'", "'then'", "'else'", "';'", "'{'", "'}'", "'*'", null, "'print'", "'if'", "'else'", "';'", "'{'", "'}'", "'*'", "'+'",
"'+'", "'-'", "'%'" "'-'", "'%'"
}; };
private static final String[] _SYMBOLIC_NAMES = { private static final String[] _SYMBOLIC_NAMES = {
null, "PRINT", "IF", "THEN", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD", null, "PRINT", "IF", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD", "SUB",
"SUB", "MOD", "INTEGER_LITERAL", "WS" "MOD", "INTEGER_LITERAL", "WS"
}; };
public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
@@ -97,25 +97,23 @@ public class KlangLexer extends Lexer {
public ATN getATN() { return _ATN; } public ATN getATN() { return _ATN; }
public static final String _serializedATN = public static final String _serializedATN =
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\17G\b\1\4\2\t\2\4"+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\16@\b\1\4\2\t\2\4"+
"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+ "\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
"\13\4\f\t\f\4\r\t\r\4\16\t\16\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\4"+ "\13\4\f\t\f\4\r\t\r\3\2\3\2\3\2\3\2\3\2\3\2\3\3\3\3\3\3\3\4\3\4\3\4\3"+
"\3\4\3\4\3\4\3\4\3\5\3\5\3\5\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3"+ "\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\13\3\13\3\f\6"+
"\n\3\n\3\13\3\13\3\f\3\f\3\r\6\r@\n\r\r\r\16\rA\3\16\3\16\3\16\3\16\2"+ "\f9\n\f\r\f\16\f:\3\r\3\r\3\r\3\r\2\2\16\3\3\5\4\7\5\t\6\13\7\r\b\17\t"+
"\2\17\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\23\13\25\f\27\r\31\16\33\17\3"+ "\21\n\23\13\25\f\27\r\31\16\3\2\4\3\2\62;\5\2\13\f\17\17\"\"\2@\2\3\3"+
"\2\4\3\2\62;\5\2\13\f\17\17\"\"\2G\2\3\3\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2"+ "\2\2\2\2\5\3\2\2\2\2\7\3\2\2\2\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2"+
"\2\t\3\2\2\2\2\13\3\2\2\2\2\r\3\2\2\2\2\17\3\2\2\2\2\21\3\2\2\2\2\23\3"+ "\17\3\2\2\2\2\21\3\2\2\2\2\23\3\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3"+
"\2\2\2\2\25\3\2\2\2\2\27\3\2\2\2\2\31\3\2\2\2\2\33\3\2\2\2\3\35\3\2\2"+ "\2\2\2\3\33\3\2\2\2\5!\3\2\2\2\7$\3\2\2\2\t)\3\2\2\2\13+\3\2\2\2\r-\3"+
"\2\5#\3\2\2\2\7&\3\2\2\2\t+\3\2\2\2\13\60\3\2\2\2\r\62\3\2\2\2\17\64\3"+ "\2\2\2\17/\3\2\2\2\21\61\3\2\2\2\23\63\3\2\2\2\25\65\3\2\2\2\278\3\2\2"+
"\2\2\2\21\66\3\2\2\2\238\3\2\2\2\25:\3\2\2\2\27<\3\2\2\2\31?\3\2\2\2\33"+ "\2\31<\3\2\2\2\33\34\7r\2\2\34\35\7t\2\2\35\36\7k\2\2\36\37\7p\2\2\37"+
"C\3\2\2\2\35\36\7r\2\2\36\37\7t\2\2\37 \7k\2\2 !\7p\2\2!\"\7v\2\2\"\4"+ " \7v\2\2 \4\3\2\2\2!\"\7k\2\2\"#\7h\2\2#\6\3\2\2\2$%\7g\2\2%&\7n\2\2&"+
"\3\2\2\2#$\7k\2\2$%\7h\2\2%\6\3\2\2\2&\'\7v\2\2\'(\7j\2\2()\7g\2\2)*\7"+ "\'\7u\2\2\'(\7g\2\2(\b\3\2\2\2)*\7=\2\2*\n\3\2\2\2+,\7}\2\2,\f\3\2\2\2"+
"p\2\2*\b\3\2\2\2+,\7g\2\2,-\7n\2\2-.\7u\2\2./\7g\2\2/\n\3\2\2\2\60\61"+ "-.\7\177\2\2.\16\3\2\2\2/\60\7,\2\2\60\20\3\2\2\2\61\62\7-\2\2\62\22\3"+
"\7=\2\2\61\f\3\2\2\2\62\63\7}\2\2\63\16\3\2\2\2\64\65\7\177\2\2\65\20"+ "\2\2\2\63\64\7/\2\2\64\24\3\2\2\2\65\66\7\'\2\2\66\26\3\2\2\2\679\t\2"+
"\3\2\2\2\66\67\7,\2\2\67\22\3\2\2\289\7-\2\29\24\3\2\2\2:;\7/\2\2;\26"+ "\2\28\67\3\2\2\29:\3\2\2\2:8\3\2\2\2:;\3\2\2\2;\30\3\2\2\2<=\t\3\2\2="+
"\3\2\2\2<=\7\'\2\2=\30\3\2\2\2>@\t\2\2\2?>\3\2\2\2@A\3\2\2\2A?\3\2\2\2"+ ">\3\2\2\2>?\b\r\2\2?\32\3\2\2\2\4\2:\3\b\2\2";
"AB\3\2\2\2B\32\3\2\2\2CD\t\3\2\2DE\3\2\2\2EF\b\16\2\2F\34\3\2\2\2\4\2"+
"A\3\b\2\2";
public static final ATN _ATN = public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray()); new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static { static {

38
src/main/antlr4/de/hsrm/compiler/Klang/.antlr/KlangLexer.tokens
View File

@@ -1,24 +1,22 @@
PRINT=1 PRINT=1
IF=2 IF=2
THEN=3 ELSE=3
ELSE=4 SCOL=4
SCOL=5 OBRK=5
OBRK=6 CBRK=6
CBRK=7 MULT=7
MULT=8 ADD=8
ADD=9 SUB=9
SUB=10 MOD=10
MOD=11 INTEGER_LITERAL=11
INTEGER_LITERAL=12 WS=12
WS=13
'print'=1 'print'=1
'if'=2 'if'=2
'then'=3 'else'=3
'else'=4 ';'=4
';'=5 '{'=5
'{'=6 '}'=6
'}'=7 '*'=7
'*'=8 '+'=8
'+'=9 '-'=9
'-'=10 '%'=10
'%'=11

81
src/main/antlr4/de/hsrm/compiler/Klang/.antlr/KlangParser.java
View File

@@ -16,8 +16,8 @@ public class KlangParser extends Parser {
protected static final PredictionContextCache _sharedContextCache = protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache(); new PredictionContextCache();
public static final int public static final int
PRINT=1, IF=2, THEN=3, ELSE=4, SCOL=5, OBRK=6, CBRK=7, MULT=8, ADD=9, PRINT=1, IF=2, ELSE=3, SCOL=4, OBRK=5, CBRK=6, MULT=7, ADD=8, SUB=9, MOD=10,
SUB=10, MOD=11, INTEGER_LITERAL=12, WS=13; INTEGER_LITERAL=11, WS=12;
public static final int public static final int
RULE_parse = 0, RULE_block = 1, RULE_braced_block = 2, RULE_statement = 3, RULE_parse = 0, RULE_block = 1, RULE_braced_block = 2, RULE_statement = 3,
RULE_print = 4, RULE_if_statement = 5, RULE_expression = 6, RULE_atom = 7; RULE_print = 4, RULE_if_statement = 5, RULE_expression = 6, RULE_atom = 7;
@@ -27,12 +27,12 @@ public class KlangParser extends Parser {
}; };
private static final String[] _LITERAL_NAMES = { private static final String[] _LITERAL_NAMES = {
null, "'print'", "'if'", "'then'", "'else'", "';'", "'{'", "'}'", "'*'", null, "'print'", "'if'", "'else'", "';'", "'{'", "'}'", "'*'", "'+'",
"'+'", "'-'", "'%'" "'-'", "'%'"
}; };
private static final String[] _SYMBOLIC_NAMES = { private static final String[] _SYMBOLIC_NAMES = {
null, "PRINT", "IF", "THEN", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD", null, "PRINT", "IF", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD", "SUB",
"SUB", "MOD", "INTEGER_LITERAL", "WS" "MOD", "INTEGER_LITERAL", "WS"
}; };
public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES); public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
@@ -305,7 +305,6 @@ public class KlangParser extends Parser {
public ExpressionContext expression() { public ExpressionContext expression() {
return getRuleContext(ExpressionContext.class,0); return getRuleContext(ExpressionContext.class,0);
} }
public TerminalNode THEN() { return getToken(KlangParser.THEN, 0); }
public List<Braced_blockContext> braced_block() { public List<Braced_blockContext> braced_block() {
return getRuleContexts(Braced_blockContext.class); return getRuleContexts(Braced_blockContext.class);
} }
@@ -331,17 +330,15 @@ public class KlangParser extends Parser {
setState(42); setState(42);
expression(); expression();
setState(43); setState(43);
match(THEN);
setState(44);
braced_block(); braced_block();
setState(47); setState(46);
_errHandler.sync(this); _errHandler.sync(this);
_la = _input.LA(1); _la = _input.LA(1);
if (_la==ELSE) { if (_la==ELSE) {
{ {
setState(45); setState(44);
match(ELSE); match(ELSE);
setState(46); setState(45);
braced_block(); braced_block();
} }
} }
@@ -421,18 +418,18 @@ public class KlangParser extends Parser {
enterRule(_localctx, 12, RULE_expression); enterRule(_localctx, 12, RULE_expression);
int _la; int _la;
try { try {
setState(64); setState(63);
_errHandler.sync(this); _errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) { switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
case 1: case 1:
_localctx = new MultiplicationExpressionContext(_localctx); _localctx = new MultiplicationExpressionContext(_localctx);
enterOuterAlt(_localctx, 1); enterOuterAlt(_localctx, 1);
{ {
setState(49); setState(48);
atom(); atom();
setState(50); setState(49);
match(MULT); match(MULT);
setState(51); setState(50);
atom(); atom();
} }
break; break;
@@ -440,9 +437,9 @@ public class KlangParser extends Parser {
_localctx = new AdditiveExpressionContext(_localctx); _localctx = new AdditiveExpressionContext(_localctx);
enterOuterAlt(_localctx, 2); enterOuterAlt(_localctx, 2);
{ {
setState(53); setState(52);
atom(); atom();
setState(54); setState(53);
((AdditiveExpressionContext)_localctx).op = _input.LT(1); ((AdditiveExpressionContext)_localctx).op = _input.LT(1);
_la = _input.LA(1); _la = _input.LA(1);
if ( !(_la==ADD || _la==SUB) ) { if ( !(_la==ADD || _la==SUB) ) {
@@ -453,7 +450,7 @@ public class KlangParser extends Parser {
_errHandler.reportMatch(this); _errHandler.reportMatch(this);
consume(); consume();
} }
setState(55); setState(54);
atom(); atom();
} }
break; break;
@@ -461,11 +458,11 @@ public class KlangParser extends Parser {
_localctx = new ModuloExpressionContext(_localctx); _localctx = new ModuloExpressionContext(_localctx);
enterOuterAlt(_localctx, 3); enterOuterAlt(_localctx, 3);
{ {
setState(57); setState(56);
atom(); atom();
setState(58); setState(57);
match(MOD); match(MOD);
setState(59); setState(58);
atom(); atom();
} }
break; break;
@@ -473,9 +470,9 @@ public class KlangParser extends Parser {
_localctx = new UnaryNegateExpressionContext(_localctx); _localctx = new UnaryNegateExpressionContext(_localctx);
enterOuterAlt(_localctx, 4); enterOuterAlt(_localctx, 4);
{ {
setState(61); setState(60);
match(SUB); match(SUB);
setState(62); setState(61);
atom(); atom();
} }
break; break;
@@ -483,7 +480,7 @@ public class KlangParser extends Parser {
_localctx = new AtomExpressionContext(_localctx); _localctx = new AtomExpressionContext(_localctx);
enterOuterAlt(_localctx, 5); enterOuterAlt(_localctx, 5);
{ {
setState(63); setState(62);
atom(); atom();
} }
break; break;
@@ -523,7 +520,7 @@ public class KlangParser extends Parser {
_localctx = new IntAtomContext(_localctx); _localctx = new IntAtomContext(_localctx);
enterOuterAlt(_localctx, 1); enterOuterAlt(_localctx, 1);
{ {
setState(66); setState(65);
match(INTEGER_LITERAL); match(INTEGER_LITERAL);
} }
} }
@@ -539,24 +536,24 @@ public class KlangParser extends Parser {
} }
public static final String _serializedATN = public static final String _serializedATN =
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\17G\4\2\t\2\4\3\t"+ "\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\16F\4\2\t\2\4\3\t"+
"\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\3\2\3\2\3\3\7\3\26"+ "\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\3\2\3\2\3\3\7\3\26"+
"\n\3\f\3\16\3\31\13\3\3\4\3\4\7\4\35\n\4\f\4\16\4 \13\4\3\4\3\4\3\5\3"+ "\n\3\f\3\16\3\31\13\3\3\4\3\4\7\4\35\n\4\f\4\16\4 \13\4\3\4\3\4\3\5\3"+
"\5\5\5&\n\5\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\5\7\62\n\7\3\b\3\b"+ "\5\5\5&\n\5\3\6\3\6\3\6\3\6\3\7\3\7\3\7\3\7\3\7\5\7\61\n\7\3\b\3\b\3\b"+
"\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\5\bC\n\b\3\t\3\t"+ "\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\5\bB\n\b\3\t\3\t\3\t"+
"\3\t\2\2\n\2\4\6\b\n\f\16\20\2\3\3\2\13\f\2F\2\22\3\2\2\2\4\27\3\2\2\2"+ "\2\2\n\2\4\6\b\n\f\16\20\2\3\3\2\n\13\2E\2\22\3\2\2\2\4\27\3\2\2\2\6\32"+
"\6\32\3\2\2\2\b%\3\2\2\2\n\'\3\2\2\2\f+\3\2\2\2\16B\3\2\2\2\20D\3\2\2"+ "\3\2\2\2\b%\3\2\2\2\n\'\3\2\2\2\f+\3\2\2\2\16A\3\2\2\2\20C\3\2\2\2\22"+
"\2\22\23\5\4\3\2\23\3\3\2\2\2\24\26\5\b\5\2\25\24\3\2\2\2\26\31\3\2\2"+ "\23\5\4\3\2\23\3\3\2\2\2\24\26\5\b\5\2\25\24\3\2\2\2\26\31\3\2\2\2\27"+
"\2\27\25\3\2\2\2\27\30\3\2\2\2\30\5\3\2\2\2\31\27\3\2\2\2\32\36\7\b\2"+ "\25\3\2\2\2\27\30\3\2\2\2\30\5\3\2\2\2\31\27\3\2\2\2\32\36\7\7\2\2\33"+
"\2\33\35\5\b\5\2\34\33\3\2\2\2\35 \3\2\2\2\36\34\3\2\2\2\36\37\3\2\2\2"+ "\35\5\b\5\2\34\33\3\2\2\2\35 \3\2\2\2\36\34\3\2\2\2\36\37\3\2\2\2\37!"+
"\37!\3\2\2\2 \36\3\2\2\2!\"\7\t\2\2\"\7\3\2\2\2#&\5\n\6\2$&\5\f\7\2%#"+ "\3\2\2\2 \36\3\2\2\2!\"\7\b\2\2\"\7\3\2\2\2#&\5\n\6\2$&\5\f\7\2%#\3\2"+
"\3\2\2\2%$\3\2\2\2&\t\3\2\2\2\'(\7\3\2\2()\5\16\b\2)*\7\7\2\2*\13\3\2"+ "\2\2%$\3\2\2\2&\t\3\2\2\2\'(\7\3\2\2()\5\16\b\2)*\7\6\2\2*\13\3\2\2\2"+
"\2\2+,\7\4\2\2,-\5\16\b\2-.\7\5\2\2.\61\5\6\4\2/\60\7\6\2\2\60\62\5\6"+ "+,\7\4\2\2,-\5\16\b\2-\60\5\6\4\2./\7\5\2\2/\61\5\6\4\2\60.\3\2\2\2\60"+
"\4\2\61/\3\2\2\2\61\62\3\2\2\2\62\r\3\2\2\2\63\64\5\20\t\2\64\65\7\n\2"+ "\61\3\2\2\2\61\r\3\2\2\2\62\63\5\20\t\2\63\64\7\t\2\2\64\65\5\20\t\2\65"+
"\2\65\66\5\20\t\2\66C\3\2\2\2\678\5\20\t\289\t\2\2\29:\5\20\t\2:C\3\2"+ "B\3\2\2\2\66\67\5\20\t\2\678\t\2\2\289\5\20\t\29B\3\2\2\2:;\5\20\t\2;"+
"\2\2;<\5\20\t\2<=\7\r\2\2=>\5\20\t\2>C\3\2\2\2?@\7\f\2\2@C\5\20\t\2AC"+ "<\7\f\2\2<=\5\20\t\2=B\3\2\2\2>?\7\13\2\2?B\5\20\t\2@B\5\20\t\2A\62\3"+
"\5\20\t\2B\63\3\2\2\2B\67\3\2\2\2B;\3\2\2\2B?\3\2\2\2BA\3\2\2\2C\17\3"+ "\2\2\2A\66\3\2\2\2A:\3\2\2\2A>\3\2\2\2A@\3\2\2\2B\17\3\2\2\2CD\7\r\2\2"+
"\2\2\2DE\7\16\2\2E\21\3\2\2\2\7\27\36%\61B"; "D\21\3\2\2\2\7\27\36%\60A";
public static final ATN _ATN = public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray()); new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static { static {

3
src/main/antlr4/de/hsrm/compiler/Klang/Klang.g4
View File

@@ -22,7 +22,7 @@ print
; ;
if_statement if_statement
: IF expression THEN braced_block (ELSE braced_block)? : IF expression braced_block (ELSE braced_block)?
; ;
expression expression
@@ -43,7 +43,6 @@ atom
PRINT: 'print'; PRINT: 'print';
IF: 'if'; IF: 'if';
THEN: 'then';
ELSE: 'else'; ELSE: 'else';
SCOL: ';'; SCOL: ';';