nielsbross/Ink-Shader-Language
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Function overload check cleanup. Added if statement to parsing.

Browse Source
This commit is contained in:
Niels Bross
2025-01-12 22:15:02 +01:00
parent ec31046d30
commit 85b23f90e5
12 changed files with 540 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
Parsing.jai
View File

@@ -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] = .{null, null, .PREC_NONE};
rules[Token_Kind.TOKEN_IF] = .{if_, 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};
@@ -264,7 +264,7 @@ error_node :: (parse_state : *Parse_State, message : string) -> *AST_Node {
advance_to_sync_point :: (parse_state : *Parse_State) {
while true {
if parse_state.current.kind == .TOKEN_SEMICOLON || parse_state.current.kind == .TOKEN_RIGHTBRACE ||
parse_state.current.kind == .TOKEN_LEFTBRACE {
parse_state.current.kind == .TOKEN_LEFTBRACE || parse_state.current.kind == .TOKEN_EOF {
break;
}
advance(parse_state);
@@ -387,6 +387,10 @@ 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);
@@ -415,6 +419,8 @@ binary :: (parse_state : *Parse_State, left : *AST_Node) -> *AST_Node {
if op.kind == {
case .TOKEN_PLUS; #through;
case .TOKEN_PLUSEQUALS; #through;
case .TOKEN_MINUSEQUALS; #through;
case .TOKEN_MINUS; #through;
case .TOKEN_STAR; #through;
case .TOKEN_SLASH; #through;
@@ -753,6 +759,24 @@ statement :: (parse_state : *Parse_State) -> *AST_Node {
}
source_location.end = parse_state.previous;
node.source_location = source_location;
return node;
} else if match(parse_state, .TOKEN_IF) {
node := make_node(parse_state, .If);
source_location : Source_Range;
source_location.begin = parse_state.previous;
if_expression := expression(parse_state);
// consume(parse_state, .TOKEN_LEFTBRACE, "Expect '{' after if-condition.");
if_body := block(parse_state);
if if_body.children.count > 0 {
add_child(node, if_body);
}
source_location.end = parse_state.previous;
node.source_location = source_location;
return node;
} else {
return expression_statement(parse_state);