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

bug fixed

This commit is contained in:
Valk Richard Li 2019-11-27 17:07:30 +08:00 committed by GitHub
parent 85c4ce8946
commit bc5ae6384b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
balloon/abstract_syntax_tree.cpp
View File

@ -7,6 +7,7 @@ int exit_type=0;
std::stack<var> ret_stack; // for function ret use(especially the recursion) std::stack<var> ret_stack; // for function ret use(especially the recursion)
int recursion_depth=0; // avoid deep recursion to sigsegv int recursion_depth=0; // avoid deep recursion to sigsegv
std::string str_for_input; // avoid stack overflow std::string str_for_input; // avoid stack overflow
var* append_addr; // used in append function
var abstract_syntax_tree::calculation() var abstract_syntax_tree::calculation()
{ {
@ -518,9 +519,16 @@ var abstract_syntax_tree::call_identifier()
self.set_type(__var_function); self.set_type(__var_function);
self.set_name(temp.get_name()); self.set_name(temp.get_name());
self.set_function(temp.get_function()); self.set_function(temp.get_function());
if(temp.get_name()=="append")
{
append_addr=NULL;
if(!i->children.empty())
append_addr=i->children.begin()->get_var_addr();
}
std::list<var> parameter; std::list<var> parameter;
for(std::list<abstract_syntax_tree>::iterator j=i->children.begin();j!=i->children.end();++j) if(!i->children.empty())
parameter.push_back(j->calculation()); for(std::list<abstract_syntax_tree>::iterator j=i->children.begin();j!=i->children.end();++j)
parameter.push_back(j->calculation());
temp=temp.get_function().run_func(parameter,self); temp=temp.get_function().run_func(parameter,self);
} }
else else
@ -958,23 +966,19 @@ var abstract_syntax_tree::run_func(std::list<var> parameter,var self_func)
} }
else if(self_func.get_name()=="append") else if(self_func.get_name()=="append")
{ {
if(!parameter.empty()) if(append_addr)
{ {
std::list<var>::iterator i=parameter.begin(); std::list<var>::iterator i=parameter.begin();
var* array_addr=scope.append_get_addr(i->get_name()); if(append_addr->get_type()==__var_array)
if(array_addr->get_type()==__var_array)
{ {
if(array_addr!=&error_var) ++i;
{ for(;i!=parameter.end();++i)
++i; append_addr->append_array(*i);
for(;i!=parameter.end();++i) }
array_addr->append_array(*i); else if(append_addr->get_type()==__null_type)
} {
else std::cout<<">>[Runtime-error] line "<<line<<": cannot find a var named \'"<<parameter.begin()->get_name()<<"\'."<<std::endl;
{ exit_type=__find_var_failure;
std::cout<<">>[Runtime-error] line "<<line<<": cannot find a var named \'"<<parameter.begin()->get_name()<<"\'."<<std::endl;
exit_type=__find_var_failure;
}
} }
else else
{ {

1
balloon/balloon.h
View File

@ -52,5 +52,6 @@ void alert_sound()
std::stack<var> ret_stack; // for function ret use std::stack<var> ret_stack; // for function ret use
int recursion_depth; // avoid too deep recursion int recursion_depth; // avoid too deep recursion
std::string str_for_input // global value str to avoid stack overflow std::string str_for_input // global value str to avoid stack overflow
var* append_addr // used in append function , to get a correct addr of all kinds of arrays
*/ */
#endif #endif