Skip to content

Commit

Permalink
support nested ifs
Browse files Browse the repository at this point in the history
  • Loading branch information
@JVerbruggen
JVerbruggen committed Dec 17, 2021
1 parent 24451c2 commit ffe662b
Show file tree
Hide file tree
Showing 14 changed files with 3,190 additions and 12 deletions.
126 changes: 126 additions & 0 deletions .antlr/JurjenLang.interp
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
token literal names:
null
null
'func'
'return'
'printscope'
'print'
'assert'
'if'
'elif'
'else'
'while'
'true'
'false'
'and'
'or'
'not'
'=='
'!='
'<='
'>='
'<'
'>'
'!'
'^'
'*'
'/'
'+'
'-'
'\''
'"'
'.'
','
'f'
'='
'('
')'
'{'
'}'
null
null
null

token symbolic names:
null
NUMBERS
FUNC_KW
FUNC_RET
PRINTSCOPE_KW
PRINT_KW
ASSERT_KW
IF_KW
ELIF_KW
ELSE_KW
WHILE_KW
TRUE_KW
FALSE_KW
AND_KW
OR_KW
NOT_KW
EQUALS
ISNOT
LESSEQUALS
MOREEQUALS
LESSTHAN
MORETHAN
SYMB_EXCLM
SYMB_HAT
SYMB_STAR
SYMB_SLASH
SYMB_PLUS
SYMB_MINUS
SYMB_QUOTE
SYMB_DQUOTE
SYMB_DOT
SYMB_COMMA
FLOAT_IDENT
ASSIGN
PAR_OPEN
PAR_CLOSE
BRACK_OPEN
BRACK_CLOSE
IDENTIFIER
STR_CONTENT
WS

rule names:
startRule
globalscope
func
func_def
func_return
func_call
func_params
func_call_params
scope
stats
stat
debugtools
printscopestat
printstat
retstat
whileloop
ifchain
ifstat
elifstat_chain
elifstat
maybe_elsestat
elsestat
assertion
assignment
assignable
e
bool_e
boolean_type
comparison
bool_comparison
variable
float_type
integer
string
any_value


