JavaScriptCore-903.tar.gz

[apple/javascriptcore.git] / qt / api / qscriptengine.h

diff --git a/qt/api/qscriptengine.h b/qt/api/qscriptengine.h
index e10888dc1b41476b9afeee1bbd9c4a85c42e64c7..281707f60c76ea0ad5d6eb1e4691d263695a0be6 100644 (file)
--- a/qt/api/qscriptengine.h
+++ b/qt/api/qscriptengine.h
@@ -23,13 +23,17 @@
 #include "qscriptprogram.h"
 #include "qscriptstring.h"
 #include "qscriptsyntaxcheckresult.h"
 #include "qscriptprogram.h"
 #include "qscriptstring.h"
 #include "qscriptsyntaxcheckresult.h"

+#include "qscriptvalue.h"

 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 
 #include <QtCore/qobject.h>
 #include <QtCore/qshareddata.h>
 #include <QtCore/qstring.h>
 

-class QScriptValue;
+class QDateTime;

 class QScriptEnginePrivate;
 
 class QScriptEnginePrivate;
 

+// FIXME: Remove this once QScriptContext is properly defined.
+typedef void QScriptContext;
+

 // Internal typedef
 typedef QExplicitlySharedDataPointer<QScriptEnginePrivate> QScriptEnginePtr;
 
 // Internal typedef
 typedef QExplicitlySharedDataPointer<QScriptEnginePrivate> QScriptEnginePtr;
 


@@ -42,13 +46,32 @@ public:
     QScriptValue evaluate(const QString& program, const QString& fileName = QString(), int lineNumber = 1);
     QScriptValue evaluate(const QScriptProgram& program);
 
     QScriptValue evaluate(const QString& program, const QString& fileName = QString(), int lineNumber = 1);
     QScriptValue evaluate(const QScriptProgram& program);
 

+    bool hasUncaughtException() const;
+    QScriptValue uncaughtException() const;
+    void clearExceptions();
+    int uncaughtExceptionLineNumber() const;
+    QStringList uncaughtExceptionBacktrace() const;
+

     void collectGarbage();
     void reportAdditionalMemoryCost(int cost);
 
     QScriptString toStringHandle(const QString& str);
     void collectGarbage();
     void reportAdditionalMemoryCost(int cost);
 
     QScriptString toStringHandle(const QString& str);

+    QScriptValue toObject(const QScriptValue& value);

 
     QScriptValue nullValue();
     QScriptValue undefinedValue();
 
     QScriptValue nullValue();
     QScriptValue undefinedValue();

+
+    typedef QScriptValue (*FunctionSignature)(QScriptContext *, QScriptEngine *);
+    typedef QScriptValue (*FunctionWithArgSignature)(QScriptContext *, QScriptEngine *, void *);
+
+    QScriptValue newFunction(FunctionSignature fun, int length = 0);
+    QScriptValue newFunction(FunctionSignature fun, const QScriptValue& prototype, int length = 0);
+    QScriptValue newFunction(FunctionWithArgSignature fun, void* arg);
+
+    QScriptValue newObject();
+    QScriptValue newArray(uint length = 0);
+    QScriptValue newDate(qsreal value);
+    QScriptValue newDate(const QDateTime& value);

     QScriptValue globalObject() const;
 private:
     friend class QScriptEnginePrivate;
     QScriptValue globalObject() const;
 private:
     friend class QScriptEnginePrivate;