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

update

This commit is contained in:
Valk Richard Li 2020-06-17 02:56:25 -07:00 committed by GitHub
parent cbb5d01d04
commit eb66bbee20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
version3.0/nasal_parse.h
View File

@ -86,6 +86,12 @@ void nasal_parse::main_process()
{ {
root.add_child(expr()); root.add_child(expr());
++ptr; ++ptr;
if(ptr<tok_list_size && tok_list[ptr].type==tok_semi) ++ptr;
else if(ptr<tok_list_size && (root.get_children().empty() || !check_function_end(root.get_children().back())))
{
++error;
error_info(tok_list[ptr].line,lack_semi);
}
} }
std::cout<<">> [parse] complete generation. "<<error<<" error(s)."<<std::endl; std::cout<<">> [parse] complete generation. "<<error<<" error(s)."<<std::endl;
return; return;
@ -172,9 +178,8 @@ nasal_ast nasal_parse::vector_gen()
{ {
node.add_child(calculation()); node.add_child(calculation());
++ptr; ++ptr;
if(ptr>=tok_list_size) break;
if(ptr<tok_list_size && tok_list[ptr].type==tok_comma) ++ptr; if(ptr<tok_list_size && tok_list[ptr].type==tok_comma) ++ptr;
if(ptr<tok_list_size && tok_list[ptr].type!=tok_comma && tok_list[ptr].type!=tok_right_bracket) else if(ptr<tok_list_size && tok_list[ptr].type!=tok_comma && tok_list[ptr].type!=tok_right_bracket)
{ {
error_info(tok_list[ptr].line,lack_comma); error_info(tok_list[ptr].line,lack_comma);
++error; ++error;