scarlett/compiler-the-translators
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed type checking issues I think

Browse Source
This commit is contained in:
Partho
2025-04-29 19:01:57 -04:00
parent dcdcf31068
commit 4ba6c0d251
1 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/grammar.y
View File

@ -612,7 +612,7 @@ simple_statement:
else { else {
throw_error(ERROR_TYPE, "Object %s of type %s != Object %s of type %s", getName(node), getType(node), getName((TableNode*)$3), getType((TableNode*)$3)); throw_error(ERROR_TYPE, "Assignable Assign Expression - Object %s of type %s != Object %s of type %s", getName(node), getType(node), getName((TableNode*)$3), getType((TableNode*)$3));
} }
$$ = undefined; $$ = undefined;
@ -907,7 +907,7 @@ assignable:
}else{ }else{
TableNode* param_arg_type = getFirstEntry(getRecList(expected)); TableNode* param_arg_type = getFirstEntry(getRecList(expected));
TableNode* arg_given = getFirstEntry(cur); TableNode* arg_given = getFirstEntry(cur);
while(arg_given != NULL && getName(arg_given)[0]=='&'){ while(arg_given != NULL && getName(arg_given)[0]!='&'){
arg_given = getNextEntry(arg_given); arg_given = getNextEntry(arg_given);
} }
if(getTypeEntry(arg_given) != param_arg_type){ if(getTypeEntry(arg_given) != param_arg_type){
@ -927,14 +927,22 @@ assignable:
} }
} }
}else{ }else{
TableNode *actual = getTypeEntry(getFirstEntry(cur)); TableNode*actual_instance = getFirstEntry(cur);
if (expected == actual) { while(actual_instance != NULL && getName(actual_instance)[0] =='&'){
throw_error(ERROR_TYPE, "expected %s expression in function call but got %s", expected, actual); actual_instance = getNextEntry(actual_instance);
}
if(actual_instance == NULL){
throw_error(ERROR_TYPE, "Invalid function call. No arguments passed");
break;
}
TableNode *actual = getTypeEntry(actual_instance);
if (expected != actual) {
throw_error(ERROR_TYPE, "expected %s expression in function call but got %s", getName(expected), getName(actual));
} }
if ($3 != 1) { if ($3 != 1) {
throw_error(ERROR_SYNTAX, "expected 1 argument but got %d", $3); } throw_error(ERROR_SYNTAX, "expected 1 argument but got %d", $3); }
printTableNode(getReturn(getTypeEntry((TableNode*)$1))); printTableNode(getReturn(getTypeEntry((TableNode*)$1)));
}
char* temp = temp_var_gen(); char* temp = temp_var_gen();
TableNode* typeNode2 = getReturn(getTypeEntry($1)); TableNode* typeNode2 = getReturn(getTypeEntry($1));
int t = -1; int t = -1;
@ -947,6 +955,7 @@ assignable:
else if(getAdInfoType(typeNode2) == TYPE_RECORD_TYPE){ else if(getAdInfoType(typeNode2) == TYPE_RECORD_TYPE){
t = TYPE_RECORD; t = TYPE_RECORD;
} }
//this may need to be updated to provide the correct name of things
else if(getAdInfoType(typeNode2) == TYPE_FUNCTION_TYPE){ else if(getAdInfoType(typeNode2) == TYPE_FUNCTION_TYPE){
t = TYPE_FUNCTION_DECLARATION; t = TYPE_FUNCTION_DECLARATION;
}else{ }else{
@ -957,7 +966,6 @@ assignable:
$$ = node; $$ = node;
//NOTE ADD ASSIGNMENT EMIT HERE (MIGHT NEED TO PUSH TO STACK for function call) //NOTE ADD ASSIGNMENT EMIT HERE (MIGHT NEED TO PUSH TO STACK for function call)
printdebug("[ASSIGNABLE - RULE 2] assignable = type: %s | name_func = %s", getName(typeNode2), getName((TableNode*)$1)); printdebug("[ASSIGNABLE - RULE 2] assignable = type: %s | name_func = %s", getName(typeNode2), getName((TableNode*)$1));
}
} else if (type == TYPE_ARRAY_TYPE) { } else if (type == TYPE_ARRAY_TYPE) {
printdebug("%sEntering array call", COLOR_LIGHTGREEN); printdebug("%sEntering array call", COLOR_LIGHTGREEN);
if (getNumArrDim(look_up(getParent(cur), getType((TableNode*)$1))) != $<integ>2) { if (getNumArrDim(look_up(getParent(cur), getType((TableNode*)$1))) != $<integ>2) {