Bug #: 3687

Submitted by: eseidel
Reviewed by: darin
        * kjs/interpreter.h:
        (KJS::Context::curStmtFirstLine): stub for compatibility with KDE
        * kjs/value.h:
        (KJS::Value::isValid): compatibility with KDE
	http://bugzilla.opendarwin.org/show_bug.cgi?id=3687

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9554 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index 7c8ff96b464f221b244f159567a7055ce8a54210..ce9e003d5d8d42dd3bab3cf985d84e9316986630 100644 (file)
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,3 +1,13 @@
+2005-07-01  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by darin.
+
+        * kjs/interpreter.h:
+        (KJS::Context::curStmtFirstLine): stub for compatibility with KDE
+        * kjs/value.h:
+        (KJS::Value::isValid): compatibility with KDE
+       http://bugzilla.opendarwin.org/show_bug.cgi?id=3687
+
 2005-07-01  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by darin.

diff --git a/JavaScriptCore/kjs/interpreter.h b/JavaScriptCore/kjs/interpreter.h
index 45e1d0ca8e6e5039b04d431970c6c04a479ea72c..1096a7684e34ddc9a80006077dc8ee4b5e329e95 100644 (file)
--- a/JavaScriptCore/kjs/interpreter.h
+++ b/JavaScriptCore/kjs/interpreter.h
@@ -108,6 +108,12 @@ namespace KJS {
      * @return The calling execution context
      */
     const Context callingContext() const;
+    
+    /**
+     * The line number on which the current statement begins
+     * NOTE: Only for source compatibility, JSC does not support this method.
+     */
+    int curStmtFirstLine() const { return 0; }
 
   private:
     ContextImp *rep;

diff --git a/JavaScriptCore/kjs/value.h b/JavaScriptCore/kjs/value.h
index 1a249305eabea6b124ea77074b3f886c14328088..1f3405fdcb8fa426633ce5943f09a4e2ce4f369d 100644 (file)
--- a/JavaScriptCore/kjs/value.h
+++ b/JavaScriptCore/kjs/value.h
@@ -212,7 +212,18 @@ namespace KJS {
 
     explicit Value(const char *);
     Value(const UString &);
-
+    
+    /**
+     * Returns whether or not this is a valid value. An invalid value
+     * has a 0 implementation pointer and should not be used for
+     * any other operation than this check. Current use: as a
+     * distinct return value signalling failing dynamicCast() calls.
+     */
+    bool isValid() const { return rep != 0; }
+    /**
+     * @deprecated
+     * Use !isValid() instead.
+     */
     bool isNull() const { return rep == 0; }
     ValueImp *imp() const { return rep; }