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 2019-11-13 11:36:05 +08:00 committed by GitHub
parent 6aef19ce7a
commit 85310cf2dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
balloon/abstract_syntax_tree.cpp
View File

@ -395,6 +395,7 @@ bool abstract_syntax_tree::condition_check()
var abstract_syntax_tree::call_identifier() var abstract_syntax_tree::call_identifier()
{ {
var temp; var temp;
temp.set_type(__null_type);
if(scope.search_var(name)) if(scope.search_var(name))
temp=scope.get_var(name); temp=scope.get_var(name);
else else
@ -407,7 +408,39 @@ var abstract_syntax_tree::call_identifier()
{ {
for(std::list<abstract_syntax_tree>::iterator i=children.begin();i!=children.end();++i) for(std::list<abstract_syntax_tree>::iterator i=children.begin();i!=children.end();++i)
{ {
if(i->type==__call_array && temp.get_type()==__var_array)
{
var place=i->children.front().calculation();
if(place.get_type()==__var_number)
temp=temp.get_array_member((int)place.get_number());
else
{
exit_type=__error_value_type;
std::cout<<">>[Runtime-error] ";
print_detail_token(i->type);
std::cout<<":incorrect type \'";
print_scalar(temp.get_type());
std::cout<<"\'."<<std::endl;
break;
}
}
else if(i->type==__call_hash && temp.get_type()==__var_hash)
{
}
else if(i->type==__call_function && temp.get_type()==__var_function)
{
}
else
{
exit_type=__error_value_type;
std::cout<<">>[Runtime-error] ";
print_detail_token(i->type);
std::cout<<":incorrect type \'";
print_scalar(temp.get_type());
std::cout<<"\'."<<std::endl;
}
} }
} }
return temp; return temp;
@ -469,7 +502,7 @@ void abstract_syntax_tree::run_root()
{ {
++j; ++j;
if(j!=i->children.end()) if(j!=i->children.end())
new_var=j->get_value(); new_var=j->calculation();
new_var.set_name(_name); new_var.set_name(_name);
scope.add_new_var(new_var); scope.add_new_var(new_var);
} }
@ -497,7 +530,13 @@ void abstract_syntax_tree::run_root()
else if(i->type==__string) else if(i->type==__string)
std::cout<<i->str<<std::endl; std::cout<<i->str<<std::endl;
else if(i->type==__id) else if(i->type==__id)
std::cout<<i->call_identifier().get_name()<<std::endl; {
var t=i->call_identifier();
if(t.get_type()==__var_number)
std::cout<<t.get_number()<<std::endl;
else if(t.get_type()==__var_string)
std::cout<<t.get_string()<<std::endl;
}
else if(i->type==__while) else if(i->type==__while)
{ {
scope.add_new_block_scope(); scope.add_new_block_scope();
@ -592,7 +631,7 @@ int abstract_syntax_tree::run_block()
{ {
++j; ++j;
if(j!=i->children.end()) if(j!=i->children.end())
new_var=j->get_value(); new_var=j->calculation();
new_var.set_name(_name); new_var.set_name(_name);
scope.add_new_var(new_var); scope.add_new_var(new_var);
} }
@ -600,7 +639,6 @@ int abstract_syntax_tree::run_block()
{ {
std::cout<<">>[Runtime-error] redeclaration of \'"<<_name<<"\'."<<std::endl; std::cout<<">>[Runtime-error] redeclaration of \'"<<_name<<"\'."<<std::endl;
exit_type=__redeclaration; exit_type=__redeclaration;
break;
} }
} }
else if(i->type==__number) else if(i->type==__number)
@ -608,7 +646,13 @@ int abstract_syntax_tree::run_block()
else if(i->type==__string) else if(i->type==__string)
std::cout<<i->str<<std::endl; std::cout<<i->str<<std::endl;
else if(i->type==__id) else if(i->type==__id)
std::cout<<i->call_identifier().get_name()<<std::endl; {
var t=i->call_identifier();
if(t.get_type()==__var_number)
std::cout<<t.get_number()<<std::endl;
else if(t.get_type()==__var_string)
std::cout<<t.get_string()<<std::endl;
}
else if(i->type==__equal || i->type==__add_equal || i->type==__sub_equal || i->type==__mul_equal || i->type==__div_equal || i->type==__link_equal) else if(i->type==__equal || i->type==__add_equal || i->type==__sub_equal || i->type==__mul_equal || i->type==__div_equal || i->type==__link_equal)
{ {
; ;
@ -650,9 +694,7 @@ int abstract_syntax_tree::run_block()
var temp; var temp;
temp.set_type(__null_type); temp.set_type(__null_type);
if(!(i->children.empty())) if(!(i->children.empty()))
{ temp=i->calculation();
}
ret_stack.push(temp); ret_stack.push(temp);
return __return; return __return;
} }

1
balloon/loop.txt
View File

@ -2,6 +2,7 @@ var a=1;
var sum=0; var sum=0;
while(a!=100) while(a!=100)
{ {
a;
sum+=a; sum+=a;
a+=1; a+=1;
} }