Added if statement

This commit is contained in:
Marvin Kaiser
2019-10-29 10:30:18 +01:00
parent 64c41122d0
commit d43fa90bc3
9 changed files with 343 additions and 96 deletions

View File

@@ -1,7 +1,12 @@
token literal names:
null
'print'
'if'
'then'
'else'
';'
'{'
'}'
'*'
'+'
'-'
@@ -12,7 +17,12 @@ null
token symbolic names:
null
PRINT
IF
THEN
ELSE
SCOL
OBRK
CBRK
MULT
ADD
SUB
@@ -23,11 +33,13 @@ WS
rule names:
parse
block
braced_block
statement
print
if_statement
expression
atom
atn:
[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 10, 47, 4, 2, 9, 2, 4, 3, 9, 3, 4, 4, 9, 4, 4, 5, 9, 5, 4, 6, 9, 6, 4, 7, 9, 7, 3, 2, 3, 2, 3, 3, 7, 3, 18, 10, 3, 12, 3, 14, 3, 21, 11, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 3, 6, 5, 6, 43, 10, 6, 3, 7, 3, 7, 3, 7, 2, 2, 8, 2, 4, 6, 8, 10, 12, 2, 3, 3, 2, 6, 7, 2, 44, 2, 14, 3, 2, 2, 2, 4, 19, 3, 2, 2, 2, 6, 22, 3, 2, 2, 2, 8, 24, 3, 2, 2, 2, 10, 42, 3, 2, 2, 2, 12, 44, 3, 2, 2, 2, 14, 15, 5, 4, 3, 2, 15, 3, 3, 2, 2, 2, 16, 18, 5, 6, 4, 2, 17, 16, 3, 2, 2, 2, 18, 21, 3, 2, 2, 2, 19, 17, 3, 2, 2, 2, 19, 20, 3, 2, 2, 2, 20, 5, 3, 2, 2, 2, 21, 19, 3, 2, 2, 2, 22, 23, 5, 8, 5, 2, 23, 7, 3, 2, 2, 2, 24, 25, 7, 3, 2, 2, 25, 26, 5, 10, 6, 2, 26, 27, 7, 4, 2, 2, 27, 9, 3, 2, 2, 2, 28, 29, 5, 12, 7, 2, 29, 30, 7, 5, 2, 2, 30, 31, 5, 12, 7, 2, 31, 43, 3, 2, 2, 2, 32, 33, 5, 12, 7, 2, 33, 34, 9, 2, 2, 2, 34, 35, 5, 12, 7, 2, 35, 43, 3, 2, 2, 2, 36, 37, 5, 12, 7, 2, 37, 38, 7, 8, 2, 2, 38, 39, 5, 12, 7, 2, 39, 43, 3, 2, 2, 2, 40, 41, 7, 7, 2, 2, 41, 43, 5, 12, 7, 2, 42, 28, 3, 2, 2, 2, 42, 32, 3, 2, 2, 2, 42, 36, 3, 2, 2, 2, 42, 40, 3, 2, 2, 2, 43, 11, 3, 2, 2, 2, 44, 45, 7, 9, 2, 2, 45, 13, 3, 2, 2, 2, 4, 19, 42]
[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]

View File

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

View File

