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

Fixed a bunch of semant back and forth but now it looks like I broke some parameter checking in functions.

Browse Source
This commit is contained in:
Niels Bross
2025-08-14 14:04:54 +02:00
parent af42b61ed6
commit 6b6c7bce62
3 changed files with 208 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
Semantic_Analysis.jai
View File

@@ -467,7 +467,7 @@ Attempting to access a field on a primitive type '%'.
init_string_builder(*builder,, temp);
variable := from_handle(checker, handle);
print_to_builder(*builder, "Attempting to access a field on a primitive type '%'.\n", proper_type_to_string(checker, variable));
print_to_builder(*builder, "Attempting to access a field on a primitive type '%'.\n", proper_type_to_string(checker.result.type_variables, variable));
indent(*builder, 1);
cyan(*builder);
@@ -528,7 +528,7 @@ if_condition_has_to_be_boolean_type :: (checker : *Semantic_Checker, usage_site
usage_child := usage_site.children[0];
usage_loc := usage_child.source_location;
print_to_builder(*builder, "% has type %\n", print_from_source_location(*usage_loc), proper_type_to_string(checker, var));
print_to_builder(*builder, "% has type %\n", print_from_source_location(*usage_loc), proper_type_to_string(checker.result.type_variables, var));
message := builder_to_string(*builder,, temp);
record_error(checker, message, usage_site.source_location, false);
@@ -570,7 +570,7 @@ type_mismatch :: (checker : *Semantic_Checker, usage_site : *AST_Node, expect_no
indent(*builder, 1);
print_to_builder(*builder, "expected:\n");
indent(*builder, 2);
proper_type_to_string(*builder, checker, expect_var);
proper_type_to_string(*builder, checker.result.type_variables, expect_var);
append(*builder, "\n");
// indent(*builder, 2);
@@ -692,8 +692,8 @@ get_scope :: (checker : *Semantic_Checker, handle : Scope_Handle) -> *Scope {
return get_scope(*checker.result.scope_stack, handle);
}
add_symbol_to_scope :: (checker : *Semantic_Checker, scope_handle : Scope_Handle, name : string, symbol : Defined_Symbol) -> *Defined_Symbol {
scope := get_scope(checker, scope_handle);
add_symbol_to_scope :: (state : Checker_State, scope_stack : *Scope_Stack, scope_handle : Scope_Handle, name : string, symbol : Defined_Symbol) -> *Defined_Symbol {
scope := get_scope(scope_stack.*, scope_handle);
scope.longest_key_length = max(scope.longest_key_length, name.count);
symbol_to_add : Defined_Symbol;
@@ -702,7 +702,7 @@ add_symbol_to_scope :: (checker : *Semantic_Checker, scope_handle : Scope_Handle
symbol_to_add.source_node = symbol.source_node;
symbol_to_add.functions = symbol.functions;
if checker.state == .Adding_Builtins {
if state == .Adding_Builtins {
symbol_to_add.builtin = true;
}
@@ -787,7 +787,7 @@ from_handle :: (checker : *Semantic_Checker, handle : Type_Variable_Handle) -> *
return from_handle(checker.result.type_variables, handle);
}
proper_type_to_string :: (builder : *String_Builder, checker : *Semantic_Checker, var : Type_Variable) {
proper_type_to_string :: (builder : *String_Builder, variables : []Type_Variable, var : Type_Variable) {
if var.type == {
case .Int; #through;
case .Half; #through;
@@ -806,7 +806,7 @@ proper_type_to_string :: (builder : *String_Builder, checker : *Semantic_Checker
if child.kind == .FieldList {
for field : child.children {
var := field.type_variable;
print_type_variable(builder, checker, var);
print_type_variable(builder, variables, var);
if it_index != child.children.count - 1 {
append(builder, ", ");
@@ -819,12 +819,12 @@ proper_type_to_string :: (builder : *String_Builder, checker : *Semantic_Checker
if var.return_type_variable > 0 {
append(builder, " -> ", );
return_var := from_handle(checker, var.return_type_variable);
return_var := from_handle(variables, var.return_type_variable);
if is_proper(return_var) {
proper_type_to_string(builder, checker, return_var);
proper_type_to_string(builder, variables, return_var);
} else {
append(builder, "[[");
print_type_variable(builder, checker, var.return_type_variable);
print_type_variable(builder, variables, var.return_type_variable);
append(builder, "]]", );
}
} else {
@@ -837,7 +837,7 @@ proper_type_to_string :: (builder : *String_Builder, checker : *Semantic_Checker
}
}
proper_type_to_string :: (checker : *Semantic_Checker, var : Type_Variable, allocator := context.allocator) -> string {
proper_type_to_string :: (variables : []Type_Variable, var : Type_Variable, allocator := context.allocator) -> string {
if var.type == {
case .Int; #through;
case .Half; #through;
@@ -849,7 +849,7 @@ proper_type_to_string :: (checker : *Semantic_Checker, var : Type_Variable, allo
builder : String_Builder;
init_string_builder(*builder,, allocator);
proper_type_to_string(*builder, checker, var);
proper_type_to_string(*builder, variables, var);
return builder_to_string(*builder,, allocator);
}
case .Struct; {
@@ -915,7 +915,7 @@ declare_struct :: (checker : *Semantic_Checker, node : *AST_Node, name : string)
symbol.name = name;
symbol.source_node = node;
symbol.type_variable = handle;
add_symbol_to_scope(checker, checker.current_scope, name, symbol);
add_symbol_to_scope(checker.state, *checker.result.scope_stack, checker.current_scope, name, symbol);
} else {
symbol_redeclaration(checker, node, find_result);
return 0;
@@ -1024,7 +1024,7 @@ declare_function :: (checker : *Semantic_Checker, node : *AST_Node, builtin : bo
array_reserve(*symbol.functions, 32);
array_add(*symbol.functions, function);
add_symbol_to_scope(checker, checker.current_scope, name_to_check, symbol);
add_symbol_to_scope(checker.state, *checker.result.scope_stack, checker.current_scope, name_to_check, symbol);
} else {
//@Note(niels): This is some ugly code, but it's probably fine for now.
field_list := node.children[0];
@@ -1261,7 +1261,7 @@ create_field :: (checker : *Semantic_Checker, node : *AST_Node) -> Type_Variable
symbol.name = node.name;
symbol.source_node = node;
symbol.type_variable = handle;
add_symbol_to_scope(checker, checker.current_scope, node.name, symbol);
add_symbol_to_scope(checker.state, *checker.result.scope_stack, checker.current_scope, node.name, symbol);
} else {
symbol_redeclaration(checker, node, find_result);
return 0;
@@ -1828,8 +1828,8 @@ type_to_string :: (type_variable : Type_Variable) -> string {
#scope_export
print_key :: (checker : *Semantic_Checker, builder : *String_Builder, name : string) {
scope := get_current_scope(checker);
print_key :: (scope_stack : *Scope_Stack, current_scope : Scope_Handle, builder : *String_Builder, name : string) {
scope := get_scope(scope_stack, current_scope);
target_length := scope.longest_key_length + 1;
missing_padding := target_length - name.count;
str := tprint("[%]", name);
@@ -1841,15 +1841,15 @@ print_key :: (checker : *Semantic_Checker, builder : *String_Builder, name : str
append(builder, ": ");
}
pretty_print_function :: (checker : *Semantic_Checker, builder : *String_Builder, name : string, function : Type_Variable, indentation : int) {
pretty_print_function :: (scope_stack : *Scope_Stack, current_scope : Scope_Handle, variables : []Type_Variable, builder : *String_Builder, name : string, function : Type_Variable, indentation : int) {
indent(builder, indentation);
print_key(checker, builder, name);
print_key(scope_stack, current_scope, builder, name);
append(builder, "(");
for child : function.source_node.children {
if child.kind == .FieldList {
for field : child.children {
tv := from_handle(checker, field.type_variable);
tv := from_handle(variables, field.type_variable);
if tv.type != .Function {
if tv.builtin {
print_to_builder(builder, "%", tv.name);
@@ -1857,7 +1857,7 @@ pretty_print_function :: (checker : *Semantic_Checker, builder : *String_Builder
print_to_builder(builder, "% : %", tv.name, type_to_string(tv));
}
} else {
pretty_print_function(checker, builder, "", tv, 0);
pretty_print_function(scope_stack, current_scope, variables, builder, "", tv, 0);
}
if it_index < child.children.count - 1 {
@@ -1868,20 +1868,20 @@ pretty_print_function :: (checker : *Semantic_Checker, builder : *String_Builder
}
if function.return_type_variable> 0 {
print_to_builder(builder, ") -> %\n", type_to_string(from_handle(checker, function.return_type_variable)));
print_to_builder(builder, ") -> %\n", type_to_string(from_handle(variables, function.return_type_variable)));
} else {
append(builder, ")\n");
}
}
pretty_print_struct :: (checker : *Semantic_Checker, builder : *String_Builder, name : string, struct_type : Type_Variable, indentation : int) {
pretty_print_struct :: (scope_stack : *Scope_Stack, current_scope : Scope_Handle, variables : []Type_Variable, builder : *String_Builder, name : string, struct_type : Type_Variable, indentation : int) {
indent(builder, indentation);
print_key(checker, builder, name);
print_key(scope_stack, current_scope, builder, name);
append(builder, "{");
for 0..struct_type.children.count - 1 {
child_handle := struct_type.children[it];
child := from_handle(checker, child_handle);
child := from_handle(variables, child_handle);
print_to_builder(builder, child.name);
append(builder, " : ");
print_to_builder(builder, type_to_string(child));
@@ -1894,7 +1894,7 @@ pretty_print_struct :: (checker : *Semantic_Checker, builder : *String_Builder,
append(builder, "}\n");
}
pretty_print_scope :: (checker : *Semantic_Checker, scope : *Scope, builder : *String_Builder, indentation : int = 0) {
pretty_print_scope :: (current_scope : Scope_Handle, scope_stack : Scope_Stack, variables : []Type_Variable, scope : *Scope, builder : *String_Builder, indentation : int = 0) {
if scope.builtin {
return;
}
@@ -1919,51 +1919,51 @@ pretty_print_scope :: (checker : *Semantic_Checker, scope : *Scope, builder : *S
if value.functions.count > 0 {
for func : value.functions {
type_variable := from_handle(checker, func.type_variable);
type_variable := from_handle(variables, func.type_variable);
if type_variable.type == {
case .Function; {
pretty_print_function(checker, builder, key, type_variable, 1);
pretty_print_function(*scope_stack, current_scope, variables, builder, key, type_variable, 1);
}
case .CBuffer; #through;
case .Properties; #through;
case .Struct; {
if type_variable.typename.count > 0 && type_variable.kind != .Declaration {
indent(builder, indentation + 1);
print_key(checker, builder, key);
print_type_variable(builder, type_variable, checker);
print_key(*scope_stack, current_scope, builder, key);
print_type_variable(builder, variables, type_variable);
append(builder, "\n");
// print_to_builder(builder, "%\n", type_variable.typename);
} else {
pretty_print_struct(checker, builder, key, type_variable, 1);
pretty_print_struct(*scope_stack, current_scope, variables, builder, key, type_variable, 1);
}
}
case; {
indent(builder, indentation + 1);
print_key(checker, builder, key);
print_key(*scope_stack, current_scope, builder, key);
print_to_builder(builder, "%\n", type_to_string(type_variable));
}
}
}
} else {
type_variable := from_handle(checker, value.type_variable);
type_variable := from_handle(variables, value.type_variable);
if type_variable.type == {
case .Function; {
pretty_print_function(checker, builder, key, type_variable, 1);
pretty_print_function(*scope_stack, current_scope, variables, builder, key, type_variable, 1);
}
case .CBuffer; #through;
case .Properties; #through;
case .Struct; {
if type_variable.typename.count > 0 && type_variable.kind != .Declaration {
indent(builder, indentation + 1);
print_key(checker, builder, key);
print_key(*scope_stack, current_scope, builder, key);
print_to_builder(builder, "%\n", type_variable.typename);
} else {
pretty_print_struct(checker, builder, key, type_variable, 1);
pretty_print_struct(*scope_stack, current_scope, variables, builder, key, type_variable, 1);
}
}
case; {
indent(builder, indentation + 1);
print_key(checker, builder, key);
print_key(*scope_stack, current_scope, builder, key);
print_to_builder(builder, "%\n", type_to_string(type_variable));
}
}
@@ -1972,8 +1972,8 @@ pretty_print_scope :: (checker : *Semantic_Checker, scope : *Scope, builder : *S
}
for child : scope.children {
child_scope := *checker.result.scope_stack.stack[child - 1];
pretty_print_scope(checker, child_scope, builder, indentation + 1);
child_scope := *scope_stack.stack[child - 1];
pretty_print_scope(current_scope, *scope_stack, variables, child_scope, builder, indentation + 1);
}
if scope.table.count > 0 {
@@ -1982,7 +1982,7 @@ pretty_print_scope :: (checker : *Semantic_Checker, scope : *Scope, builder : *S
append(builder, "]\n");
}
print_type_variable :: (builder : *String_Builder, variable : Type_Variable, checker : *Semantic_Checker) {
print_type_variable :: (builder : *String_Builder, variables : []Type_Variable, variable : Type_Variable) {
if variable.builtin {
if variable.type != .Function || variable.type != .Struct {
print_to_builder(builder, "%", type_to_string(variable));
@@ -2036,7 +2036,7 @@ print_type_variable :: (builder : *String_Builder, variable : Type_Variable, che
if variable.return_type_variable{
assert(false);
print_to_builder(builder, "%", variable.typename);
print_type_variable(builder, checker, variable.return_type_variable);
print_type_variable(builder, variables, variable.return_type_variable);
}
print_to_builder(builder, "%(", node.name);
@@ -2045,7 +2045,7 @@ print_type_variable :: (builder : *String_Builder, variable : Type_Variable, che
for child : node.children {
if child.kind == .ArgList {
for arg : child.children {
print_type_variable(builder, checker, arg.type_variable);
print_type_variable(builder, variables, arg.type_variable);
if it_index < child.children.count - 1 {
append(builder, ", ");
@@ -2064,20 +2064,35 @@ print_type_variable :: (builder : *String_Builder, variable : Type_Variable, che
}
}
print_type_variable :: (builder : *String_Builder, checker : *Semantic_Checker, handle : Type_Variable_Handle) {
variable := from_handle(checker, handle);
print_type_variable(builder, variable, checker);
print_type_variable :: (builder : *String_Builder, variables : []Type_Variable, handle : Type_Variable_Handle) {
variable := from_handle(variables, handle);
print_type_variable(builder, variables, variable);
}
pretty_print_symbol_table :: (checker : *Semantic_Checker, allocator : Allocator) -> string {
builder : String_Builder;
init_string_builder(*builder,, allocator);
pretty_print_scope(checker, *checker.result.scope_stack.stack[0], *builder);
pretty_print_scope(xx checker.current_scope, checker.result.scope_stack, checker.result.type_variables, *checker.result.scope_stack.stack[0], *builder);
return builder_to_string(*builder,, allocator);
}
pretty_print_symbol_table :: (result : *Compile_Result, allocator : Allocator) -> string {
builder : String_Builder;
init_string_builder(*builder,, allocator);
for *file : result.files {
current_scope := cast(Scope_Handle)0;
check_result := file.semantic_check_result;
pretty_print_scope(current_scope, check_result.scope_stack, check_result.type_variables, *check_result.scope_stack.stack[0], *builder);
}
return builder_to_string(*builder,, allocator);
}
#scope_module
#import "ncore";