xxq250/Nasal-Interpreter
1
0
Fork 1
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git synced 2026-07-26 21:08:45 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Valk Richard Li
2020-01-24 16:09:47 +08:00
committed by GitHub
parent d32668b2f8
commit 036bd1ca7c
1 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version2.0/nasal_parse.h
+37 -36
View File
@@ -4,7 +4,6 @@
class nasal_parse class nasal_parse
{ {
private: private:
bool need_semi_check;// if this is true,this means needs check_semi()
std::stack<token> parse_token_stream; std::stack<token> parse_token_stream;
std::stack<token> checked_tokens; std::stack<token> checked_tokens;
token this_token; token this_token;
@@ -307,13 +306,21 @@ void nasal_parse::main_generate()
// initialize root node // initialize root node
while(!parse_token_stream.empty() && parse_token_stream.top().type!=__stack_end) while(!parse_token_stream.empty() && parse_token_stream.top().type!=__stack_end)
{ {
need_semi_check=false; bool need_semi_check=false;
// if need_semi_check is true,this means needs check_semi()
this->get_token(); this->get_token();
switch(this_token.type) switch(this_token.type)
{ {
case __var: case __var:
this->push_token(); this->push_token();
root.add_children(definition()); root.add_children(definition());
if((!root.get_children().empty()) &&
(!root.get_children().back().get_children().empty()) &&
(root.get_children().back().get_children().back().get_node_type()==__function)
)
need_semi_check=false;
else
need_semi_check=true;
break; break;
case __nor_operator: case __sub_operator: case __nor_operator: case __sub_operator:
case __number: case __nil: case __string: case __id: case __number: case __nil: case __string: case __id:
@@ -321,7 +328,12 @@ void nasal_parse::main_generate()
case __func: case __func:
this->push_token(); this->push_token();
root.add_children(calculation()); root.add_children(calculation());
if((root.get_children().back().get_node_type()==__equal) && root.get_children().back().get_children().back().get_node_type()==__function) // check assignment function
if((!root.get_children().empty()) &&
(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;
@@ -329,20 +341,13 @@ void nasal_parse::main_generate()
case __left_curve: case __left_curve:
this->push_token(); this->push_token();
if(check_var_in_curve()) if(check_var_in_curve())
{
root.add_children(definition()); root.add_children(definition());
// in definition,only function doesn't need check_semi() // multi-definition must need semi_check
}
else if(check_multi_assignment()) else if(check_multi_assignment())
{
need_semi_check=true;
root.add_children(multi_scalar_assignment()); root.add_children(multi_scalar_assignment());
}
else else
{
need_semi_check=true;
root.add_children(calculation()); root.add_children(calculation());
} need_semi_check=true;
break; break;
// '(' is the beginning of too many statements // '(' is the beginning of too many statements
// '(' var id,id,id ')' // '(' var id,id,id ')'
@@ -393,24 +398,21 @@ 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().back().get_node_type()==__equal) && block_node.get_children().back().get_children().back().get_node_type()==__function)
need_semi_check=false;
else
need_semi_check=true;
break; break;
case __left_curve: case __left_curve:
this->push_token(); this->push_token();
if(check_var_in_curve()) if(check_var_in_curve())
block_node.add_children(definition()); block_node.add_children(definition());
// multi-definition must need semi_check
else if(check_multi_assignment()) else if(check_multi_assignment())
block_node.add_children(multi_scalar_assignment()); block_node.add_children(multi_scalar_assignment());
else else
block_node.add_children(calculation()); block_node.add_children(calculation());
break;
// '(' is the beginning of too many statements // '(' is the beginning of too many statements
// '(' var id,id,id ')' // '(' var id,id,id ')'
// '(' calculation ')' // '(' calculation ')'
// '(' scalar,scalar,scalar ')' '=' '(' scalar,scalar,scalar ')' // '(' scalar,scalar,scalar ')' '=' '(' scalar,scalar,scalar ')'
break;
case __if: case __if:
this->push_token(); this->push_token();
block_node.add_children(conditional_expr()); block_node.add_children(conditional_expr());
@@ -439,19 +441,26 @@ abstract_syntax_tree nasal_parse::block_generate()
this->get_token(); this->get_token();
if(this_token.type!=__semi) if(this_token.type!=__semi)
this->push_token(); this->push_token();
need_semi_check=false;
} }
else else
{ {
this->get_token(); this->get_token();
while(this_token.type!=__right_brace && !parse_token_stream.empty() && parse_token_stream.top().type!=__stack_end) while(this_token.type!=__right_brace && !parse_token_stream.empty() && parse_token_stream.top().type!=__stack_end)
{ {
need_semi_check=false; bool need_semi_check=false;
// if need_semi_check is true,this means needs check_semi()
switch(this_token.type) switch(this_token.type)
{ {
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()) &&
(!block_node.get_children().back().get_children().empty()) &&
(block_node.get_children().back().get_children().back().get_node_type()==__function)
)
need_semi_check=false;
else
need_semi_check=true;
break; break;
case __nor_operator: case __sub_operator: case __nor_operator: case __sub_operator:
case __number: case __nil: case __string: case __id: case __number: case __nil: case __string: case __id:
@@ -459,25 +468,24 @@ 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()) &&
(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;
else
need_semi_check=true; need_semi_check=true;
break; break;
case __left_curve: case __left_curve:
this->push_token(); this->push_token();
if(check_var_in_curve()) if(check_var_in_curve())
{
block_node.add_children(definition()); block_node.add_children(definition());
// in definition,only function doesn't need check_semi()
}
else if(check_multi_assignment()) else if(check_multi_assignment())
{
need_semi_check=true;
block_node.add_children(multi_scalar_assignment()); block_node.add_children(multi_scalar_assignment());
}
else else
{
need_semi_check=true;
block_node.add_children(calculation()); block_node.add_children(calculation());
} need_semi_check=true;
break; break;
// '(' is the beginning of too many statements // '(' is the beginning of too many statements
// '(' var id,id,id ')' // '(' var id,id,id ')'
@@ -519,7 +527,6 @@ abstract_syntax_tree nasal_parse::block_generate()
++error; ++error;
print_parse_error(lack_right_brace,this_token.line,this_token.type); print_parse_error(lack_right_brace,this_token.line,this_token.type);
} }
need_semi_check=false;
} }
return block_node; return block_node;
} }
@@ -1274,7 +1281,6 @@ abstract_syntax_tree nasal_parse::definition()
++error; ++error;
print_parse_error(definition_lack_equal,this_token.line,this_token.type); print_parse_error(definition_lack_equal,this_token.line,this_token.type);
} }
need_semi_check=true;
} }
else else
{ {
@@ -1288,11 +1294,7 @@ abstract_syntax_tree nasal_parse::definition()
definition_node.add_children(new_var_identifier); definition_node.add_children(new_var_identifier);
this->get_token(); this->get_token();
if(this_token.type==__equal) if(this_token.type==__equal)
{ definition_node.add_children(calculation());// var id = scalar
abstract_syntax_tree calc_scalar=calculation();
need_semi_check=(calc_scalar.get_node_type()!=__function);
definition_node.add_children(calc_scalar);// var id = scalar
}
else else
{ {
this->push_token(); this->push_token();
@@ -1372,7 +1374,6 @@ abstract_syntax_tree nasal_parse::definition()
++error; ++error;
print_parse_error(definition_lack_equal,this_token.line,this_token.type); print_parse_error(definition_lack_equal,this_token.line,this_token.type);
} }
need_semi_check=true;
} }
else else
{ {