@@ -1,7 +1,12 @@
token literal names:
null
'print'
'if'
'then'
'else'
';'
'{'
'}'
'*'
'+'
'-'
@@ -12,7 +17,12 @@ null
token symbolic names:
null
PRINT
IF
THEN
ELSE
SCOL
OBRK
CBRK
MULT
ADD
SUB
@@ -22,7 +32,12 @@ WS
rule names:
PRINT
IF
THEN
ELSE
SCOL
OBRK
CBRK
MULT
ADD
SUB
@@ -38,4 +53,4 @@ mode names:
DEFAULT_MODE
atn:
[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 2, 10, 44, 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, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 3, 4, 3, 4, 3, 5, 3, 5, 3, 6, 3, 6, 3, 7, 3, 7, 3, 8, 6, 8, 37, 10, 8, 13, 8, 14, 8, 38, 3, 9, 3, 9, 3, 9, 3, 9, 2, 2, 10, 3, 3, 5, 4, 7, 5, 9, 6, 11, 7, 13, 8, 15, 9, 17, 10, 3, 2, 4, 3, 2, 50, 59, 5, 2, 11, 12, 15, 15, 34, 34, 2, 44, 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, 3, 19, 3, 2, 2, 2, 5, 25, 3, 2, 2, 2, 7, 27, 3, 2, 2, 2, 9, 29, 3, 2, 2, 2, 11, 31, 3, 2, 2, 2, 13, 33, 3, 2, 2, 2, 15, 36, 3, 2, 2, 2, 17, 40, 3, 2, 2, 2, 19, 20, 7, 114, 2, 2, 20, 21, 7, 116, 2, 2, 21, 22, 7, 107, 2, 2, 22, 23, 7, 112, 2, 2, 23, 24, 7, 118, 2, 2, 24, 4, 3, 2, 2, 2, 25, 26, 7, 61, 2, 2, 26, 6, 3, 2, 2, 2, 27, 28, 7, 44, 2, 2, 28, 8, 3, 2, 2, 2, 29, 30, 7, 45, 2, 2, 30, 10, 3, 2, 2, 2, 31, 32, 7, 47, 2, 2, 32, 12, 3, 2, 2, 2, 33, 34, 7, 39, 2, 2, 34, 14, 3, 2, 2, 2, 35, 37, 9, 2, 2, 2, 36, 35, 3, 2, 2, 2, 37, 38, 3, 2, 2, 2, 38, 36, 3, 2, 2, 2, 38, 39, 3, 2, 2, 2, 39, 16, 3, 2, 2, 2, 40, 41, 9, 3, 2, 2, 41, 42, 3, 2, 2, 2, 42, 43, 8, 9, 2, 2, 43, 18, 3, 2, 2, 2, 4, 2, 38, 3, 8, 2, 2]
[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]

View File

