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-01-26 22:08:25 +08:00 committed by GitHub
parent c63e084149
commit 2419eba1bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
version2.0/nasal_parse.h
View File

@ -33,6 +33,7 @@ class nasal_parse
bool check_multi_assignment();// check multi_call_id '=' multi_scalar bool check_multi_assignment();// check multi_call_id '=' multi_scalar
bool check_multi_scalar(); // check multi_scalar bool check_multi_scalar(); // check multi_scalar
bool check_var_in_curve(); // check multi_definition: (var id,id,id) bool check_var_in_curve(); // check multi_definition: (var id,id,id)
bool check_function_end(abstract_syntax_tree&); // check end of definition or '=' is a function
// abstract_syntax_tree generation // abstract_syntax_tree generation
// block statements generation // block statements generation
@ -296,6 +297,22 @@ bool nasal_parse::check_var_in_curve()
return ret; return ret;
} }
bool nasal_parse::check_function_end(abstract_syntax_tree& tmp)
{
if(tmp.get_node_type()==__definition || tmp.get_node_type()==__equal)
{
if(!tmp.get_children().empty())
{
if(tmp.get_children().back().get_node_type()==__function)
return true;
else
return check_function_end(tmp.get_children().back());
}
return false;
}
return false;
}
void nasal_parse::main_generate() void nasal_parse::main_generate()
{ {
error=0; error=0;
@ -314,10 +331,7 @@ void nasal_parse::main_generate()
case __var: case __var:
this->push_token(); this->push_token();
root.add_children(definition()); root.add_children(definition());
if((!root.get_children().empty()) && if((!root.get_children().empty()) && check_function_end(root.get_children().back()))
(!root.get_children().back().get_children().empty()) &&
(root.get_children().back().get_children().back().get_node_type()==__function)
)
need_semi_check=false; need_semi_check=false;
else else
need_semi_check=true; need_semi_check=true;
@ -329,11 +343,7 @@ void nasal_parse::main_generate()
this->push_token(); this->push_token();
root.add_children(calculation()); root.add_children(calculation());
// check assignment function // check assignment function
if((!root.get_children().empty()) && if((!root.get_children().empty()) && check_function_end(root.get_children().back()))
(root.get_children().back().get_node_type()==__equal) &&
(!root.get_children().back().get_children().empty()) &&
(root.get_children().back().get_children().back().get_node_type()==__function)
)
need_semi_check=false; need_semi_check=false;
else else
need_semi_check=true; need_semi_check=true;
@ -454,10 +464,7 @@ abstract_syntax_tree nasal_parse::block_generate()
case __var: case __var:
this->push_token(); this->push_token();
block_node.get_children().push_back(definition()); block_node.get_children().push_back(definition());
if((!block_node.get_children().empty()) && if((!block_node.get_children().empty()) && check_function_end(block_node.get_children().back()))
(!block_node.get_children().back().get_children().empty()) &&
(block_node.get_children().back().get_children().back().get_node_type()==__function)
)
need_semi_check=false; need_semi_check=false;
else else
need_semi_check=true; need_semi_check=true;
@ -468,11 +475,7 @@ abstract_syntax_tree nasal_parse::block_generate()
case __func: case __func:
this->push_token(); this->push_token();
block_node.add_children(calculation()); block_node.add_children(calculation());
if((!block_node.get_children().empty()) && if((!block_node.get_children().empty()) && check_function_end(block_node.get_children().back()))
(block_node.get_children().back().get_node_type()==__equal) &&
(!block_node.get_children().back().get_children().empty()) &&
(block_node.get_children().back().get_children().back().get_node_type()==__function)
)
need_semi_check=false; need_semi_check=false;
else else
need_semi_check=true; need_semi_check=true;