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

🐛 fix a bug that split doesn't work if delimeter's length is greater than 1.

This commit is contained in:
ValKmjolnir 2022-07-07 19:32:06 +08:00
parent 824a31ef55
commit c1d13ecd85
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nasal_builtin.h
View File

@ -323,8 +323,8 @@ nasal_ref builtin_split(nasal_ref* local,nasal_gc& gc)
return builtin_err("split","\"separator\" must be string"); return builtin_err("split","\"separator\" must be string");
if(str.type!=vm_str) if(str.type!=vm_str)
return builtin_err("split","\"str\" must be string"); return builtin_err("split","\"str\" must be string");
std::string& deli=delimeter.str(); const std::string& deli=delimeter.str();
std::string& s=str.str(); const std::string& s=str.str();
// avoid being sweeped // avoid being sweeped
nasal_ref res=gc.temp=gc.alloc(vm_vec); nasal_ref res=gc.temp=gc.alloc(vm_vec);
@ -337,14 +337,16 @@ nasal_ref builtin_split(nasal_ref* local,nasal_gc& gc)
gc.temp=nil; gc.temp=nil;
return res; return res;
} }
std::string::size_type last=s.find_first_not_of(deli,0); size_t last=0;
std::string::size_type pos=s.find_first_of(deli,last); size_t pos=s.find(deli,last);
while(pos!=std::string::npos || last!=std::string::npos) while(pos!=std::string::npos)
{ {
vec.push_back(gc.newstr(s.substr(last,pos-last))); vec.push_back(gc.newstr(s.substr(last,pos-last)));
last=s.find_first_not_of(deli,pos); last=pos+deli.length();
pos=s.find_first_of(deli,last); pos=s.find(deli,last);
} }
if(last!=s.length())
vec.push_back(gc.newstr(s.substr(last,s.length()-1)));
gc.temp=nil; gc.temp=nil;
return res; return res;
} }