diff options
| author | Erik Verbruggen <erik.verbruggen@digia.com> | 2012-11-20 13:41:49 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@digia.com> | 2012-11-21 15:47:14 +0100 |
| commit | 7704d8b3b6024881da15fea44f51db3b87286709 (patch) | |
| tree | 1754460f338680ff6f32a7bc0d3b53067fd80483 /qmljs_engine.cpp | |
| parent | 71446af5495a429f3c465c8bd2bcea4871408d57 (diff) | |
Keep the EvalISelFactory in the ExecutionEngine.
Also corrected the class name cApiTaliSatiOn.
Change-Id: I131566e904c8ee575686a469f16d098dd512d865
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Diffstat (limited to 'qmljs_engine.cpp')
| -rw-r--r-- | qmljs_engine.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp index 6bb89378ff..acf221304e 100644 --- a/qmljs_engine.cpp +++ b/qmljs_engine.cpp @@ -45,7 +45,8 @@ namespace QQmlJS { namespace VM { -ExecutionEngine::ExecutionEngine(EValISelFactory *factory) +ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) + : iselFactory(factory) { rootContext = newContext(); rootContext->init(this); @@ -92,7 +93,7 @@ ExecutionEngine::ExecutionEngine(EValISelFactory *factory) numberCtor = Value::fromObject(new NumberCtor(rootContext)); booleanCtor = Value::fromObject(new BooleanCtor(rootContext)); arrayCtor = Value::fromObject(new ArrayCtor(rootContext)); - functionCtor = Value::fromObject(new FunctionCtor(rootContext, factory)); + functionCtor = Value::fromObject(new FunctionCtor(rootContext)); dateCtor = Value::fromObject(new DateCtor(rootContext)); regExpCtor = Value::fromObject(new RegExpCtor(rootContext)); errorCtor = Value::fromObject(new ErrorCtor(rootContext)); @@ -160,7 +161,7 @@ ExecutionEngine::ExecutionEngine(EValISelFactory *factory) glo->__put__(rootContext, identifier(QStringLiteral("undefined")), Value::undefinedValue()); glo->__put__(rootContext, identifier(QStringLiteral("NaN")), Value::fromDouble(nan(""))); glo->__put__(rootContext, identifier(QStringLiteral("Infinity")), Value::fromDouble(INFINITY)); - glo->__put__(rootContext, identifier(QStringLiteral("eval")), Value::fromObject(new EvalFunction(rootContext, factory))); + glo->__put__(rootContext, identifier(QStringLiteral("eval")), Value::fromObject(new EvalFunction(rootContext))); // TODO: parseInt [15.1.2.2] // TODO: parseFloat [15.1.2.3] |