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

Fixed bugs in multive_calc(endless loop)

Browse Source
This commit is contained in:
Valk Richard Li
2019-10-22 23:43:51 +08:00
committed by GitHub
parent 939b3afc36
commit d96fe54269
3 changed files with 76 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
version1.2/ast.h
+10
View File
@@ -34,6 +34,7 @@ class abstract_syntax_tree
var_number=p.var_number; var_number=p.var_number;
var_string=p.var_string; var_string=p.var_string;
var_name=p.var_name; var_name=p.var_name;
children.clear();
children=p.children; children=p.children;
return *this; return *this;
} }
@@ -53,6 +54,15 @@ class abstract_syntax_tree
str+="| "; str+="| ";
std::cout<<str; std::cout<<str;
print_token(ast_node_type); print_token(ast_node_type);
switch(ast_node_type)
{
case __number:std::cout<<": "<<var_number;break;
case __string:std::cout<<": "<<var_string;break;
case __id:
case __list_search:
case __hash_search:
case __call_function:std::cout<<": "<<var_name;break;
}
std::cout<<std::endl; std::cout<<std::endl;
if(!children.empty()) if(!children.empty())
{ {
version1.2/nasal_parser.h
+14 -9
View File
@@ -1223,8 +1223,7 @@ abstract_syntax_tree nasal_parser::mul_div_operator_expr()
node=identifier_call_expr(); node=identifier_call_expr();
break; break;
case __left_curve: case __left_curve:
parse.push(this_token); node=in_curve_calc_expr();
node=calculation_expr();
break; break;
default: default:
++error; ++error;
@@ -1277,8 +1276,7 @@ abstract_syntax_tree nasal_parser::mul_div_operator_expr()
node=temp; node=temp;
break; break;
case __left_curve: case __left_curve:
parse.push(this_token); temp.add_child(in_curve_calc_expr());
temp.add_child(calculation_expr());
node=temp; node=temp;
break; break;
default: default:
@@ -1294,7 +1292,7 @@ abstract_syntax_tree nasal_parser::unary_operator_expr()
{ {
abstract_syntax_tree node; abstract_syntax_tree node;
abstract_syntax_tree temp; abstract_syntax_tree temp;
node.set_node_type(__unary_operation); node.set_node_type(this_token.type);
get_token(); get_token();
switch(this_token.type) switch(this_token.type)
{ {
@@ -1315,8 +1313,7 @@ abstract_syntax_tree nasal_parser::unary_operator_expr()
node.add_child(temp); node.add_child(temp);
break; break;
case __left_curve: case __left_curve:
parse.push(this_token); node.add_child(in_curve_calc_expr());
node.add_child(calculation_expr());
break; break;
default: default:
++error; ++error;
@@ -1539,6 +1536,10 @@ abstract_syntax_tree nasal_parser::call_function_expr()
abstract_syntax_tree node; abstract_syntax_tree node;
abstract_syntax_tree temp; abstract_syntax_tree temp;
node.set_node_type(__call_function); node.set_node_type(__call_function);
get_token();
if(this_token.type!=__right_curve)
{
parse.push(this_token);
while(this_token.type!=__right_curve) while(this_token.type!=__right_curve)
{ {
get_token(); get_token();
@@ -1621,6 +1622,7 @@ abstract_syntax_tree nasal_parser::call_function_expr()
parse.push(this_token); parse.push(this_token);
} }
} }
}
get_token(); get_token();
switch(this_token.type) switch(this_token.type)
{ {
@@ -1675,6 +1677,7 @@ abstract_syntax_tree nasal_parser::identifier_call_expr()
} }
node.set_var_name(temp_name); node.set_var_name(temp_name);
abstract_syntax_tree temp; abstract_syntax_tree temp;
abstract_syntax_tree assign;
get_token(); get_token();
switch(this_token.type) switch(this_token.type)
{ {
@@ -1684,11 +1687,13 @@ abstract_syntax_tree nasal_parser::identifier_call_expr()
case __mul_equal: case __mul_equal:
case __div_equal: case __div_equal:
case __link_equal: case __link_equal:
temp.set_node_type(__assignment); assign.set_node_type(__assignment);
temp.set_node_type(this_token.type);
temp.add_child(node); temp.add_child(node);
temp.add_child(assignment_expr()); temp.add_child(assignment_expr());
assign.add_child(temp);
node.set_clear(); node.set_clear();
node=temp; node=assign;
break; break;
default:parse.push(this_token);break; default:parse.push(this_token);break;
} }
version1.2/nasal_token_type.h
+1 -3
View File
@@ -32,7 +32,6 @@ enum token_type
__root, __root,
__list,__hash, __list,__hash,
__hash_member, __hash_member,
__unary_operation,
__call_function,__list_search,__hash_search, __call_function,__list_search,__hash_search,
__normal_statement_block, __normal_statement_block,
__definition,__assignment, __definition,__assignment,
@@ -98,7 +97,6 @@ void print_token(int type)
case __list: context="list";break; case __list: context="list";break;
case __hash: context="hash";break; case __hash: context="hash";break;
case __hash_member: context="hash_member";break; case __hash_member: context="hash_member";break;
case __unary_operation: context="unary_calc";break;
case __call_function: context="call_func";break; case __call_function: context="call_func";break;
case __list_search: context="call_list";break; case __list_search: context="call_list";break;
case __hash_search: context="call_hash";break; case __hash_search: context="call_hash";break;
@@ -108,7 +106,7 @@ void print_token(int type)
case __function: context="function";break; case __function: context="function";break;
case __loop: context="loop";break; case __loop: context="loop";break;
case __ifelse: context="if-else";break; case __ifelse: context="if-else";break;
default: context="unknown_token";break; default: context="undefined_token";break;
} }
std::cout<<context; std::cout<<context;
return; return;