Move Boolean object into it's own file

Change-Id: Ia62b223111fa41877bc24b6320f0078a3546c55b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

diff --git a/qmljs_engine.cpp b/qmljs_engine.cpp
index 982b7e5..e90af10 100644 (file)
--- a/qmljs_engine.cpp
+++ b/qmljs_engine.cpp
@@ -42,6 +42,7 @@
 #include <qv4object.h>
 #include <qv4ecmaobjects_p.h>
 #include <qv4arrayobject.h>
+#include <qv4booleanobject.h>
 #include <qv4globalobject.h>
 #include <qv4errorobject.h>
 #include <qv4functionobject.h>

diff --git a/qv4booleanobject.cpp b/qv4booleanobject.cpp
new file mode 100644 (file)
index 0000000..2a49435
--- /dev/null
+++ b/qv4booleanobject.cpp
@@ -0,0 +1,88 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the V4VM module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "qv4booleanobject.h"
+
+using namespace QQmlJS::VM;
+
+BooleanCtor::BooleanCtor(ExecutionContext *scope)
+    : FunctionObject(scope)
+{
+}
+
+Value BooleanCtor::construct(ExecutionContext *ctx)
+{
+    const double n = ctx->argument(0).toBoolean(ctx);
+    return Value::fromObject(ctx->engine->newBooleanObject(Value::fromBoolean(n)));
+}
+
+Value BooleanCtor::call(ExecutionContext *ctx)
+{
+    bool value = ctx->argumentCount ? ctx->argument(0).toBoolean(ctx) : 0;
+    return Value::fromBoolean(value);
+}
+
+void BooleanPrototype::init(ExecutionContext *ctx, const Value &ctor)
+{
+    ctor.objectValue()->defineReadonlyProperty(ctx->engine->id_prototype, Value::fromObject(this));
+    ctor.objectValue()->defineReadonlyProperty(ctx->engine->id_length, Value::fromInt32(1));
+    defineDefaultProperty(ctx, QStringLiteral("constructor"), ctor);
+    defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString);
+    defineDefaultProperty(ctx, QStringLiteral("valueOf"), method_valueOf);
+}
+
+Value BooleanPrototype::method_toString(ExecutionContext *ctx)
+{
+    BooleanObject *thisObject = ctx->thisObject.asBooleanObject();
+    if (!thisObject)
+        ctx->throwTypeError();
+
+    return Value::fromString(ctx, QLatin1String(thisObject->value.booleanValue() ? "true" : "false"));
+}
+
+Value BooleanPrototype::method_valueOf(ExecutionContext *ctx)
+{
+    BooleanObject *thisObject = ctx->thisObject.asBooleanObject();
+    if (!thisObject)
+        ctx->throwTypeError();
+
+    return thisObject->value;
+}

