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

Added operator delete. 

Bug Fix. Do not remove undefined variables from stack.


git-svn-id: http://yate.null.ro/svn/yate/trunk@5397 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
andrei 2013-02-12 09:48:29 +00:00
parent 2a08c45703
commit f06d62838b
2 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
libs/yscript/javascript.cpp
View File

@ -45,9 +45,9 @@ public:
virtual bool runFunction(ObjList& stack, const ExpOperation& oper, GenObject* context);
virtual bool runField(ObjList& stack, const ExpOperation& oper, GenObject* context);
virtual bool runAssign(ObjList& stack, const ExpOperation& oper, GenObject* context);
GenObject* resolve(ObjList& stack, String& name, GenObject* context);
private:
GenObject* resolveTop(ObjList& stack, const String& name, GenObject* context);
GenObject* resolve(ObjList& stack, String& name, GenObject* context);
bool runStringFunction(GenObject* obj, const String& name, ObjList& stack, const ExpOperation& oper, GenObject* context);
bool runStringField(GenObject* obj, const String& name, ObjList& stack, const ExpOperation& oper, GenObject* context);
};
@ -125,6 +125,7 @@ public:
OpcUndefined,
OpcInclude,
OpcRequire,
OpcDelete,
};
inline JsCode()
: ExpEvaluator(C), m_label(0), m_depth(0)
@ -295,6 +296,7 @@ static const TokenDict s_unaryOps[] =
{
MAKEOP("new", New),
MAKEOP("typeof", Typeof),
MAKEOP("delete", Delete),
{ 0, 0 }
};
@ -1444,6 +1446,7 @@ int JsCode::getPrecedence(ExpEvaluator::Opcode oper) const
case OpcNeIdentity:
return 4;
case OpcNew:
case OpcDelete:
case OpcIndex:
return 12;
case OpcFieldOf:
@ -1993,6 +1996,32 @@ bool JsCode::runOperation(ObjList& stack, const ExpOperation& oper, GenObject* c
return false;
}
break;
case OpcDelete:
{
ExpOperation* op = popOne(stack);
if (!(context && op))
return false;
if (op->opcode() != OpcField) {
pushOne(stack,new ExpOperation(true));
TelEngine::destruct(op);
return true;
}
ScriptRun* sr = static_cast<ScriptRun*>(context);
JsObject* obj = 0;
String name = op->name();
TelEngine::destruct(op);
JsContext* ctx = YOBJECT(JsContext,sr->context());
if (ctx)
obj = YOBJECT(JsObject,ctx->resolve(stack,name,context));
bool ret = false;
if (obj && (!obj->frozen() || !obj->hasField(stack,name,context))
&& obj->toString() != YSTRING("()")) {
obj->params().clearParam(name);
ret = true;
}
pushOne(stack,new ExpOperation(ret));
return true;
}
default:
return ExpEvaluator::runOperation(stack,oper,context);
}

9
libs/yscript/jsobjects.cpp
View File

@ -332,13 +332,8 @@ bool JsObject::runAssign(ObjList& stack, const ExpOperation& oper, GenObject* co
params().setParam(ef->ExpOperation::clone());
else {
ExpWrapper* w = YOBJECT(ExpWrapper,&oper);
if (w) {
GenObject* o = w->object();
if (o)
params().setParam(w->clone(oper.name()));
else
params().clearParam(oper.name());
}
if (w)
params().setParam(w->clone(oper.name()));
else
params().setParam(new NamedString(oper.name(),oper));
}