From 4b927b6be90dd859d0aa5c4e52c35c6555affea7 Mon Sep 17 00:00:00 2001 From: Niels Bross Date: Mon, 13 Jan 2025 09:14:36 +0100 Subject: [PATCH] Add else parsing. Still a few bugs with output. --- AST.jai | 12 ++++++++- Parsing.jai | 18 +++++++++---- test/lex/simple_if_else.golden | 46 ++++++++++++++++++++++++++++++++++ test/simple_if_else.ink | 8 ++++++ 4 files changed, 78 insertions(+), 6 deletions(-) create mode 100644 test/lex/simple_if_else.golden create mode 100644 test/simple_if_else.ink diff --git a/AST.jai b/AST.jai index 016883c..ad0bc2f 100644 --- a/AST.jai +++ b/AST.jai @@ -228,9 +228,19 @@ print_return_node :: (node : *AST_Node, indentation : int, builder : *String_Bui } pretty_print_if :: (node : *AST_Node, indentation : int, builder : *String_Builder) { +indent(builder, indentation); append(builder, "(if "); - pretty_print_children(node, 0, builder); + body := node.children[0]; + pretty_print_node(body, 0, builder); + + if node.children.count == 2 { + append(builder, "\n"); + indent(builder, indentation); + append(builder, "(else "); + pretty_print_node(node.children[1], 0, builder); + append(builder, ")"); + } append(builder, ")"); } diff --git a/Parsing.jai b/Parsing.jai index e047496..2909f7e 100644 --- a/Parsing.jai +++ b/Parsing.jai @@ -112,7 +112,7 @@ parse_rules :: #run -> [(cast(int)Token_Kind.TOKEN_ERROR) + 1]Parse_Rule { rules[Token_Kind.TOKEN_ELSE] = .{null, null, .PREC_NONE}; rules[Token_Kind.TOKEN_FALSE] = .{null, null, .PREC_NONE}; rules[Token_Kind.TOKEN_FOR] = .{null, null, .PREC_NONE}; - rules[Token_Kind.TOKEN_IF] = .{if_, null, .PREC_NONE}; + rules[Token_Kind.TOKEN_IF] = .{null, null, .PREC_NONE}; rules[Token_Kind.TOKEN_LOGICALOR] = .{null, binary, .PREC_OR}; rules[Token_Kind.TOKEN_LOGICALAND] = .{null, binary, .PREC_AND}; rules[Token_Kind.TOKEN_RETURN] = .{null, null, .PREC_NONE}; @@ -387,10 +387,6 @@ precedence :: (parse_state : *Parse_State, precedence : Precedence) -> *AST_Node return left; } -if_ :: (parse_state : *Parse_State, left : *AST_Node) -> *AST_Node { - return error_node(parse_state, "If not yet implemented."); -} - named_variable :: (parse_state : *Parse_State, left : *AST_Node) -> *AST_Node { if check(parse_state, .TOKEN_LEFTPAREN) { return call(parse_state, left); @@ -774,6 +770,11 @@ statement :: (parse_state : *Parse_State) -> *AST_Node { add_child(node, if_body); } + if match(parse_state, .TOKEN_ELSE) { + else_node := else_statement(parse_state); + add_child(node, else_node); + } + source_location.end = parse_state.previous; node.source_location = source_location; @@ -785,6 +786,13 @@ statement :: (parse_state : *Parse_State) -> *AST_Node { return error_node(parse_state, "Couldn't parse statement."); } +else_statement :: (parse_state : *Parse_State) -> *AST_Node { + if check(parse_state, .TOKEN_IF) { + return statement(parse_state); + } + return block(parse_state); +} + block :: (parse_state : *Parse_State) -> *AST_Node { node : *AST_Node = make_node(parse_state, .Block); array_reserve(*node.children, 1024); diff --git a/test/lex/simple_if_else.golden b/test/lex/simple_if_else.golden new file mode 100644 index 0000000..2b0cc59 --- /dev/null +++ b/test/lex/simple_if_else.golden @@ -0,0 +1,46 @@ +{kind = TOKEN_VERTEX; ; index = 0 ; length = 6 line = 1 ; column = 0 ; value ='vertex'; } +{kind = TOKEN_IDENTIFIER; ; index = 7 ; length = 4 line = 1 ; column = 7 ; value ='main'; } +{kind = TOKEN_DOUBLECOLON; ; index = 12 ; length = 2 line = 1 ; column = 12 ; value ='::'; } +{kind = TOKEN_LEFTPAREN; ; index = 15 ; length = 1 line = 1 ; column = 15 ; value ='('; } +{kind = TOKEN_IDENTIFIER; ; index = 16 ; length = 3 line = 1 ; column = 16 ; value ='pos'; } +{kind = TOKEN_COLON; ; index = 20 ; length = 1 line = 1 ; column = 20 ; value =':'; } +{kind = TOKEN_IDENTIFIER; ; index = 22 ; length = 6 line = 1 ; column = 22 ; value ='float3'; } +{kind = TOKEN_AT; ; index = 29 ; length = 1 line = 1 ; column = 29 ; value ='@'; } +{kind = TOKEN_IDENTIFIER; ; index = 30 ; length = 8 line = 1 ; column = 30 ; value ='position'; } +{kind = TOKEN_RIGHTPAREN; ; index = 38 ; length = 1 line = 1 ; column = 38 ; value =')'; } +{kind = TOKEN_ARROW; ; index = 40 ; length = 2 line = 1 ; column = 40 ; value ='->'; } +{kind = TOKEN_IDENTIFIER; ; index = 43 ; length = 6 line = 1 ; column = 43 ; value ='float4'; } +{kind = TOKEN_AT; ; index = 50 ; length = 1 line = 1 ; column = 50 ; value ='@'; } +{kind = TOKEN_IDENTIFIER; ; index = 51 ; length = 8 line = 1 ; column = 51 ; value ='position'; } +{kind = TOKEN_LEFTBRACE; ; index = 60 ; length = 1 line = 1 ; column = 60 ; value ='{'; } +{kind = TOKEN_IF; ; index = 64 ; length = 2 line = 2 ; column = 0 ; value ='if'; } +{kind = TOKEN_INTLITERAL; ; index = 67 ; length = 1 line = 2 ; column = 3 ; value ='0'; } +{kind = TOKEN_GREATER; ; index = 69 ; length = 1 line = 2 ; column = 5 ; value ='>'; } +{kind = TOKEN_INTLITERAL; ; index = 71 ; length = 3 line = 2 ; column = 7 ; value ='100'; } +{kind = TOKEN_LEFTBRACE; ; index = 75 ; length = 1 line = 2 ; column = 11 ; value ='{'; } +{kind = TOKEN_RETURN; ; index = 80 ; length = 6 line = 3 ; column = 0 ; value ='return'; } +{kind = TOKEN_IDENTIFIER; ; index = 87 ; length = 6 line = 3 ; column = 7 ; value ='float4'; } +{kind = TOKEN_LEFTPAREN; ; index = 93 ; length = 1 line = 3 ; column = 13 ; value ='('; } +{kind = TOKEN_IDENTIFIER; ; index = 94 ; length = 3 line = 3 ; column = 14 ; value ='pos'; } +{kind = TOKEN_COMMA; ; index = 97 ; length = 1 line = 3 ; column = 17 ; value =','; } +{kind = TOKEN_FLOATLITERAL; ; index = 99 ; length = 3 line = 3 ; column = 19 ; value ='1'; } +{kind = TOKEN_RIGHTPAREN; ; index = 102 ; length = 1 line = 3 ; column = 22 ; value =')'; } +{kind = TOKEN_SEMICOLON; ; index = 103 ; length = 1 line = 3 ; column = 23 ; value =';'; } +{kind = TOKEN_RIGHTBRACE; ; index = 107 ; length = 1 line = 4 ; column = 0 ; value ='}'; } +{kind = TOKEN_ELSE; ; index = 109 ; length = 4 line = 4 ; column = 2 ; value ='else'; } +{kind = TOKEN_LEFTBRACE; ; index = 114 ; length = 1 line = 4 ; column = 7 ; value ='{'; } +{kind = TOKEN_RETURN; ; index = 119 ; length = 6 line = 5 ; column = 0 ; value ='return'; } +{kind = TOKEN_IDENTIFIER; ; index = 126 ; length = 6 line = 5 ; column = 7 ; value ='float4'; } +{kind = TOKEN_LEFTPAREN; ; index = 132 ; length = 1 line = 5 ; column = 13 ; value ='('; } +{kind = TOKEN_FLOATLITERAL; ; index = 133 ; length = 3 line = 5 ; column = 14 ; value ='1'; } +{kind = TOKEN_RIGHTPAREN; ; index = 136 ; length = 1 line = 5 ; column = 17 ; value =')'; } +{kind = TOKEN_SEMICOLON; ; index = 137 ; length = 1 line = 5 ; column = 18 ; value =';'; } +{kind = TOKEN_RIGHTBRACE; ; index = 141 ; length = 1 line = 6 ; column = 0 ; value ='}'; } +{kind = TOKEN_RETURN; ; index = 145 ; length = 6 line = 7 ; column = 0 ; value ='return'; } +{kind = TOKEN_IDENTIFIER; ; index = 152 ; length = 6 line = 7 ; column = 7 ; value ='float4'; } +{kind = TOKEN_LEFTPAREN; ; index = 158 ; length = 1 line = 7 ; column = 13 ; value ='('; } +{kind = TOKEN_FLOATLITERAL; ; index = 159 ; length = 3 line = 7 ; column = 14 ; value ='0'; } +{kind = TOKEN_RIGHTPAREN; ; index = 162 ; length = 1 line = 7 ; column = 17 ; value =')'; } +{kind = TOKEN_SEMICOLON; ; index = 163 ; length = 1 line = 7 ; column = 18 ; value =';'; } +{kind = TOKEN_RIGHTBRACE; ; index = 166 ; length = 1 line = 8 ; column = 0 ; value ='}'; } +{kind = TOKEN_EOF; ; index = 169 ; length = 0 line = 9 ; column = 0 ; value =''; } diff --git a/test/simple_if_else.ink b/test/simple_if_else.ink new file mode 100644 index 0000000..b80447e --- /dev/null +++ b/test/simple_if_else.ink @@ -0,0 +1,8 @@ +vertex main :: (pos : float3 @position) -> float4 @position { + if 0 > 100 { + return float4(pos, 1.0); + } else { + return float4(1.0); + } + return float4(0.0); +}