xxq250
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 0
Code Issues Actions 1 Packages Projects Releases Wiki Activity

bugs fixed

This commit is contained in:
Valk Richard Li 2020-07-19 20:03:25 -07:00 committed by GitHub
parent 352735a843
commit 78683ffbd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
version3.0/nasal_parse.h
View File

@ -137,11 +137,15 @@ void nasal_parse::main_process()
if(ptr<tok_list_size && tok_list[ptr].type==tok_semi)
++ptr;
else if(root.get_children().empty() || need_semi_check(root.get_children().back()))
{
// the last expression can be recognized without semi
if(ptr>=tok_list_size)
{
++error;
error_info(error_line,lack_semi);
}
}
}
std::cout<<">> [parse] complete generation. "<<error<<" error(s)."<<std::endl;
return;
}
@ -205,7 +209,7 @@ bool nasal_parse::check_special_call()
// special call means like this:
// function_name(a:1,b:2,c:3);
int check_ptr=ptr+1;
int curve_cnt=1,bracket_cnt=0,brace_cnt=0;
int curve_cnt=1,bracket_cnt=0,brace_cnt=0,ques_cnt=0;
bool ret=false;
while(check_ptr<tok_list_size && curve_cnt)
{
@ -218,6 +222,12 @@ bool nasal_parse::check_special_call()
case tok_right_bracket:--bracket_cnt;break;
case tok_right_brace: --brace_cnt; break;
}
if(curve_cnt==1 && !bracket_cnt && !brace_cnt && tok_list[check_ptr].type==tok_quesmark)
{
// m?1:0 will be recognized as normal parameter
ret=false;
break;
}
if(curve_cnt==1 && !bracket_cnt && !brace_cnt && tok_list[check_ptr].type==tok_colon)
{
ret=true;
@ -540,12 +550,16 @@ nasal_ast nasal_parse::exprs_gen()
if(ptr<tok_list_size && tok_list[ptr].type==tok_semi)
++ptr;
else if(node.get_children().empty() || need_semi_check(node.get_children().back()))
{
// the last expression can be recognized without semi
if(ptr>=tok_list_size || tok_list[ptr].type!=tok_right_brace)
{
++error;
error_info(error_line,lack_semi);
break;
}
}
}
if(ptr>=tok_list_size || tok_list[ptr].type!=tok_right_brace)
{
++error;
@ -580,7 +594,12 @@ nasal_ast nasal_parse::calculation()
tmp.add_child(node);
++ptr;
if(ptr<tok_list_size) tmp.add_child(calculation());
else{ ++error; error_info(error_line,lack_calculation);}
else
{
++error;
error_info(error_line,lack_calculation);
return node;
}
++ptr;
if(ptr>=tok_list_size || tok_list[ptr].type!=tok_colon)
{