atn:
[3, 24715, 42794, 33075, 47597, 16764, 15335, 30598, 22884, 3, 42, 304, 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, 4, 15, 9, 15, 4, 16, 9, 16, 4, 17, 9, 17, 4, 18, 9, 18, 4, 19, 9, 19, 4, 20, 9, 20, 4, 21, 9, 21, 4, 22, 9, 22, 4, 23, 9, 23, 4, 24, 9, 24, 4, 25, 9, 25, 4, 26, 9, 26, 4, 27, 9, 27, 4, 28, 9, 28, 4, 29, 9, 29, 4, 30, 9, 30, 4, 31, 9, 31, 4, 32, 9, 32, 4, 33, 9, 33, 4, 34, 9, 34, 4, 35, 9, 35, 4, 36, 9, 36, 3, 2, 3, 2, 3, 2, 3, 3, 3, 3, 7, 3, 78, 10, 3, 12, 3, 14, 3, 81, 11, 3, 3, 4, 3, 4, 3, 4, 3, 5, 3, 5, 3, 5, 3, 5, 3, 6, 3, 6, 5, 6, 92, 10, 6, 3, 7, 3, 7, 3, 7, 3, 7, 3, 7, 3, 8, 7, 8, 100, 10, 8, 12, 8, 14, 8, 103, 11, 8, 3, 9, 5, 9, 106, 10, 9, 3, 9, 3, 9, 3, 9, 7, 9, 111, 10, 9, 12, 9, 14, 9, 114, 11, 9, 5, 9, 116, 10, 9, 3, 10, 3, 10, 3, 10, 3, 10, 3, 11, 7, 11, 123, 10, 11, 12, 11, 14, 11, 126, 11, 11, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 3, 12, 5, 12, 135, 10, 12, 3, 13, 3, 13, 5, 13, 139, 10, 13, 3, 14, 3, 14, 3, 15, 3, 15, 3, 15, 3, 16, 3, 16, 3, 17, 3, 17, 3, 17, 3, 17, 3, 18, 3, 18, 3, 18, 3, 18, 3, 19, 3, 19, 3, 19, 3, 19, 3, 20, 7, 20, 161, 10, 20, 12, 20, 14, 20, 164, 11, 20, 3, 21, 3, 21, 3, 21, 3, 21, 3, 22, 5, 22, 171, 10, 22, 3, 23, 3, 23, 3, 23, 3, 24, 3, 24, 3, 24, 3, 25, 3, 25, 3, 25, 3, 25, 3, 26, 3, 26, 5, 26, 185, 10, 26, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 5, 27, 197, 10, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 3, 27, 7, 27, 216, 10, 27, 12, 27, 14, 27, 219, 11, 27, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 5, 28, 234, 10, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 3, 28, 7, 28, 246, 10, 28, 12, 28, 14, 28, 249, 11, 28, 3, 29, 3, 29, 5, 29, 253, 10, 29, 3, 30, 3, 30, 3, 31, 3, 31, 3, 32, 3, 32, 3, 33, 5, 33, 262, 10, 33, 3, 33, 3, 33, 3, 33, 3, 33, 3, 33, 5, 33, 269, 10, 33, 3, 33, 3, 33, 3, 33, 3, 33, 5, 33, 275, 10, 33, 3, 33, 3, 33, 3, 33, 5, 33, 280, 10, 33, 3, 33, 3, 33, 3, 33, 5, 33, 285, 10, 33, 3, 33, 3, 33, 3, 33, 5, 33, 290, 10, 33, 3, 34, 5, 34, 293, 10, 34, 3, 34, 3, 34, 3, 35, 3, 35, 3, 36, 3, 36, 3, 36, 5, 36, 302, 10, 36, 3, 36, 2, 4, 52, 54, 37, 2, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 2, 4, 3, 2, 18, 23, 3, 2, 18, 19, 2, 316, 2, 72, 3, 2, 2, 2, 4, 79, 3, 2, 2, 2, 6, 82, 3, 2, 2, 2, 8, 85, 3, 2, 2, 2, 10, 89, 3, 2, 2, 2, 12, 93, 3, 2, 2, 2, 14, 101, 3, 2, 2, 2, 16, 115, 3, 2, 2, 2, 18, 117, 3, 2, 2, 2, 20, 124, 3, 2, 2, 2, 22, 134, 3, 2, 2, 2, 24, 138, 3, 2, 2, 2, 26, 140, 3, 2, 2, 2, 28, 142, 3, 2, 2, 2, 30, 145, 3, 2, 2, 2, 32, 147, 3, 2, 2, 2, 34, 151, 3, 2, 2, 2, 36, 155, 3, 2, 2, 2, 38, 162, 3, 2, 2, 2, 40, 165, 3, 2, 2, 2, 42, 170, 3, 2, 2, 2, 44, 172, 3, 2, 2, 2, 46, 175, 3, 2, 2, 2, 48, 178, 3, 2, 2, 2, 50, 184, 3, 2, 2, 2, 52, 196, 3, 2, 2, 2, 54, 233, 3, 2, 2, 2, 56, 252, 3, 2, 2, 2, 58, 254, 3, 2, 2, 2, 60, 256, 3, 2, 2, 2, 62, 258, 3, 2, 2, 2, 64, 289, 3, 2, 2, 2, 66, 292, 3, 2, 2, 2, 68, 296, 3, 2, 2, 2, 70, 301, 3, 2, 2, 2, 72, 73, 5, 4, 3, 2, 73, 74, 7, 2, 2, 3, 74, 3, 3, 2, 2, 2, 75, 78, 5, 6, 4, 2, 76, 78, 5, 22, 12, 2, 77, 75, 3, 2, 2, 2, 77, 76, 3, 2, 2, 2, 78, 81, 3, 2, 2, 2, 79, 77, 3, 2, 2, 2, 79, 80, 3, 2, 2, 2, 80, 5, 3, 2, 2, 2, 81, 79, 3, 2, 2, 2, 82, 83, 5, 8, 5, 2, 83, 84, 5, 18, 10, 2, 84, 7, 3, 2, 2, 2, 85, 86, 7, 4, 2, 2, 86, 87, 7, 40, 2, 2, 87, 88, 5, 14, 8, 2, 88, 9, 3, 2, 2, 2, 89, 91, 7, 5, 2, 2, 90, 92, 5, 30, 16, 2, 91, 90, 3, 2, 2, 2, 91, 92, 3, 2, 2, 2, 92, 11, 3, 2, 2, 2, 93, 94, 7, 40, 2, 2, 94, 95, 7, 36, 2, 2, 95, 96, 5, 16, 9, 2, 96, 97, 7, 37, 2, 2, 97, 13, 3, 2, 2, 2, 98, 100, 7, 40, 2, 2, 99, 98, 3, 2, 2, 2, 100, 103, 3, 2, 2, 2, 101, 99, 3, 2, 2, 2, 101, 102, 3, 2, 2, 2, 102, 15, 3, 2, 2, 2, 103, 101, 3, 2, 2, 2, 104, 106, 5, 50, 26, 2, 105, 104, 3, 2, 2, 2, 105, 106, 3, 2, 2, 2, 106, 116, 3, 2, 2, 2, 107, 112, 5, 50, 26, 2, 108, 109, 7, 33, 2, 2, 109, 111, 5, 50, 26, 2, 110, 108, 3, 2, 2, 2, 111, 114, 3, 2, 2, 2, 112, 110, 3, 2, 2, 2, 112, 113, 3, 2, 2, 2, 113, 116, 3, 2, 2, 2, 114, 112, 3, 2, 2, 2, 115, 105, 3, 2, 2, 2, 115, 107, 3, 2, 2, 2, 116, 17, 3, 2, 2, 2, 117, 118, 7, 38, 2, 2, 118, 119, 5, 20, 11, 2, 119, 120, 7, 39, 2, 2, 120, 19, 3, 2, 2, 2, 121, 123, 5, 22, 12, 2, 122, 121, 3, 2, 2, 2, 123, 126, 3, 2, 2, 2, 124, 122, 3, 2, 2, 2, 124, 125, 3, 2, 2, 2, 125, 21, 3, 2, 2, 2, 126, 124, 3, 2, 2, 2, 127, 135, 5, 48, 25, 2, 128, 135, 5, 24, 13, 2, 129, 135, 5, 34, 18, 2, 130, 135, 5, 46, 24, 2, 131, 135, 5, 32, 17, 2, 132, 135, 5, 10, 6, 2, 133, 135, 5, 12, 7, 2, 134, 127, 3, 2, 2, 2, 134, 128, 3, 2, 2, 2, 134, 129, 3, 2, 2, 2, 134, 130, 3, 2, 2, 2, 134, 131, 3, 2, 2, 2, 134, 132, 3, 2, 2, 2, 134, 133, 3, 2, 2, 2, 135, 23, 3, 2, 2, 2, 136, 139, 5, 28, 15, 2, 137, 139, 5, 26, 14, 2, 138, 136, 3, 2, 2, 2, 138, 137, 3, 2, 2, 2, 139, 25, 3, 2, 2, 2, 140, 141, 7, 6, 2, 2, 141, 27, 3, 2, 2, 2, 142, 143, 7, 7, 2, 2, 143, 144, 5, 50, 26, 2, 144, 29, 3, 2, 2, 2, 145, 146, 5, 50, 26, 2, 146, 31, 3, 2, 2, 2, 147, 148, 7, 12, 2, 2, 148, 149, 5, 54, 28, 2, 149, 150, 5, 18, 10, 2, 150, 33, 3, 2, 2, 2, 151, 152, 5, 36, 19, 2, 152, 153, 5, 38, 20, 2, 153, 154, 5, 42, 22, 2, 154, 35, 3, 2, 2, 2, 155, 156, 7, 9, 2, 2, 156, 157, 5, 54, 28, 2, 157, 158, 5, 18, 10, 2, 158, 37, 3, 2, 2, 2, 159, 161, 5, 40, 21, 2, 160, 159, 3, 2, 2, 2, 161, 164, 3, 2, 2, 2, 162, 160, 3, 2, 2, 2, 162, 163, 3, 2, 2, 2, 163, 39, 3, 2, 2, 2, 164, 162, 3, 2, 2, 2, 165, 166, 7, 10, 2, 2, 166, 167, 5, 54, 28, 2, 167, 168, 5, 18, 10, 2, 168, 41, 3, 2, 2, 2, 169, 171, 5, 44, 23, 2, 170, 169, 3, 2, 2, 2, 170, 171, 3, 2, 2, 2, 171, 43, 3, 2, 2, 2, 172, 173, 7, 11, 2, 2, 173, 174, 5, 18, 10, 2, 174, 45, 3, 2, 2, 2, 175, 176, 7, 8, 2, 2, 176, 177, 5, 54, 28, 2, 177, 47, 3, 2, 2, 2, 178, 179, 5, 62, 32, 2, 179, 180, 7, 35, 2, 2, 180, 181, 5, 50, 26, 2, 181, 49, 3, 2, 2, 2, 182, 185, 5, 52, 27, 2, 183, 185, 5, 54, 28, 2, 184, 182, 3, 2, 2, 2, 184, 183, 3, 2, 2, 2, 185, 51, 3, 2, 2, 2, 186, 187, 8, 27, 1, 2, 187, 188, 7, 36, 2, 2, 188, 189, 5, 52, 27, 2, 189, 190, 7, 37, 2, 2, 190, 197, 3, 2, 2, 2, 191, 192, 7, 29, 2, 2, 192, 197, 5, 52, 27, 6, 193, 197, 5, 62, 32, 2, 194, 197, 5, 12, 7, 2, 195, 197, 5, 70, 36, 2, 196, 186, 3, 2, 2, 2, 196, 191, 3, 2, 2, 2, 196, 193, 3, 2, 2, 2, 196, 194, 3, 2, 2, 2, 196, 195, 3, 2, 2, 2, 197, 217, 3, 2, 2, 2, 198, 199, 12, 11, 2, 2, 199, 200, 7, 25, 2, 2, 200, 216, 5, 52, 27, 12, 201, 202, 12, 10, 2, 2, 202, 203, 7, 26, 2, 2, 203, 216, 5, 52, 27, 11, 204, 205, 12, 9, 2, 2, 205, 206, 7, 27, 2, 2, 206, 216, 5, 52, 27, 10, 207, 208, 12, 8, 2, 2, 208, 209, 7, 28, 2, 2, 209, 216, 5, 52, 27, 9, 210, 211, 12, 7, 2, 2, 211, 212, 7, 29, 2, 2, 212, 216, 5, 52, 27, 8, 213, 214, 12, 12, 2, 2, 214, 216, 7, 24, 2, 2, 215, 198, 3, 2, 2, 2, 215, 201, 3, 2, 2, 2, 215, 204, 3, 2, 2, 2, 215, 207, 3, 2, 2, 2, 215, 210, 3, 2, 2, 2, 215, 213, 3, 2, 2, 2, 216, 219, 3, 2, 2, 2, 217, 215, 3, 2, 2, 2, 217, 218, 3, 2, 2, 2, 218, 53, 3, 2, 2, 2, 219, 217, 3, 2, 2, 2, 220, 221, 8, 28, 1, 2, 221, 222, 7, 36, 2, 2, 222, 223, 5, 54, 28, 2, 223, 224, 7, 37, 2, 2, 224, 234, 3, 2, 2, 2, 225, 226, 7, 17, 2, 2, 226, 234, 5, 54, 28, 7, 227, 228, 5, 52, 27, 2, 228, 229, 5, 58, 30, 2, 229, 230, 5, 52, 27, 2, 230, 234, 3, 2, 2, 2, 231, 234, 5, 56, 29, 2, 232, 234, 5, 62, 32, 2, 233, 220, 3, 2, 2, 2, 233, 225, 3, 2, 2, 2, 233, 227, 3, 2, 2, 2, 233, 231, 3, 2, 2, 2, 233, 232, 3, 2, 2, 2, 234, 247, 3, 2, 2, 2, 235, 236, 12, 9, 2, 2, 236, 237, 7, 15, 2, 2, 237, 246, 5, 54, 28, 10, 238, 239, 12, 8, 2, 2, 239, 240, 7, 16, 2, 2, 240, 246, 5, 54, 28, 9, 241, 242, 12, 5, 2, 2, 242, 243, 5, 60, 31, 2, 243, 244, 5, 54, 28, 6, 244, 246, 3, 2, 2, 2, 245, 235, 3, 2, 2, 2, 245, 238, 3, 2, 2, 2, 245, 241, 3, 2, 2, 2, 246, 249, 3, 2, 2, 2, 247, 245, 3, 2, 2, 2, 247, 248, 3, 2, 2, 2, 248, 55, 3, 2, 2, 2, 249, 247, 3, 2, 2, 2, 250, 253, 7, 13, 2, 2, 251, 253, 7, 14, 2, 2, 252, 250, 3, 2, 2, 2, 252, 251, 3, 2, 2, 2, 253, 57, 3, 2, 2, 2, 254, 255, 9, 2, 2, 2, 255, 59, 3, 2, 2, 2, 256, 257, 9, 3, 2, 2, 257, 61, 3, 2, 2, 2, 258, 259, 7, 40, 2, 2, 259, 63, 3, 2, 2, 2, 260, 262, 7, 29, 2, 2, 261, 260, 3, 2, 2, 2, 261, 262, 3, 2, 2, 2, 262, 263, 3, 2, 2, 2, 263, 264, 7, 3, 2, 2, 264, 265, 7, 32, 2, 2, 265, 266, 7, 3, 2, 2, 266, 290, 7, 34, 2, 2, 267, 269, 7, 29, 2, 2, 268, 267, 3, 2, 2, 2, 268, 269, 3, 2, 2, 2, 269, 270, 3, 2, 2, 2, 270, 271, 7, 3, 2, 2, 271, 272, 7, 32, 2, 2, 272, 290, 7, 3, 2, 2, 273, 275, 7, 29, 2, 2, 274, 273, 3, 2, 2, 2, 274, 275, 3, 2, 2, 2, 275, 276, 3, 2, 2, 2, 276, 277, 7, 3, 2, 2, 277, 290, 7, 34, 2, 2, 278, 280, 7, 29, 2, 2, 279, 278, 3, 2, 2, 2, 279, 280, 3, 2, 2, 2, 280, 281, 3, 2, 2, 2, 281, 282, 7, 32, 2, 2, 282, 290, 7, 3, 2, 2, 283, 285, 7, 29, 2, 2, 284, 283, 3, 2, 2, 2, 284, 285, 3, 2, 2, 2, 285, 286, 3, 2, 2, 2, 286, 287, 7, 32, 2, 2, 287, 288, 7, 3, 2, 2, 288, 290, 7, 34, 2, 2, 289, 261, 3, 2, 2, 2, 289, 268, 3, 2, 2, 2, 289, 274, 3, 2, 2, 2, 289, 279, 3, 2, 2, 2, 289, 284, 3, 2, 2, 2, 290, 65, 3, 2, 2, 2, 291, 293, 7, 29, 2, 2, 292, 291, 3, 2, 2, 2, 292, 293, 3, 2, 2, 2, 293, 294, 3, 2, 2, 2, 294, 295, 7, 3, 2, 2, 295, 67, 3, 2, 2, 2, 296, 297, 7, 41, 2, 2, 297, 69, 3, 2, 2, 2, 298, 302, 5, 64, 33, 2, 299, 302, 5, 66, 34, 2, 300, 302, 5, 68, 35, 2, 301, 298, 3, 2, 2, 2, 301, 299, 3, 2, 2, 2, 301, 300, 3, 2, 2, 2, 302, 71, 3, 2, 2, 2, 30, 77, 79, 91, 101, 105, 112, 115, 124, 134, 138, 162, 170, 184, 196, 215, 217, 233, 245, 247, 252, 261, 268, 274, 279, 284, 289, 292, 301]
76 changes: 76 additions & 0 deletions .antlr/JurjenLang.tokens
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
NUMBERS=1
FUNC_KW=2
FUNC_RET=3
PRINTSCOPE_KW=4
PRINT_KW=5
ASSERT_KW=6
IF_KW=7
ELIF_KW=8
ELSE_KW=9
WHILE_KW=10
TRUE_KW=11
FALSE_KW=12
AND_KW=13
OR_KW=14
NOT_KW=15
EQUALS=16
ISNOT=17
LESSEQUALS=18
MOREEQUALS=19
LESSTHAN=20
MORETHAN=21
SYMB_EXCLM=22
SYMB_HAT=23
SYMB_STAR=24
SYMB_SLASH=25
SYMB_PLUS=26
SYMB_MINUS=27
SYMB_QUOTE=28
SYMB_DQUOTE=29
SYMB_DOT=30
SYMB_COMMA=31
FLOAT_IDENT=32
ASSIGN=33
PAR_OPEN=34
PAR_CLOSE=35
BRACK_OPEN=36
BRACK_CLOSE=37
IDENTIFIER=38
STR_CONTENT=39
WS=40
'func'=2
'return'=3
'printscope'=4
'print'=5
'assert'=6
'if'=7
'elif'=8
'else'=9
'while'=10
'true'=11
'false'=12
'and'=13
'or'=14
'not'=15
'=='=16
'!='=17
'<='=18
'>='=19
'<'=20
'>'=21
'!'=22
'^'=23
'*'=24
'/'=25
'+'=26
'-'=27
'\''=28
'"'=29
'.'=30
','=31
'f'=32
'='=33
'('=34
')'=35
'{'=36
'}'=37
Loading

0 comments on commit ffe662b

Please sign in to comment.