p67319205
/
Nasal-Interpreter
mirror of https://github.com/ValKmjolnir/Nasal-Interpreter.git
1
0
Fork 1
Code Issues Projects Releases Wiki Activity

⚡ change some branches

This commit is contained in:
ValKmjolnir 2022-07-22 22:24:48 +08:00
parent af761641d6
commit 8ca0bc52c3
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nasal_vm.h
View File

@ -242,8 +242,6 @@ void nasal_vm::stackinfo(const uint32_t limit=10)
std::cout<<"vm stack(0x"<<std::hex<<(uint64_t)bottom<<std::dec std::cout<<"vm stack(0x"<<std::hex<<(uint64_t)bottom<<std::dec
<<"<sp+"<<gsize<<">, limit "<<limit<<", total " <<"<sp+"<<gsize<<">, limit "<<limit<<", total "
<<(t<bottom? 0:(int64_t)(t-bottom+1))<<")\n"; <<(t<bottom? 0:(int64_t)(t-bottom+1))<<")\n";
if(t<bottom)
return;
for(uint32_t i=0;i<limit && t>=bottom;++i,--t) for(uint32_t i=0;i<limit && t>=bottom;++i,--t)
{ {
std::cout<<" 0x"<<std::hex std::cout<<" 0x"<<std::hex
@ -360,9 +358,7 @@ inline bool nasal_vm::condition(nasal_ref val)
else if(val.type==vm_str) else if(val.type==vm_str)
{ {
const double num=str2num(val.str().c_str()); const double num=str2num(val.str().c_str());
if(std::isnan(num)) return std::isnan(num)?!val.str().empty():num;
return !val.str().empty();
return num;
} }
return false; return false;
} }
@ -618,9 +614,9 @@ inline void nasal_vm::opr_jf()
} }
inline void nasal_vm::opr_cnt() inline void nasal_vm::opr_cnt()
{ {
(++top)[0]={vm_cnt,(int64_t)-1}; if(top[0].type!=vm_vec)
if(top[-1].type!=vm_vec)
die("cnt: must use vector in forindex/foreach"); die("cnt: must use vector in forindex/foreach");
(++top)[0]={vm_cnt,(int64_t)-1};
} }
inline void nasal_vm::opr_findex() inline void nasal_vm::opr_findex()
{ {