retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added JS Array method includes(). 

git-svn-id: http://yate.null.ro/svn/yate/trunk@6315 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
paulc 2018-05-10 12:55:45 +00:00
parent b96e06d214
commit 3a00fba2a8
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libs/yscript/jsobjects.cpp
View File

@ -553,6 +553,7 @@ JsArray::JsArray(Mutex* mtx)
params().addParam(new ExpFunction("slice"));
params().addParam(new ExpFunction("splice"));
params().addParam(new ExpFunction("sort"));
params().addParam(new ExpFunction("includes"));
params().addParam(new ExpFunction("indexOf"));
params().addParam(new ExpFunction("lastIndexOf"));
params().addParam("length","0");
@ -853,7 +854,9 @@ bool JsArray::runNative(ObjList& stack, const ExpOperation& oper, GenObject* con
for (int32_t i = 0; i < length(); i++)
result.append(params()[String(i)],separator);
ExpEvaluator::pushOne(stack,new ExpOperation(result));
} else if (oper.name() == YSTRING("indexOf") || oper.name() == YSTRING("lastIndexOf")) {
} else if (oper.name() == YSTRING("includes") || oper.name() == YSTRING("indexOf")
|| oper.name() == YSTRING("lastIndexOf")) {
// arr.includes(searchElement[,startIndex = 0[,"fieldName"]])
// arr.indexOf(searchElement[,startIndex = 0[,"fieldName"]])
// arr.lastIndexOf(searchElement[,startIndex = arr.length-1[,"fieldName"]])
ObjList args;
@ -918,7 +921,10 @@ bool JsArray::runNative(ObjList& stack, const ExpOperation& oper, GenObject* con
}
TelEngine::destruct(op1);
TelEngine::destruct(fld);
ExpEvaluator::pushOne(stack,new ExpOperation((int64_t)index));
if (oper.name().length() == 8)
ExpEvaluator::pushOne(stack,new ExpOperation(index >= 0));
else
ExpEvaluator::pushOne(stack,new ExpOperation((int64_t)index));
return true;
}
else