diff --git a/version3.0/nasal_gc.h b/version3.0/nasal_gc.h index a0c30b4..15b56c1 100644 --- a/version3.0/nasal_gc.h +++ b/version3.0/nasal_gc.h @@ -734,25 +734,167 @@ int nasal_scalar::nasal_scalar_and(int a_scalar_addr,int b_scalar_addr) { nasal_scalar& a_ref=nasal_vm.gc_get(a_scalar_addr); nasal_scalar& b_ref=nasal_vm.gc_get(b_scalar_addr); - if(a_ref.type==vm_hash || a_ref.type==vm_vector || b_ref.type==vm_hash || b_ref.type==vm_vector) + if(a_ref.type==vm_hash || a_ref.type==vm_vector || a_ref.type==vm_function || b_ref.type==vm_hash || b_ref.type==vm_vector || b_ref.type==vm_function) { std::cout<<">> [vm] scalar_and: hash and vector cannot take part in and calculation."<> [vm] scalar_or: hash and vector cannot take part in or calculation."<