diff --git a/qv4booleanobject.h b/qv4booleanobject.h
new file mode 100644 (file)
index 0000000..44d87b1
--- /dev/null
+++ b/qv4booleanobject.h
@@ -0,0 +1,72 @@
+/****************************************************************************
+**
+** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the V4VM module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QV4BOOLEANOBJECT_H
+#define QBOOLEANOBJECT_H
+
+#include "qv4object.h"
+#include "qv4functionobject.h"
+#include <QtCore/qnumeric.h>
+
+namespace QQmlJS {
+namespace VM {
+
+struct BooleanCtor: FunctionObject
+{
+    BooleanCtor(ExecutionContext *scope);
+
+    virtual Value construct(ExecutionContext *ctx);
+    virtual Value call(ExecutionContext *ctx);
+};
+
+struct BooleanPrototype: BooleanObject
+{
+    BooleanPrototype(): BooleanObject(Value::fromBoolean(false)) {}
+    void init(ExecutionContext *ctx, const Value &ctor);
+
+    static Value method_toString(ExecutionContext *ctx);
+    static Value method_valueOf(ExecutionContext *ctx);
+};
+
+
+} // end of namespace VM
+} // end of namespace QQmlJS
+
+#endif // QV4ECMAOBJECTS_P_H

diff --git a/qv4ecmaobjects.cpp b/qv4ecmaobjects.cpp
index 3db6297..9037758 100644 (file)
--- a/qv4ecmaobjects.cpp
+++ b/qv4ecmaobjects.cpp
@@ -556,51 +556,3 @@ Value ObjectPrototype::fromPropertyDescriptor(ExecutionContext *ctx, const Prope
 
     return Value::fromObject(o);
 }
-
-
-//
-// Boolean object
-//
-BooleanCtor::BooleanCtor(ExecutionContext *scope)
-    : FunctionObject(scope)
-{
-}
-
-Value BooleanCtor::construct(ExecutionContext *ctx)
-{
-    const double n = ctx->argument(0).toBoolean(ctx);
-    return Value::fromObject(ctx->engine->newBooleanObject(Value::fromBoolean(n)));
-}
-
-Value BooleanCtor::call(ExecutionContext *ctx)
-{
-    bool value = ctx->argumentCount ? ctx->argument(0).toBoolean(ctx) : 0;
-    return Value::fromBoolean(value);
-}
-
-void BooleanPrototype::init(ExecutionContext *ctx, const Value &ctor)
-{
-    ctor.objectValue()->defineReadonlyProperty(ctx->engine->id_prototype, Value::fromObject(this));
-    ctor.objectValue()->defineReadonlyProperty(ctx->engine->id_length, Value::fromInt32(1));
-    defineDefaultProperty(ctx, QStringLiteral("constructor"), ctor);
-    defineDefaultProperty(ctx, QStringLiteral("toString"), method_toString);
-    defineDefaultProperty(ctx, QStringLiteral("valueOf"), method_valueOf);
-}
-
-Value BooleanPrototype::method_toString(ExecutionContext *ctx)
-{
-    BooleanObject *thisObject = ctx->thisObject.asBooleanObject();
-    if (!thisObject)
-        ctx->throwTypeError();
-
-    return Value::fromString(ctx, QLatin1String(thisObject->value.booleanValue() ? "true" : "false"));
-}
-
-Value BooleanPrototype::method_valueOf(ExecutionContext *ctx)
-{
-    BooleanObject *thisObject = ctx->thisObject.asBooleanObject();
-    if (!thisObject)
-        ctx->throwTypeError();
-
-    return thisObject->value;
-}

diff --git a/qv4ecmaobjects_p.h b/qv4ecmaobjects_p.h
index 1dcf82b..93527a2 100644 (file)
--- a/qv4ecmaobjects_p.h
+++ b/qv4ecmaobjects_p.h
@@ -88,23 +88,6 @@ struct ObjectPrototype: Object
     static Value fromPropertyDescriptor(ExecutionContext *ctx, const PropertyDescriptor *desc);
 };
 
-struct BooleanCtor: FunctionObject
-{
-    BooleanCtor(ExecutionContext *scope);
-
-    virtual Value construct(ExecutionContext *ctx);
-    virtual Value call(ExecutionContext *ctx);
-};
-
-struct BooleanPrototype: BooleanObject
-{
-    BooleanPrototype(): BooleanObject(Value::fromBoolean(false)) {}
-    void init(ExecutionContext *ctx, const Value &ctor);
-
-    static Value method_toString(ExecutionContext *ctx);
-    static Value method_valueOf(ExecutionContext *ctx);
-};
-
 
 } // end of namespace VM
 } // end of namespace QQmlJS

diff --git a/v4.pro b/v4.pro
index ac77693..50bed79 100644 (file)
--- a/v4.pro
+++ b/v4.pro
@@ -28,6 +28,7 @@ SOURCES += main.cpp \
     qv4array.cpp \
     qv4arrayobject.cpp \
     qv4argumentsobject.cpp \
+    qv4booleanobject.cpp \
     qv4dateobject.cpp \
     qv4errorobject.cpp \
     qv4functionobject.cpp \
@@ -61,6 +62,7 @@ HEADERS += \
     qv4array.h \
     qv4arrayobject.h \
     qv4argumentsobject.h \
+    qv4booleanobject.h \
     qv4dateobject.h \
     qv4errorobject.h \
     qv4functionobject.h \