@@ -16,7 +16,8 @@ public class KlangLexer extends Lexer {
protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache();
public static final int
PRINT=1, SCOL=2, MULT=3, ADD=4, SUB=5, MOD=6, INTEGER_LITERAL=7, WS=8;
PRINT=1, IF=2, THEN=3, ELSE=4, SCOL=5, OBRK=6, CBRK=7, MULT=8, ADD=9,
SUB=10, MOD=11, INTEGER_LITERAL=12, WS=13;
public static String[] channelNames = {
"DEFAULT_TOKEN_CHANNEL", "HIDDEN"
};
@@ -26,15 +27,17 @@ public class KlangLexer extends Lexer {
};
public static final String[] ruleNames = {
"PRINT", "SCOL", "MULT", "ADD", "SUB", "MOD", "INTEGER_LITERAL", "WS"
"PRINT", "IF", "THEN", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD",
"SUB", "MOD", "INTEGER_LITERAL", "WS"
};
private static final String[] _LITERAL_NAMES = {
null, "'print'", "';'", "'*'", "'+'", "'-'", "'%'"
null, "'print'", "'if'", "'then'", "'else'", "';'", "'{'", "'}'", "'*'",
"'+'", "'-'", "'%'"
};
private static final String[] _SYMBOLIC_NAMES = {
null, "PRINT", "SCOL", "MULT", "ADD", "SUB", "MOD", "INTEGER_LITERAL",
"WS"
null, "PRINT", "IF", "THEN", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD",
"SUB", "MOD", "INTEGER_LITERAL", "WS"
};
public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
@@ -94,18 +97,25 @@ public class KlangLexer extends Lexer {
public ATN getATN() { return _ATN; }
public static final String _serializedATN =
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\n,\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\3\2\3\2\3\2\3\2"+
"\3\2\3\2\3\3\3\3\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\b\6\b%\n\b\r\b\16\b"+
"&\3\t\3\t\3\t\3\t\2\2\n\3\3\5\4\7\5\t\6\13\7\r\b\17\t\21\n\3\2\4\3\2\62"+
";\5\2\13\f\17\17\"\"\2,\2\3\3\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\17\3\2\2\2\2\21\3\2\2\2\3\23\3\2\2\2\5\31"+
"\3\2\2\2\7\33\3\2\2\2\t\35\3\2\2\2\13\37\3\2\2\2\r!\3\2\2\2\17$\3\2\2"+
"\2\21(\3\2\2\2\23\24\7r\2\2\24\25\7t\2\2\25\26\7k\2\2\26\27\7p\2\2\27"+
"\30\7v\2\2\30\4\3\2\2\2\31\32\7=\2\2\32\6\3\2\2\2\33\34\7,\2\2\34\b\3"+
"\2\2\2\35\36\7-\2\2\36\n\3\2\2\2\37 \7/\2\2 \f\3\2\2\2!\"\7\'\2\2\"\16"+
"\3\2\2\2#%\t\2\2\2$#\3\2\2\2%&\3\2\2\2&$\3\2\2\2&\'\3\2\2\2\'\20\3\2\2"+
"\2()\t\3\2\2)*\3\2\2\2*+\b\t\2\2+\22\3\2\2\2\4\2&\3\b\2\2";
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\2\17G\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"+
"\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"+
"\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"+
"\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"+
"\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"+
"\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\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"+
"\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\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\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"+
"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"+
"\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"+
"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=\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"+
"\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"+
"\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"+
"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 =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {

View File

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

View File

@@ -16,20 +16,23 @@ public class KlangParser extends Parser {
protected static final PredictionContextCache _sharedContextCache =
new PredictionContextCache();
public static final int
PRINT=1, SCOL=2, MULT=3, ADD=4, SUB=5, MOD=6, INTEGER_LITERAL=7, WS=8;
PRINT=1, IF=2, THEN=3, ELSE=4, SCOL=5, OBRK=6, CBRK=7, MULT=8, ADD=9,
SUB=10, MOD=11, INTEGER_LITERAL=12, WS=13;
public static final int
RULE_parse = 0, RULE_block = 1, RULE_statement = 2, RULE_print = 3, RULE_expression = 4,
RULE_atom = 5;
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;
public static final String[] ruleNames = {
"parse", "block", "statement", "print", "expression", "atom"
"parse", "block", "braced_block", "statement", "print", "if_statement",
"expression", "atom"
};
private static final String[] _LITERAL_NAMES = {
null, "'print'", "';'", "'*'", "'+'", "'-'", "'%'"
null, "'print'", "'if'", "'then'", "'else'", "';'", "'{'", "'}'", "'*'",
"'+'", "'-'", "'%'"
};
private static final String[] _SYMBOLIC_NAMES = {
null, "PRINT", "SCOL", "MULT", "ADD", "SUB", "MOD", "INTEGER_LITERAL",
"WS"
null, "PRINT", "IF", "THEN", "ELSE", "SCOL", "OBRK", "CBRK", "MULT", "ADD",
"SUB", "MOD", "INTEGER_LITERAL", "WS"
};
public static final Vocabulary VOCABULARY = new VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
@@ -96,7 +99,7 @@ public class KlangParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
setState(12);
setState(16);
block();
}
}
@@ -131,17 +134,17 @@ public class KlangParser extends Parser {
try {
enterOuterAlt(_localctx, 1);
{
setState(17);
setState(21);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==PRINT) {
while (_la==PRINT || _la==IF) {
{
{
setState(14);
setState(18);
statement();
}
}
setState(19);
setState(23);
_errHandler.sync(this);
_la = _input.LA(1);
}
@@ -158,10 +161,66 @@ public class KlangParser extends Parser {
return _localctx;
}
public static class Braced_blockContext extends ParserRuleContext {
public TerminalNode OBRK() { return getToken(KlangParser.OBRK, 0); }
public TerminalNode CBRK() { return getToken(KlangParser.CBRK, 0); }
public List<StatementContext> statement() {
return getRuleContexts(StatementContext.class);
}
public StatementContext statement(int i) {
return getRuleContext(StatementContext.class,i);
}
public Braced_blockContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
@Override public int getRuleIndex() { return RULE_braced_block; }
}
public final Braced_blockContext braced_block() throws RecognitionException {
Braced_blockContext _localctx = new Braced_blockContext(_ctx, getState());
enterRule(_localctx, 4, RULE_braced_block);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
setState(24);
match(OBRK);
setState(28);
_errHandler.sync(this);
_la = _input.LA(1);
while (_la==PRINT || _la==IF) {
{
{
setState(25);
statement();
}
}
setState(30);
_errHandler.sync(this);
_la = _input.LA(1);
}
setState(31);
match(CBRK);
}
}
catch (RecognitionException re) {
_localctx.exception = re;
_errHandler.reportError(this, re);
_errHandler.recover(this, re);
}
finally {
exitRule();
}
return _localctx;
}
public static class StatementContext extends ParserRuleContext {
public PrintContext print() {
return getRuleContext(PrintContext.class,0);
}
public If_statementContext if_statement() {
return getRuleContext(If_statementContext.class,0);
}
public StatementContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
@@ -170,12 +229,27 @@ public class KlangParser extends Parser {
public final StatementContext statement() throws RecognitionException {
StatementContext _localctx = new StatementContext(_ctx, getState());
enterRule(_localctx, 4, RULE_statement);
enterRule(_localctx, 6, RULE_statement);
try {
enterOuterAlt(_localctx, 1);
{
setState(20);
print();
setState(35);
_errHandler.sync(this);
switch (_input.LA(1)) {
case PRINT:
enterOuterAlt(_localctx, 1);
{
setState(33);
print();
}
break;
case IF:
enterOuterAlt(_localctx, 2);
{
setState(34);
if_statement();
}
break;
default:
throw new NoViableAltException(this);
}
}
catch (RecognitionException re) {
@@ -203,15 +277,15 @@ public class KlangParser extends Parser {
public final PrintContext print() throws RecognitionException {
PrintContext _localctx = new PrintContext(_ctx, getState());
enterRule(_localctx, 6, RULE_print);
enterRule(_localctx, 8, RULE_print);
try {
enterOuterAlt(_localctx, 1);
{
setState(22);
setState(37);
match(PRINT);
setState(23);
setState(38);
expression();
setState(24);
setState(39);
match(SCOL);
}
}
@@ -226,6 +300,65 @@ public class KlangParser extends Parser {
return _localctx;
}
public static class If_statementContext extends ParserRuleContext {
public TerminalNode IF() { return getToken(KlangParser.IF, 0); }
public ExpressionContext expression() {
return getRuleContext(ExpressionContext.class,0);
}
public TerminalNode THEN() { return getToken(KlangParser.THEN, 0); }
public List<Braced_blockContext> braced_block() {
return getRuleContexts(Braced_blockContext.class);
}
public Braced_blockContext braced_block(int i) {
return getRuleContext(Braced_blockContext.class,i);
}
public TerminalNode ELSE() { return getToken(KlangParser.ELSE, 0); }
public If_statementContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
}
@Override public int getRuleIndex() { return RULE_if_statement; }
}
public final If_statementContext if_statement() throws RecognitionException {
If_statementContext _localctx = new If_statementContext(_ctx, getState());
enterRule(_localctx, 10, RULE_if_statement);
int _la;
try {
enterOuterAlt(_localctx, 1);
{
setState(41);
match(IF);
setState(42);
expression();
setState(43);
match(THEN);
setState(44);
braced_block();
setState(47);
_errHandler.sync(this);
_la = _input.LA(1);
if (_la==ELSE) {
{
setState(45);
match(ELSE);
setState(46);
braced_block();
}
}
}
}
catch (RecognitionException re) {
_localctx.exception = re;
_errHandler.reportError(this, re);
_errHandler.recover(this, re);
}
finally {
exitRule();
}
return _localctx;
}
public static class ExpressionContext extends ParserRuleContext {
public ExpressionContext(ParserRuleContext parent, int invokingState) {
super(parent, invokingState);
@@ -266,6 +399,12 @@ public class KlangParser extends Parser {
}
public UnaryNegateExpressionContext(ExpressionContext ctx) { copyFrom(ctx); }
}
public static class AtomExpressionContext extends ExpressionContext {
public AtomContext atom() {
return getRuleContext(AtomContext.class,0);
}
public AtomExpressionContext(ExpressionContext ctx) { copyFrom(ctx); }
}
public static class MultiplicationExpressionContext extends ExpressionContext {
public List<AtomContext> atom() {
return getRuleContexts(AtomContext.class);
@@ -279,21 +418,21 @@ public class KlangParser extends Parser {
public final ExpressionContext expression() throws RecognitionException {
ExpressionContext _localctx = new ExpressionContext(_ctx, getState());
enterRule(_localctx, 8, RULE_expression);
enterRule(_localctx, 12, RULE_expression);
int _la;
try {
setState(40);
setState(64);
_errHandler.sync(this);
switch ( getInterpreter().adaptivePredict(_input,1,_ctx) ) {
switch ( getInterpreter().adaptivePredict(_input,4,_ctx) ) {
case 1:
_localctx = new MultiplicationExpressionContext(_localctx);
enterOuterAlt(_localctx, 1);
{
setState(26);
setState(49);
atom();
setState(27);
setState(50);
match(MULT);
setState(28);
setState(51);
atom();
}
break;
@@ -301,9 +440,9 @@ public class KlangParser extends Parser {
_localctx = new AdditiveExpressionContext(_localctx);
enterOuterAlt(_localctx, 2);
{
setState(30);
setState(53);
atom();
setState(31);
setState(54);
((AdditiveExpressionContext)_localctx).op = _input.LT(1);
_la = _input.LA(1);
if ( !(_la==ADD || _la==SUB) ) {
@@ -314,7 +453,7 @@ public class KlangParser extends Parser {
_errHandler.reportMatch(this);
consume();
}
setState(32);
setState(55);
atom();
}
break;
@@ -322,11 +461,11 @@ public class KlangParser extends Parser {
_localctx = new ModuloExpressionContext(_localctx);
enterOuterAlt(_localctx, 3);
{
setState(34);
setState(57);
atom();
setState(35);
setState(58);
match(MOD);
setState(36);
setState(59);
atom();
}
break;
@@ -334,9 +473,17 @@ public class KlangParser extends Parser {
_localctx = new UnaryNegateExpressionContext(_localctx);
enterOuterAlt(_localctx, 4);
{
setState(38);
setState(61);
match(SUB);
setState(39);
setState(62);
atom();
}
break;
case 5:
_localctx = new AtomExpressionContext(_localctx);
enterOuterAlt(_localctx, 5);
{
setState(63);
atom();
}
break;
@@ -371,12 +518,12 @@ public class KlangParser extends Parser {
public final AtomContext atom() throws RecognitionException {
AtomContext _localctx = new AtomContext(_ctx, getState());
enterRule(_localctx, 10, RULE_atom);
enterRule(_localctx, 14, RULE_atom);
try {
_localctx = new IntAtomContext(_localctx);
enterOuterAlt(_localctx, 1);
{
setState(42);
setState(66);
match(INTEGER_LITERAL);
}
}
@@ -392,18 +539,24 @@ public class KlangParser extends Parser {
}
public static final String _serializedATN =
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\n/\4\2\t\2\4\3\t"+
"\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\3\2\3\2\3\3\7\3\22\n\3\f\3\16\3\25"+
"\13\3\3\4\3\4\3\5\3\5\3\5\3\5\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6\3\6"+
"\3\6\3\6\3\6\3\6\5\6+\n\6\3\7\3\7\3\7\2\2\b\2\4\6\b\n\f\2\3\3\2\6\7\2"+
",\2\16\3\2\2\2\4\23\3\2\2\2\6\26\3\2\2\2\b\30\3\2\2\2\n*\3\2\2\2\f,\3"+
"\2\2\2\16\17\5\4\3\2\17\3\3\2\2\2\20\22\5\6\4\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\27\5"+
"\b\5\2\27\7\3\2\2\2\30\31\7\3\2\2\31\32\5\n\6\2\32\33\7\4\2\2\33\t\3\2"+
"\2\2\34\35\5\f\7\2\35\36\7\5\2\2\36\37\5\f\7\2\37+\3\2\2\2 !\5\f\7\2!"+
"\"\t\2\2\2\"#\5\f\7\2#+\3\2\2\2$%\5\f\7\2%&\7\b\2\2&\'\5\f\7\2\'+\3\2"+
"\2\2()\7\7\2\2)+\5\f\7\2*\34\3\2\2\2* \3\2\2\2*$\3\2\2\2*(\3\2\2\2+\13"+
"\3\2\2\2,-\7\t\2\2-\r\3\2\2\2\4\23*";
"\3\u608b\ua72a\u8133\ub9ed\u417c\u3be7\u7786\u5964\3\17G\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"+
"\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"+
"\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\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"+
"\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"+
"\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"+
"\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"+
"\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"+
"\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%$\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+,\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"+
"\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"+
"\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"+
"\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"+
"\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\2DE\7\16\2\2E\21\3\2\2\2\7\27\36%\61B";
public static final ATN _ATN =
new ATNDeserializer().deserialize(_serializedATN.toCharArray());
static {

View File

@@ -8,27 +8,47 @@ block
: statement*
;
braced_block
: OBRK statement* CBRK
;
statement
: print
| if_statement
;
print
: PRINT expression SCOL
;
if_statement
: IF expression THEN braced_block (ELSE braced_block)?
;
expression
: atom MULT atom #multiplicationExpression
| atom op=(ADD | SUB) atom #additiveExpression
| atom MOD atom #moduloExpression
| SUB atom #unaryNegateExpression
| atom #atomExpression
;
atom
: INTEGER_LITERAL #intAtom
;
/*
if 5 = 5 then whatever else whatever
*/
PRINT: 'print';
IF: 'if';
THEN: 'then';
ELSE: 'else';
SCOL: ';';
OBRK: '{';
CBRK: '}';
MULT: '*';
ADD: '+';

View File

@@ -19,9 +19,9 @@ public class Klang {
KlangParser parser = new KlangParser(tokens);
ParseTree tree = parser.parse(); // begin parsing at init rule
StringBuilder sb = new StringBuilder();
JSVisitor visitor = new JSVisitor(sb);
// StringBuilder sb = new StringBuilder();
Visitor visitor = new Visitor();
visitor.visit(tree);
System.out.println(sb.toString());
// System.out.println(sb.toString());
}
}

View File

@@ -9,6 +9,17 @@ public class Visitor extends KlangBaseVisitor<Value> {
return value;
}
@Override
public Value visitIf_statement(KlangParser.If_statementContext ctx) {
Value cond = this.visit(ctx.expression());
if (cond.asInteger() != 0) {
this.visit(ctx.braced_block(0));
} else if (ctx.braced_block().size() > 1) {
this.visit(ctx.braced_block(1));
}
return null;
}
@Override
public Value visitMultiplicationExpression(KlangParser.MultiplicationExpressionContext ctx) {
Value left = this.visit(ctx.atom(0));
@@ -27,7 +38,8 @@ public class Visitor extends KlangBaseVisitor<Value> {
case KlangParser.SUB:
return new Value(left.asInteger() - right.asInteger());
default:
throw new RuntimeException("Unknown operator for additive expression: "+ KlangParser.VOCABULARY.getDisplayName(ctx.op.getType()));
throw new RuntimeException(
"Unknown operator for additive expression: " + KlangParser.VOCABULARY.getDisplayName(ctx.op.getType()));
}
}
@@ -44,6 +56,11 @@ public class Visitor extends KlangBaseVisitor<Value> {
return new Value(-value.asInteger());
}
@Override
public Value visitAtomExpression(KlangParser.AtomExpressionContext ctx) {
return this.visit(ctx.atom());
}
@Override
public Value visitIntAtom(KlangParser.IntAtomContext ctx) {
return new Value(Integer.parseInt(ctx.getText()));