1 files changed, 58 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4jsonobject_p.h b/src/qml/jsruntime/qv4jsonobject_p.h
index 81a783ee92..6a6e863bf6 100644
--- a/src/qml/jsruntime/qv4jsonobject_p.h
+++ b/src/qml/jsruntime/qv4jsonobject_p.h
@@ -33,10 +33,23 @@
 #ifndef QV4JSONOBJECT_H
 #define QV4JSONOBJECT_H
 
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
 #include "qv4object_p.h"
 #include <qjsonarray.h>
 #include <qjsonobject.h>
 #include <qjsonvalue.h>
+#include <qjsondocument.h>
+#include <qhash.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -45,17 +58,28 @@ namespace QV4 {
 namespace Heap {
 
 struct JsonObject : Object {
-    JsonObject(ExecutionEngine *e);
+    JsonObject();
 };
 
 }
 
+struct ObjectItem {
+    const QV4::Object *o;
+    ObjectItem(const QV4::Object *o) : o(o) {}
+};
+
+inline bool operator ==(const ObjectItem &a, const ObjectItem &b)
+{ return a.o->d() == b.o->d(); }
+
+inline int qHash(const ObjectItem &i, uint seed = 0)
+{ return ::qHash((void *)i.o->d(), seed); }
+
 struct JsonObject : Object {
     Q_MANAGED_TYPE(JsonObject)
     V4_OBJECT2(JsonObject, Object)
 private:
-    // ### GC
-    typedef QSet<QV4::Heap::Base *> V4ObjectSet;
+
+    typedef QSet<ObjectItem> V4ObjectSet;
 public:
 
     static ReturnedValue method_parse(CallContext *ctx);
@@ -67,18 +91,45 @@ public:
 
     static inline QJsonValue toJsonValue(const QV4::Value &value)
     { V4ObjectSet visitedObjects; return toJsonValue(value, visitedObjects); }
-    static inline QJsonObject toJsonObject(QV4::Object *o)
+    static inline QJsonObject toJsonObject(const QV4::Object *o)
     { V4ObjectSet visitedObjects; return toJsonObject(o, visitedObjects); }
-    static inline QJsonArray toJsonArray(QV4::ArrayObject *a)
+    static inline QJsonArray toJsonArray(const QV4::ArrayObject *a)
     { V4ObjectSet visitedObjects; return toJsonArray(a, visitedObjects); }
 
 private:
     static QJsonValue toJsonValue(const QV4::Value &value, V4ObjectSet &visitedObjects);
-    static QJsonObject toJsonObject(Object *o, V4ObjectSet &visitedObjects);
-    static QJsonArray toJsonArray(ArrayObject *a, V4ObjectSet &visitedObjects);
+    static QJsonObject toJsonObject(const Object *o, V4ObjectSet &visitedObjects);
+    static QJsonArray toJsonArray(const ArrayObject *a, V4ObjectSet &visitedObjects);
 
 };
 
+class JsonParser
+{
+public:
+    JsonParser(ExecutionEngine *engine, const QChar *json, int length);
+
+    ReturnedValue parse(QJsonParseError *error);
+
+private:
+    inline bool eatSpace();
+    inline QChar nextToken();
+
+    ReturnedValue parseObject();
+    ReturnedValue parseArray();
+    bool parseMember(Object *o);
+    bool parseString(QString *string);
+    bool parseValue(Value *val);
+    bool parseNumber(Value *val);
+
+    ExecutionEngine *engine;
+    const QChar *head;
+    const QChar *json;
+    const QChar *end;
+
+    int nestingLevel;
+    QJsonParseError::ParseError lastError;
+};
+
 }
 
 QT_END_NAMESPACE