[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 429f19e7184f6f173013b8cbdc521b8cb8138fd2
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Aug 16 10:17:54 2002 +0000

    	Fix Development build - some NDEBUG code had to be changed for the
    	Value/Reference split.
    
            * kjs/internal.cpp:
            (KJS::printInfo):
            * kjs/nodes.cpp:
            (FunctionCallNode::evaluate):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1840 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/JavaScriptCore/ChangeLog b/JavaScriptCore/ChangeLog
index ce70a87..bd63ab2 100644
--- a/JavaScriptCore/ChangeLog
+++ b/JavaScriptCore/ChangeLog
@@ -1,5 +1,15 @@
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
+	Fix Development build - some NDEBUG code had to be changed for the
+	Value/Reference split.
+	
+        * kjs/internal.cpp:
+        (KJS::printInfo):
+        * kjs/nodes.cpp:
+        (FunctionCallNode::evaluate):
+
+2002-08-16  Maciej Stachowiak  <mjs at apple.com>
+
         * kjs/reference_list.h: Added file I forgot to check in last time.
 
 2002-08-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2002-12-03 b/JavaScriptCore/ChangeLog-2002-12-03
index ce70a87..bd63ab2 100644
--- a/JavaScriptCore/ChangeLog-2002-12-03
+++ b/JavaScriptCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
+	Fix Development build - some NDEBUG code had to be changed for the
+	Value/Reference split.
+	
+        * kjs/internal.cpp:
+        (KJS::printInfo):
+        * kjs/nodes.cpp:
+        (FunctionCallNode::evaluate):
+
+2002-08-16  Maciej Stachowiak  <mjs at apple.com>
+
         * kjs/reference_list.h: Added file I forgot to check in last time.
 
 2002-08-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/ChangeLog-2003-10-25 b/JavaScriptCore/ChangeLog-2003-10-25
index ce70a87..bd63ab2 100644
--- a/JavaScriptCore/ChangeLog-2003-10-25
+++ b/JavaScriptCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-08-16  Maciej Stachowiak  <mjs at apple.com>
 
+	Fix Development build - some NDEBUG code had to be changed for the
+	Value/Reference split.
+	
+        * kjs/internal.cpp:
+        (KJS::printInfo):
+        * kjs/nodes.cpp:
+        (FunctionCallNode::evaluate):
+
+2002-08-16  Maciej Stachowiak  <mjs at apple.com>
+
         * kjs/reference_list.h: Added file I forgot to check in last time.
 
 2002-08-15  Maciej Stachowiak  <mjs at apple.com>
diff --git a/JavaScriptCore/kjs/internal.cpp b/JavaScriptCore/kjs/internal.cpp
index 0c74e8d..73f2886 100644
--- a/JavaScriptCore/kjs/internal.cpp
+++ b/JavaScriptCore/kjs/internal.cpp
@@ -1219,8 +1219,6 @@ void KJS::printInfo(ExecState *exec, const char *s, const Value &o, int lineno)
     fprintf(stderr, "KJS: %s: (null)", s);
   else {
     Value v = o;
-    if (o.isA(ReferenceType))
-      v = o.getValue(exec);
 
     UString name;
     switch ( v.type() ) {
@@ -1247,9 +1245,6 @@ void KJS::printInfo(ExecState *exec, const char *s, const Value &o, int lineno)
       if (name.isNull())
         name = "(unknown class)";
       break;
-    case ReferenceType:
-      name = "Reference";
-      break;
     case ListType:
       name = "List";
       break;
@@ -1272,11 +1267,6 @@ void KJS::printInfo(ExecState *exec, const char *s, const Value &o, int lineno)
       fprintf(stderr, ", line %d\n",lineno);
     else
       fprintf(stderr, "\n");
-    if (!o.isNull())
-      if (o.isA(ReferenceType)) {
-        fprintf(stderr, "KJS: Was property '%s'\n", o.getPropertyName(exec).ascii());
-        printInfo(exec,"of", o.getBase(exec));
-      }
   }
 }
 #endif
diff --git a/JavaScriptCore/kjs/nodes.cpp b/JavaScriptCore/kjs/nodes.cpp
index 5ec144a..ff42b19 100644
--- a/JavaScriptCore/kjs/nodes.cpp
+++ b/JavaScriptCore/kjs/nodes.cpp
@@ -705,7 +705,7 @@ Value FunctionCallNode::evaluate(ExecState *exec)
 
   if (v.type() != ObjectType) {
 #ifndef NDEBUG
-    printInfo(exec, "WARNING: Failed function call attempt on", e, line);
+    printInfo(exec, "WARNING: Failed function call attempt on", v, line);
 #endif
     return throwError(exec, TypeError, "Expression is no object. Cannot be called.");
   }
@@ -714,7 +714,7 @@ Value FunctionCallNode::evaluate(ExecState *exec)
 
   if (!func.implementsCall()) {
 #ifndef NDEBUG
-    printInfo(exec, "Failed function call attempt on", e, line);
+    printInfo(exec, "Failed function call attempt on", v, line);
 #endif
     return throwError(exec, TypeError, "Expression does not allow calls.");
   }

-- 
WebKit Debian packaging