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-08-29 07:39:28 -07:00 committed by GitHub
parent c040be7167
commit ed2764aaf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 52 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
version3.0/nasal_gc.h
View File

@ -22,8 +22,8 @@ public:
~nasal_vector(); ~nasal_vector();
void add_elem(int); void add_elem(int);
int del_elem(int); int del_elem(int);
int get_value_address(int); int get_value_address(int);
int get_mem_address(int); int get_mem_address(int);
}; };
class nasal_hash class nasal_hash
@ -36,8 +36,8 @@ public:
~nasal_hash(); ~nasal_hash();
void add_elem(std::string,int); void add_elem(std::string,int);
void del_elem(std::string); void del_elem(std::string);
int get_value_address(std::string); int get_value_address(std::string);
int get_mem_address(std::string); int get_mem_address(std::string);
}; };
class nasal_function class nasal_function
@ -51,7 +51,7 @@ public:
nasal_function(); nasal_function();
~nasal_function(); ~nasal_function();
void set_closure_addr(int); void set_closure_addr(int);
int get_closure_addr(); int get_closure_addr();
void set_arguments(nasal_ast&); void set_arguments(nasal_ast&);
void set_run_block(nasal_ast&); void set_run_block(nasal_ast&);
}; };
@ -69,8 +69,8 @@ public:
void add_scope(); void add_scope();
void del_scope(); void del_scope();
void add_new_value(std::string,int); void add_new_value(std::string,int);
int get_value_address(std::string); int get_value_address(std::string);
int get_mem_address(std::string); int get_mem_address(std::string);
}; };
class nasal_scalar class nasal_scalar
@ -265,9 +265,9 @@ nasal_function::~nasal_function()
function_expr.clear(); function_expr.clear();
return; return;
} }
void nasal_function::set_closure_addr(int address) void nasal_function::set_closure_addr(int value_address)
{ {
closure_addr=address; closure_addr=value_address;
return; return;
} }
int nasal_function::get_closure_addr() int nasal_function::get_closure_addr()

44
version3.0/nasal_runtime.h
View File

@ -170,18 +170,34 @@ int nasal_runtime::function_generation(nasal_ast& node,int local_scope_addr)
ref_of_this_function.set_arguments(node.get_children()[0]); ref_of_this_function.set_arguments(node.get_children()[0]);
ref_of_this_function.set_run_block(node.get_children()[1]); ref_of_this_function.set_run_block(node.get_children()[1]);
if(local_scope_addr>=0)
{
nasal_vm.add_reference(local_scope_addr);
ref_of_this_function.set_closure_addr(local_scope_addr);
}
return new_addr; return new_addr;
} }
int nasal_runtime::main_progress() int nasal_runtime::main_progress()
{ {
int ret_state=rt_exit_without_error; int ret_state=rt_exit_without_error;
int expr_number=root.get_children().size(); int expr_number=root.get_children().size();
int process_returned_value_addr=-1;
for(int i=0;i<expr_number;++i) for(int i=0;i<expr_number;++i)
{ {
int node_type=root.get_children()[i].get_type(); int node_type=root.get_children()[i].get_type();
switch(node_type) switch(node_type)
{ {
case ast_definition:break; case ast_definition:break;
case ast_multi_assign:break;
case ast_conditional:
ret_state=conditional_progress(root.get_children()[i],-1);
break;
case ast_while:
case ast_for:
case ast_forindex:
case ast_foreach:
ret_state=loop_progress(root.get_children()[i],-1);
break;
case ast_number:break; case ast_number:break;
case ast_string:break; case ast_string:break;
case ast_add_equal: case ast_add_equal:
@ -196,8 +212,34 @@ int nasal_runtime::main_progress()
case ast_mult: case ast_mult:
case ast_div: case ast_div:
case ast_link: case ast_link:
case ast_trinocular:calculation(root.get_children()[i],-1);break; case ast_trinocular:
process_returned_value_addr=calculation(root.get_children()[i],-1);
nasal_vm.del_reference(process_returned_value_addr);
break;
case ast_break:
ret_state=rt_break;
break;
case ast_continue:
ret_state=rt_continue;
break;
} }
switch(ret_state)
{
case rt_break:
std::cout<<">> [runtime] main_progress:cannot use break in main progress."<<std::endl;
++error;
break;
case rt_continue:
std::cout<<">> [runtime] main_progress:cannot use continue in main progress."<<std::endl;
++error;
break;
case rt_error:
std::cout<<">> [runtime] main_progress:error occurred when executing main progress."<<std::endl;
++error;
break;
}
if(error)
break;
} }
return ret_state; return ret_state;
} }