floraachy/Nasal-Interpreter
1
0
Fork 0
forked from xxq250/Nasal-Interpreter
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
Valk Richard Li
2020-12-17 00:14:22 +08:00
parent 19ce1c5f34
commit ae16f36baa
3 changed files with 19 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nasal_bytecode_vm.h
+8 -6
View File
@@ -968,13 +968,14 @@ void nasal_bytecode_vm::opr_foreach()
void nasal_bytecode_vm::opr_call()
{
int val_addr=-1;
std::string symbol=string_table[exec_code[ptr].index];
if(local_scope_stack.top()>=0)
val_addr=vm.gc_get(local_scope_stack.top()).get_closure().get_value_address(string_table[exec_code[ptr].index]);
val_addr=vm.gc_get(local_scope_stack.top()).get_closure().get_value_address(symbol);
if(val_addr<0)
val_addr=vm.gc_get(global_scope_addr).get_closure().get_value_address(string_table[exec_code[ptr].index]);
val_addr=vm.gc_get(global_scope_addr).get_closure().get_value_address(symbol);
if(val_addr<0)
{
die("call: cannot find symbol named \""+string_table[exec_code[ptr].index]+"\"");
die("call: cannot find symbol named \""+symbol+"\"");
return;
}
vm.add_reference(val_addr);
@@ -1281,12 +1282,13 @@ void nasal_bytecode_vm::opr_slice2()
void nasal_bytecode_vm::opr_mcall()
{
int* mem_addr=NULL;
std::string symbol=string_table[exec_code[ptr].index];
if(local_scope_stack.top()>=0)
mem_addr=vm.gc_get(local_scope_stack.top()).get_closure().get_mem_address(string_table[exec_code[ptr].index]);
mem_addr=vm.gc_get(local_scope_stack.top()).get_closure().get_mem_address(symbol);
if(!mem_addr)
mem_addr=vm.gc_get(global_scope_addr).get_closure().get_mem_address(string_table[exec_code[ptr].index]);
mem_addr=vm.gc_get(global_scope_addr).get_closure().get_mem_address(symbol);
if(!mem_addr)
die("mcall: cannot find symbol named \""+string_table[exec_code[ptr].index]+"\"");
die("mcall: cannot find symbol named \""+symbol+"\"");
pointer_stack.push(mem_addr);
return;
}