indrajith/RCBASIC4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed loop hole where dimensions weren't expected for number and string type members

Browse Source
This commit is contained in:
n00b87
2024-04-27 11:45:35 -05:00
parent db229aece8
commit 5d1143b8b9
2 changed files with 21 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
rcbasic_build/main.cpp
View File

@@ -275,6 +275,20 @@ bool rc_eval(string line)
} }
} }
if(byref_type_exception.size() > 0)
{
for(int i = 0; i < byref_type_exception.size(); i++)
{
//cout << "type exception: [" << byref_type_exception[i].tk_reg << "] exception_status = " << byref_type_exception[i].exception_used << endl;
if(!byref_type_exception[i].exception_used)
{
rc_setError(byref_type_exception[i].error_log);
return false;
}
}
}
return true; return true;
//if(!eval_expression()) //if(!eval_expression())

7
rcbasic_build/parser.h
View File

@@ -41,6 +41,7 @@ struct type_error_exception
string tk_reg; string tk_reg;
string resolve_reg; string resolve_reg;
int num_args; int num_args;
bool exception_used;
}; };
vector<type_error_exception> byref_type_exception; //This will store the error that might be generated if a user type var is in an expression without its dimensions expressed vector<type_error_exception> byref_type_exception; //This will store the error that might be generated if a user type var is in an expression without its dimensions expressed
@@ -1682,6 +1683,7 @@ bool pre_parse(int start_token = 0, int end_token = -1, int pp_flags, bool eval_
tx.error_log = "[0]Expected " + rc_intToString(id[tmp_id].num_args) + " dimension in " + id[tmp_id].name; tx.error_log = "[0]Expected " + rc_intToString(id[tmp_id].num_args) + " dimension in " + id[tmp_id].name;
tx.tk_reg = token[i]; tx.tk_reg = token[i];
tx.num_args = id[tmp_id].num_args; tx.num_args = id[tmp_id].num_args;
tx.exception_used = false;
//cout << "!!!! type_no_arg_exception_raised = false;" << endl; //cout << "!!!! type_no_arg_exception_raised = false;" << endl;
//cout << "store = " << id[tmp_id].name << " = " << tx.tk_reg << " arg_count = " << arg_count << ", expected = " << id[tmp_id].num_args << endl; //cout << "store = " << id[tmp_id].name << " = " << tx.tk_reg << " arg_count = " << arg_count << ", expected = " << id[tmp_id].num_args << endl;
byref_type_exception.push_back(tx); byref_type_exception.push_back(tx);
@@ -2110,6 +2112,7 @@ bool pre_parse(int start_token = 0, int end_token = -1, int pp_flags, bool eval_
//check if byref_type_exception //check if byref_type_exception
bool type_exception_found = false; bool type_exception_found = false;
int type_exception_index = -1;
//cout << "CHECK EXCEPTION: " << args[n] << endl; //cout << "CHECK EXCEPTION: " << args[n] << endl;
for(int bt_i = 0; bt_i < byref_type_exception.size(); bt_i++) for(int bt_i = 0; bt_i < byref_type_exception.size(); bt_i++)
{ {
@@ -2118,6 +2121,7 @@ bool pre_parse(int start_token = 0, int end_token = -1, int pp_flags, bool eval_
//cout << "FOUND EXCEPTION: " << args[n] << endl; //cout << "FOUND EXCEPTION: " << args[n] << endl;
byref_type_exception[bt_i].tk_reg = ""; byref_type_exception[bt_i].tk_reg = "";
type_exception_found = true; type_exception_found = true;
type_exception_index = bt_i;
} }
//else //else
//cout << "NO MATCH (" << args[n] << ", " << byref_type_exception[bt_i].tk_reg << ")" << endl; //cout << "NO MATCH (" << args[n] << ", " << byref_type_exception[bt_i].tk_reg << ")" << endl;
@@ -2281,6 +2285,7 @@ bool pre_parse(int start_token = 0, int end_token = -1, int pp_flags, bool eval_
rc_setError("Expected number identifier for argument in " + id[expr_id].name); rc_setError("Expected number identifier for argument in " + id[expr_id].name);
return false; return false;
} }
byref_type_exception[type_exception_index].exception_used = true;
vm_asm.push_back("ptr !" + rc_intToString(id[expr_id].fn_arg_vec[n]) + " " + args[n]); vm_asm.push_back("ptr !" + rc_intToString(id[expr_id].fn_arg_vec[n]) + " " + args[n]);
break; break;
case ID_TYPE_BYREF_STR: case ID_TYPE_BYREF_STR:
@@ -2289,6 +2294,7 @@ bool pre_parse(int start_token = 0, int end_token = -1, int pp_flags, bool eval_
rc_setError("Expected string identifier for argument"); rc_setError("Expected string identifier for argument");
return false; return false;
} }
byref_type_exception[type_exception_index].exception_used = true;
vm_asm.push_back("ptr$ !" + rc_intToString(id[expr_id].fn_arg_vec[n]) + " " + args[n]); vm_asm.push_back("ptr$ !" + rc_intToString(id[expr_id].fn_arg_vec[n]) + " " + args[n]);
break; break;
case ID_TYPE_BYREF_USER: case ID_TYPE_BYREF_USER:
@@ -2299,6 +2305,7 @@ bool pre_parse(int start_token = 0, int end_token = -1, int pp_flags, bool eval_
return false; return false;
} }
//cout << "yolo: " << expr_id << " ~ " << id.size() << " -- " << id[expr_id].num_args << endl; //cout << "yolo: " << expr_id << " ~ " << id.size() << " -- " << id[expr_id].num_args << endl;
byref_type_exception[type_exception_index].exception_used = true;
vm_asm.push_back("uref_ptr !" + rc_intToString(id[expr_id].fn_arg_vec[n]) + " " + args[n]); vm_asm.push_back("uref_ptr !" + rc_intToString(id[expr_id].fn_arg_vec[n]) + " " + args[n]);
//cout << "testing" << endl; //cout << "testing" << endl;
break; break;