Add else parsing. Still a few bugs with output.
This commit is contained in:
18
Parsing.jai
18
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);
|
||||
|
||||
Reference in New Issue
Block a user