From 2a877ea0dbeb3e5f7d9d9d2e354da7bd86d962b4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 24 Jan 2013 12:13:47 +0100 Subject: [PATCH] Rename some builtin methods rename push_with to push_with_scope and pop_with to pop_scope. This is to prepare for adding a push_catch_scope. Change-Id: I73d30d097fc50f4a00d94f5927d154292bcd4482 Reviewed-by: Simon Hausmann --- moth/qv4instr_moth_p.h | 4 ++-- moth/qv4isel_moth.cpp | 8 ++++---- moth/qv4isel_moth_p.h | 4 ++-- moth/qv4vme_moth.cpp | 8 ++++---- qmljs_environment.cpp | 4 ++-- qmljs_environment.h | 4 ++-- qmljs_runtime.cpp | 8 ++++---- qmljs_runtime.h | 4 ++-- qv4codegen.cpp | 4 ++-- qv4ir.cpp | 8 ++++---- qv4ir_p.h | 4 ++-- qv4isel_llvm.cpp | 4 ++-- qv4isel_llvm_p.h | 4 ++-- qv4isel_masm.cpp | 8 ++++---- qv4isel_masm_p.h | 4 ++-- qv4isel_p.cpp | 8 ++++---- qv4isel_p.h | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/moth/qv4instr_moth_p.h b/moth/qv4instr_moth_p.h index 07016cc..a2863ef 100644 --- a/moth/qv4instr_moth_p.h +++ b/moth/qv4instr_moth_p.h @@ -167,8 +167,8 @@ union Instr builtin_create_exception_handler, builtin_delete_exception_handler, builtin_get_exception, - builtin_push_with, - builtin_pop_with + builtin_push_with_scope, + builtin_pop_scope } builtin; int argTemp; int targetTempIndex; diff --git a/moth/qv4isel_moth.cpp b/moth/qv4isel_moth.cpp index 2626955..2246442 100644 --- a/moth/qv4isel_moth.cpp +++ b/moth/qv4isel_moth.cpp @@ -805,18 +805,18 @@ void InstructionSelection::callBuiltinForeachNextPropertyname(IR::Temp *arg, IR: addInstruction(call); } -void InstructionSelection::callBuiltinPushWith(IR::Temp *arg) +void InstructionSelection::callBuiltinPushWithScope(IR::Temp *arg) { Instruction::CallBuiltin call; - call.builtin = Instruction::CallBuiltin::builtin_push_with; + call.builtin = Instruction::CallBuiltin::builtin_push_with_scope; call.argTemp = arg->index; addInstruction(call); } -void InstructionSelection::callBuiltinPopWith() +void InstructionSelection::callBuiltinPopScope() { Instruction::CallBuiltin call; - call.builtin = Instruction::CallBuiltin::builtin_pop_with; + call.builtin = Instruction::CallBuiltin::builtin_pop_scope; addInstruction(call); } diff --git a/moth/qv4isel_moth_p.h b/moth/qv4isel_moth_p.h index 8225721..10cb33a 100644 --- a/moth/qv4isel_moth_p.h +++ b/moth/qv4isel_moth_p.h @@ -39,8 +39,8 @@ protected: virtual void callBuiltinGetException(IR::Temp *result); virtual void callBuiltinForeachIteratorObject(IR::Temp *arg, IR::Temp *result); virtual void callBuiltinForeachNextPropertyname(IR::Temp *arg, IR::Temp *result); - virtual void callBuiltinPushWith(IR::Temp *arg); - virtual void callBuiltinPopWith(); + virtual void callBuiltinPushWithScope(IR::Temp *arg); + virtual void callBuiltinPopScope(); virtual void callBuiltinDeclareVar(bool deletable, const QString &name); virtual void callBuiltinDefineGetterSetter(IR::Temp *object, const QString &name, IR::Temp *getter, IR::Temp *setter); virtual void callBuiltinDefineProperty(IR::Temp *object, const QString &name, IR::Temp *value); diff --git a/moth/qv4vme_moth.cpp b/moth/qv4vme_moth.cpp index 0a1b3a2..fbfa47d 100644 --- a/moth/qv4vme_moth.cpp +++ b/moth/qv4vme_moth.cpp @@ -275,11 +275,11 @@ VM::Value VME::operator()(QQmlJS::VM::ExecutionContext *context, const uchar *co case Instr::instr_callBuiltin::builtin_get_exception: TEMP(instr.targetTempIndex) = __qmljs_get_exception(context); break; - case Instr::instr_callBuiltin::builtin_push_with: - context = __qmljs_builtin_push_with(TEMP(instr.argTemp), context); + case Instr::instr_callBuiltin::builtin_push_with_scope: + context = __qmljs_builtin_push_with_scope(TEMP(instr.argTemp), context); break; - case Instr::instr_callBuiltin::builtin_pop_with: - context = __qmljs_builtin_pop_with(context); + case Instr::instr_callBuiltin::builtin_pop_scope: + context = __qmljs_builtin_pop_scope(context); break; default: assert(!"TODO!"); diff --git a/qmljs_environment.cpp b/qmljs_environment.cpp index 627a988..a4db06a 100644 --- a/qmljs_environment.cpp +++ b/qmljs_environment.cpp @@ -170,7 +170,7 @@ bool ExecutionContext::deleteBinding(ExecutionContext *scope, String *name) return false; } -ExecutionContext *ExecutionContext::pushWithObject(Object *with) +ExecutionContext *ExecutionContext::createWithScope(Object *with) { ExecutionContext *withCtx = engine->newContext(); withCtx->init(this, with); @@ -178,7 +178,7 @@ ExecutionContext *ExecutionContext::pushWithObject(Object *with) return withCtx; } -ExecutionContext *ExecutionContext::popWithObject() +ExecutionContext *ExecutionContext::popScope() { assert(engine->current == this); assert(withObject != 0); diff --git a/qmljs_environment.h b/qmljs_environment.h index 16b8832..0bdbdd5 100644 --- a/qmljs_environment.h +++ b/qmljs_environment.h @@ -103,8 +103,8 @@ struct ExecutionContext Value getBindingValue(ExecutionContext *scope, String *name, bool strict) const; bool deleteBinding(ExecutionContext *ctx, String *name); - ExecutionContext *pushWithObject(Object *with); - ExecutionContext *popWithObject(); + ExecutionContext *createWithScope(Object *with); + ExecutionContext *popScope(); void initCallContext(ExecutionContext *parent, const Value that, FunctionObject *f, Value *args, unsigned argc); void leaveCallContext(); diff --git a/qmljs_runtime.cpp b/qmljs_runtime.cpp index a8610b2..114a7b9 100644 --- a/qmljs_runtime.cpp +++ b/qmljs_runtime.cpp @@ -894,15 +894,15 @@ void __qmljs_builtin_throw(Value val, ExecutionContext *context) __qmljs_throw(val, context); } -ExecutionContext *__qmljs_builtin_push_with(Value o, ExecutionContext *ctx) +ExecutionContext *__qmljs_builtin_push_with_scope(Value o, ExecutionContext *ctx) { Object *obj = __qmljs_to_object(o, ctx).asObject(); - return ctx->pushWithObject(obj); + return ctx->createWithScope(obj); } -ExecutionContext *__qmljs_builtin_pop_with(ExecutionContext *ctx) +ExecutionContext *__qmljs_builtin_pop_scope(ExecutionContext *ctx) { - return ctx->popWithObject(); + return ctx->popScope(); } void __qmljs_builtin_declare_var(ExecutionContext *ctx, bool deletable, String *name) diff --git a/qmljs_runtime.h b/qmljs_runtime.h index 2d280d7..e1c6d5a 100644 --- a/qmljs_runtime.h +++ b/qmljs_runtime.h @@ -101,8 +101,8 @@ Value __qmljs_builtin_typeof_element(Value base, Value index, ExecutionContext * void __qmljs_builtin_throw(Value val, ExecutionContext *context); void __qmljs_builtin_rethrow(ExecutionContext *context); -ExecutionContext *__qmljs_builtin_push_with(Value o, ExecutionContext *ctx); -ExecutionContext *__qmljs_builtin_pop_with(ExecutionContext *ctx); +ExecutionContext *__qmljs_builtin_push_with_scope(Value o, ExecutionContext *ctx); +ExecutionContext *__qmljs_builtin_pop_scope(ExecutionContext *ctx); void __qmljs_builtin_declare_var(ExecutionContext *ctx, bool deletable, String *name); void __qmljs_builtin_define_property(Value object, String *name, Value val, ExecutionContext *ctx); void __qmljs_builtin_define_getter_setter(Value object, String *name, Value getter, Value setter, ExecutionContext *ctx); diff --git a/qv4codegen.cpp b/qv4codegen.cpp index b93e740..f16ce68 100644 --- a/qv4codegen.cpp +++ b/qv4codegen.cpp @@ -2513,11 +2513,11 @@ bool Codegen::visit(WithStatement *ast) _block->MOVE(_block->TEMP(withObject), *expression(ast->expression)); IR::ExprList *args = _function->New(); args->init(_block->TEMP(withObject)); - _block->EXP(_block->CALL(_block->NAME(IR::Name::builtin_push_with, 0, 0), args)); + _block->EXP(_block->CALL(_block->NAME(IR::Name::builtin_push_with_scope, 0, 0), args)); ++_function->insideWith; statement(ast->statement); --_function->insideWith; - _block->EXP(_block->CALL(_block->NAME(IR::Name::builtin_pop_with, 0, 0), 0)); + _block->EXP(_block->CALL(_block->NAME(IR::Name::builtin_pop_scope, 0, 0), 0)); IR::BasicBlock *next = _function->newBasicBlock(); _block->JUMP(next); diff --git a/qv4ir.cpp b/qv4ir.cpp index 30d2dcb..969d07a 100644 --- a/qv4ir.cpp +++ b/qv4ir.cpp @@ -236,10 +236,10 @@ static const char *builtin_to_string(Name::Builtin b) return "builtin_foreach_iterator_object"; case IR::Name::builtin_foreach_next_property_name: return "builtin_foreach_next_property_name"; - case IR::Name::builtin_push_with: - return "builtin_push_with"; - case IR::Name::builtin_pop_with: - return "builtin_pop_with"; + case IR::Name::builtin_push_with_scope: + return "builtin_push_with_scope"; + case IR::Name::builtin_pop_scope: + return "builtin_pop_scope"; case IR::Name::builtin_declare_vars: return "builtin_declare_vars"; case IR::Name::builtin_define_property: diff --git a/qv4ir_p.h b/qv4ir_p.h index f3db3bd..6905978 100644 --- a/qv4ir_p.h +++ b/qv4ir_p.h @@ -281,8 +281,8 @@ struct Name: Expr { builtin_get_exception, builtin_foreach_iterator_object, builtin_foreach_next_property_name, - builtin_push_with, - builtin_pop_with, + builtin_push_with_scope, + builtin_pop_scope, builtin_declare_vars, builtin_define_property, builtin_define_getter_setter diff --git a/qv4isel_llvm.cpp b/qv4isel_llvm.cpp index e915abd..6c74dc6 100644 --- a/qv4isel_llvm.cpp +++ b/qv4isel_llvm.cpp @@ -405,14 +405,14 @@ void InstructionSelection::callBuiltinForeachNextPropertyname(IR::Temp *arg, IR: Q_UNREACHABLE(); } -void InstructionSelection::callBuiltinPushWith(IR::Temp *arg) +void InstructionSelection::callBuiltinPushWithScope(IR::Temp *arg) { // TODO assert(!"TODO!"); Q_UNREACHABLE(); } -void InstructionSelection::callBuiltinPopWith() +void InstructionSelection::callBuiltinPopScope() { // TODO assert(!"TODO!"); diff --git a/qv4isel_llvm_p.h b/qv4isel_llvm_p.h index dbd6084..9dcf961 100644 --- a/qv4isel_llvm_p.h +++ b/qv4isel_llvm_p.h @@ -85,8 +85,8 @@ public: // methods from InstructionSelection: virtual void callBuiltinGetException(IR::Temp *result); virtual void callBuiltinForeachIteratorObject(IR::Temp *arg, IR::Temp *result); virtual void callBuiltinForeachNextPropertyname(IR::Temp *arg, IR::Temp *result); - virtual void callBuiltinPushWith(IR::Temp *arg); - virtual void callBuiltinPopWith(); + virtual void callBuiltinPushWithScope(IR::Temp *arg); + virtual void callBuiltinPopScope(); virtual void callBuiltinDeclareVar(bool deletable, const QString &name); virtual void callBuiltinDefineGetterSetter(IR::Temp *object, const QString &name, IR::Temp *getter, IR::Temp *setter); virtual void callBuiltinDefineProperty(IR::Temp *object, const QString &name, IR::Temp *value); diff --git a/qv4isel_masm.cpp b/qv4isel_masm.cpp index d202475..5f34c02 100644 --- a/qv4isel_masm.cpp +++ b/qv4isel_masm.cpp @@ -513,14 +513,14 @@ void InstructionSelection::callBuiltinForeachNextPropertyname(IR::Temp *arg, IR: generateFunctionCall(result, __qmljs_foreach_next_property_name, arg); } -void InstructionSelection::callBuiltinPushWith(IR::Temp *arg) +void InstructionSelection::callBuiltinPushWithScope(IR::Temp *arg) { - generateFunctionCall(Assembler::ContextRegister, __qmljs_builtin_push_with, arg, Assembler::ContextRegister); + generateFunctionCall(Assembler::ContextRegister, __qmljs_builtin_push_with_scope, arg, Assembler::ContextRegister); } -void InstructionSelection::callBuiltinPopWith() +void InstructionSelection::callBuiltinPopScope() { - generateFunctionCall(Assembler::ContextRegister, __qmljs_builtin_pop_with, Assembler::ContextRegister); + generateFunctionCall(Assembler::ContextRegister, __qmljs_builtin_pop_scope, Assembler::ContextRegister); } void InstructionSelection::callBuiltinDeclareVar(bool deletable, const QString &name) diff --git a/qv4isel_masm_p.h b/qv4isel_masm_p.h index c0fdabf..e45ed51 100644 --- a/qv4isel_masm_p.h +++ b/qv4isel_masm_p.h @@ -667,8 +667,8 @@ protected: virtual void callBuiltinGetException(IR::Temp *result); virtual void callBuiltinForeachIteratorObject(IR::Temp *arg, IR::Temp *result); virtual void callBuiltinForeachNextPropertyname(IR::Temp *arg, IR::Temp *result); - virtual void callBuiltinPushWith(IR::Temp *arg); - virtual void callBuiltinPopWith(); + virtual void callBuiltinPushWithScope(IR::Temp *arg); + virtual void callBuiltinPopScope(); virtual void callBuiltinDeclareVar(bool deletable, const QString &name); virtual void callBuiltinDefineGetterSetter(IR::Temp *object, const QString &name, IR::Temp *getter, IR::Temp *setter); virtual void callBuiltinDefineProperty(IR::Temp *object, const QString &name, IR::Temp *value); diff --git a/qv4isel_p.cpp b/qv4isel_p.cpp index c4df10a..17f8466 100644 --- a/qv4isel_p.cpp +++ b/qv4isel_p.cpp @@ -291,14 +291,14 @@ void InstructionSelection::callBuiltin(IR::Call *call, IR::Temp *result) assert(arg != 0); callBuiltinForeachNextPropertyname(arg, result); } return; - case IR::Name::builtin_push_with: { + case IR::Name::builtin_push_with_scope: { IR::Temp *arg = call->args->expr->asTemp(); assert(arg != 0); - callBuiltinPushWith(arg); + callBuiltinPushWithScope(arg); } return; - case IR::Name::builtin_pop_with: - callBuiltinPopWith(); + case IR::Name::builtin_pop_scope: + callBuiltinPopScope(); return; case IR::Name::builtin_declare_vars: { diff --git a/qv4isel_p.h b/qv4isel_p.h index 1d71055..fc14552 100644 --- a/qv4isel_p.h +++ b/qv4isel_p.h @@ -95,8 +95,8 @@ public: // to implement by subclasses: virtual void callBuiltinGetException(IR::Temp *result) = 0; virtual void callBuiltinForeachIteratorObject(IR::Temp *arg, IR::Temp *result) = 0; virtual void callBuiltinForeachNextPropertyname(IR::Temp *arg, IR::Temp *result) = 0; - virtual void callBuiltinPushWith(IR::Temp *arg) = 0; - virtual void callBuiltinPopWith() = 0; + virtual void callBuiltinPushWithScope(IR::Temp *arg) = 0; + virtual void callBuiltinPopScope() = 0; virtual void callBuiltinDeclareVar(bool deletable, const QString &name) = 0; virtual void callBuiltinDefineGetterSetter(IR::Temp *object, const QString &name, IR::Temp *getter, IR::Temp *setter) = 0; virtual void callBuiltinDefineProperty(IR::Temp *object, const QString &name, IR::Temp *value) = 0; -- 2.7.4