Changeset 27664 in webkit

Timestamp:

Nov 10, 2007, 10:29:17 AM (18 years ago)

Author:

Darin Adler

Message:

Reviewed by Sam.

• ​http://bugs.webkit.org/show_bug.cgi?id=15915 add an evaluation path for booleans like the one we have for numbers

Gives 1.1% on SunSpider.

• kjs/grammar.y: Create TrueNode and FalseNode instead of BooleanNode.

• kjs/nodes.h: Changed to use Noncopyable. Moved optimizeForUnnecessaryResult down from Node to ExpressionNode. Changed some classes to not inherit from ExpressionNode where not necessary, and removed unnneeded evaluate functions as well as evaluate functions that need not be virtual. Call the optimizeForUnnecessaryResult function on the start of a for loop too.
• kjs/nodes.cpp: (KJS::ExpressionNode::evaluateToBoolean): Added. (KJS::FalseNode::evaluate): Added. (KJS::TrueNode::evaluate): Added. (KJS::NumberNode::evaluateToBoolean): Added. (KJS::StringNode::evaluateToBoolean): Added. (KJS::LocalVarAccessNode::evaluateToBoolean): Added. (KJS::BracketAccessorNode::evaluateToBoolean): Added. (KJS::LogicalNotNode::evaluate): Changed to call evaluateToBoolean. (KJS::LogicalNotNode::evaluateToBoolean): Added. (KJS::lessThan): Changed to return bool. (KJS::lessThanEq): Ditto. (KJS::LessNode::evaluate): Changed since lessThan returns bool. (KJS::LessNode::evaluateToBoolean): Added. (KJS::GreaterNode::evaluate): Changed since lessThanEq returns bool. (KJS::GreaterNode::evaluateToBoolean): Added. (KJS::LessEqNode::evaluate): Changed since lessThanEq returns bool. (KJS::LessEqNode::evaluateToBoolean): Added. (KJS::GreaterEqNode::evaluate): Changed since lessThan returns bool. (KJS::GreaterEqNode::evaluateToBoolean): Added. (KJS::InstanceOfNode::evaluateToBoolean): Added. (KJS::InNode::evaluateToBoolean): Added. (KJS::EqualNode::evaluateToBoolean): Added. (KJS::NotEqualNode::evaluateToBoolean): Added. (KJS::StrictEqualNode::evaluateToBoolean): Added. (KJS::NotStrictEqualNode::evaluateToBoolean): Added. (KJS::ConditionalNode::evaluate): Changed to call evaluateToBoolean. (KJS::IfNode::execute): Ditto. (KJS::DoWhileNode::execute): Ditto. (KJS::WhileNode::execute): Ditto. (KJS::ForNode::execute): Ditto.

• kjs/nodes2string.cpp: (KJS::FalseNode::streamTo): Added. (KJS::TrueNode::streamTo): Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ForwardingHeaders/wtf (added)
• ForwardingHeaders/wtf/unicode (added)
• ForwardingHeaders/wtf/unicode/icu (added)
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj (modified) (2 diffs)
• JavaScriptCore.vcproj/dftables/dftables.vcproj (modified) (1 diff)
• kjs/grammar.y (modified) (1 diff)
• kjs/nodes.cpp (modified) (33 diffs)
• kjs/nodes.h (modified) (45 diffs)
• kjs/nodes2string.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-11-10  Darin Adler  <darin@apple.com>
+
+        Reviewed by Sam.
+
+        - http://bugs.webkit.org/show_bug.cgi?id=15915
+          add an evaluation path for booleans like the one we have for numbers
+
+        Gives 1.1% on SunSpider.
+
+        * kjs/grammar.y: Create TrueNode and FalseNode instead of BooleanNode.
+
+        * kjs/nodes.h: Changed to use Noncopyable. Moved optimizeForUnnecessaryResult
+        down from Node to ExpressionNode. Changed some classes to not inherit from
+        ExpressionNode where not necessary, and removed unnneeded evaluate functions
+        as well as evaluate functions that need not be virtual. Call the
+        optimizeForUnnecessaryResult function on the start of a for loop too.
+        * kjs/nodes.cpp:
+        (KJS::ExpressionNode::evaluateToBoolean): Added.
+        (KJS::FalseNode::evaluate): Added.
+        (KJS::TrueNode::evaluate): Added.
+        (KJS::NumberNode::evaluateToBoolean): Added.
+        (KJS::StringNode::evaluateToBoolean): Added.
+        (KJS::LocalVarAccessNode::evaluateToBoolean): Added.
+        (KJS::BracketAccessorNode::evaluateToBoolean): Added.
+        (KJS::LogicalNotNode::evaluate): Changed to call evaluateToBoolean.
+        (KJS::LogicalNotNode::evaluateToBoolean): Added.
+        (KJS::lessThan): Changed to return bool.
+        (KJS::lessThanEq): Ditto.
+        (KJS::LessNode::evaluate): Changed since lessThan returns bool.
+        (KJS::LessNode::evaluateToBoolean): Added.
+        (KJS::GreaterNode::evaluate): Changed since lessThanEq returns bool.
+        (KJS::GreaterNode::evaluateToBoolean): Added.
+        (KJS::LessEqNode::evaluate): Changed since lessThanEq returns bool.
+        (KJS::LessEqNode::evaluateToBoolean): Added.
+        (KJS::GreaterEqNode::evaluate): Changed since lessThan returns bool.
+        (KJS::GreaterEqNode::evaluateToBoolean): Added.
+        (KJS::InstanceOfNode::evaluateToBoolean): Added.
+        (KJS::InNode::evaluateToBoolean): Added.
+        (KJS::EqualNode::evaluateToBoolean): Added.
+        (KJS::NotEqualNode::evaluateToBoolean): Added.
+        (KJS::StrictEqualNode::evaluateToBoolean): Added.
+        (KJS::NotStrictEqualNode::evaluateToBoolean): Added.
+        (KJS::ConditionalNode::evaluate): Changed to call evaluateToBoolean.
+        (KJS::IfNode::execute): Ditto.
+        (KJS::DoWhileNode::execute): Ditto.
+        (KJS::WhileNode::execute): Ditto.
+        (KJS::ForNode::execute): Ditto.
+
+        * kjs/nodes2string.cpp:
+        (KJS::FalseNode::streamTo): Added.
+        (KJS::TrueNode::streamTo): Added.
+
 2007-11-09  Adam Roben  <aroben@apple.com>
 

trunk/JavaScriptCore/JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj

@@ -568 +568 @@
                         >
                         <File
-                                RelativePath="..\..\wtf\FastMallocPCRE.cpp"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\pcre\pcre-config.h"
-                                >
-                        </File>
-                        <File
                                 RelativePath="..\..\pcre\pcre.h"
                                 >
                         </File>
                         <File
-                                RelativePath="..\..\pcre\pcre_compile.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\pcre\pcre_exec.c"
+                                RelativePath="..\..\pcre\pcre_compile.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\pcre\pcre_exec.cpp"
                                 >
                         </File>
@@ -592 +584 @@
                         </File>
                         <File
-                                RelativePath="..\..\pcre\pcre_ord2utf8.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\pcre\pcre_tables.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\pcre\pcre_ucp_searchfuncs.c"
-                                >
-                        </File>
-                        <File
-                                RelativePath="..\..\pcre\pcre_xclass.c"
+                                RelativePath="..\..\pcre\pcre_ord2utf8.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\pcre\pcre_tables.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\pcre\pcre_ucp_searchfuncs.cpp"
+                                >
+                        </File>
+                        <File
+                                RelativePath="..\..\pcre\pcre_xclass.cpp"
                                 >
                         </File>

trunk/JavaScriptCore/JavaScriptCore.vcproj/dftables/dftables.vcproj

@@ -100 +100 @@
         <Files>
                 <File
-                        RelativePath="..\..\pcre\dftables.c"
+                        RelativePath="..\..\pcre\dftables.cpp"
                         >
                 </File>

trunk/JavaScriptCore/kjs/grammar.y

@@ -207 +207 @@
 
 Literal:
-    NULLTOKEN                           { $$ = new NullNode(); }
-  | TRUETOKEN                           { $$ = new BooleanNode(true); }
-  | FALSETOKEN                          { $$ = new BooleanNode(false); }
+    NULLTOKEN                           { $$ = new NullNode; }
+  | TRUETOKEN                           { $$ = new TrueNode; }
+  | FALSETOKEN                          { $$ = new FalseNode; }
   | NUMBER                              { $$ = makeNumberNode($1); }
   | STRING                              { $$ = new StringNode($1); }

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -212 +212 @@
 }
 
+bool ExpressionNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* value = evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return value->toBoolean(exec);
+}
+
 static void substitute(UString &string, const UString &substring) KJS_FAST_CALL;
 static void substitute(UString &string, const UString &substring)
@@ -367 +377 @@
 }
 
-// ------------------------------ BooleanNode ----------------------------------
-
-JSValue *BooleanNode::evaluate(ExecState *)
-{
-  return jsBoolean(value);
+// ------------------------------ FalseNode ----------------------------------
+
+JSValue* FalseNode::evaluate(ExecState*)
+{
+    return jsBoolean(false);
+}
+
+// ------------------------------ TrueNode ----------------------------------
+
+JSValue* TrueNode::evaluate(ExecState*)
+{
+    return jsBoolean(true);
 }
 
@@ -387 +404 @@
 }
 
+bool NumberNode::evaluateToBoolean(ExecState*)
+{
+    return m_double < 0.0 || m_double > 0.0; // false for NaN as well as 0
+}
+
+// ------------------------------ ImmediateNumberNode -----------------------------------
+
 JSValue* ImmediateNumberNode::evaluate(ExecState*)
 {
@@ -398 +422 @@
   return jsOwnedString(value);
 }
-    
+
 double StringNode::evaluateToNumber(ExecState*)
 {
     return value.toDouble();
+}
+
+bool StringNode::evaluateToBoolean(ExecState*)
+{
+    return !value.isEmpty();
 }
     
@@ -474 +503 @@
 {
     return inlineEvaluate(exec)->toNumber(exec);
+}
+
+bool LocalVarAccessNode::evaluateToBoolean(ExecState* exec)
+{
+    return inlineEvaluate(exec)->toBoolean(exec);
 }
 
@@ -630 +664 @@
 }
 
+bool BracketAccessorNode::evaluateToBoolean(ExecState* exec)
+{
+    return inlineEvaluate(exec)->toBoolean(exec);
+}
+
 // ------------------------------ DotAccessorNode --------------------------------
 
@@ -654 +693 @@
     ASSERT(expr);
     nodeStack.append(expr.get());
-}
-
-JSValue *ArgumentListNode::evaluate(ExecState *)
-{
-  ASSERT(0);
-  return 0; // dummy, see evaluateList()
 }
 
@@ -678 +711 @@
     if (listNode)
         nodeStack.append(listNode.get());
-}
-
-JSValue *ArgumentsNode::evaluate(ExecState *)
-{
-  ASSERT(0);
-  return 0; // dummy, see evaluateList()
 }
 
@@ -1658 +1685 @@
 
 // ECMA 11.4.9
-JSValue *LogicalNotNode::evaluate(ExecState *exec)
-{
-  JSValue *v = expr->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  return jsBoolean(!v->toBoolean(exec));
+JSValue* LogicalNotNode::evaluate(ExecState* exec)
+{
+    return jsBoolean(!expr->evaluateToBoolean(exec));
+}
+
+bool LogicalNotNode::evaluateToBoolean(ExecState* exec)
+{
+    return !expr->evaluateToBoolean(exec);
 }
 
@@ -1966 +1996 @@
 // ------------------------------ Relational Nodes -------------------------------
 
-static inline JSValue* lessThan(ExecState *exec, JSValue* v1, JSValue* v2) 
+static inline bool lessThan(ExecState *exec, JSValue* v1, JSValue* v2) 
 {
     double n1;
@@ -1974 +2004 @@
     
     if (wasNotString1 | wasNotString2)
-        return jsBoolean(n1 < n2);
-
-    return jsBoolean(v1->toString(exec) < v2->toString(exec));
-}
-
-static inline JSValue* lessThanEq(ExecState *exec, JSValue* v1, JSValue* v2) 
+        return n1 < n2;
+
+    return v1->toString(exec) < v2->toString(exec);
+}
+
+static inline bool lessThanEq(ExecState *exec, JSValue* v1, JSValue* v2) 
 {
     double n1;
@@ -1987 +2017 @@
     
     if (wasNotString1 | wasNotString2)
-        return jsBoolean(n1 <= n2);
-
-    return jsBoolean(!(v2->toString(exec) < v1->toString(exec)));
+        return n1 <= n2;
+
+    return !(v2->toString(exec) < v1->toString(exec));
 }
 
@@ -1999 +2029 @@
 
 // ECMA 11.8.1
-JSValue *LessNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  return lessThan(exec, v1, v2);
+JSValue* LessNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return jsBoolean(lessThan(exec, v1, v2));
+}
+
+bool LessNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return lessThan(exec, v1, v2);
 }
 
@@ -2015 +2060 @@
 
 // ECMA 11.8.2
-JSValue *GreaterNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  return lessThan(exec, v2, v1);
+JSValue* GreaterNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return jsBoolean(lessThan(exec, v2, v1));
+}
+
+bool GreaterNode::evaluateToBoolean(ExecState *exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return lessThan(exec, v2, v1);
 }
 
@@ -2031 +2091 @@
 
 // ECMA 11.8.3
-JSValue *LessEqNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  return lessThanEq(exec, v1, v2);
+JSValue* LessEqNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return jsBoolean(lessThanEq(exec, v1, v2));
+}
+
+bool LessEqNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return lessThanEq(exec, v1, v2);
 }
 
@@ -2047 +2122 @@
 
 // ECMA 11.8.4
-JSValue *GreaterEqNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  return lessThanEq(exec, v2, v1);
+JSValue* GreaterEqNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return jsBoolean(lessThanEq(exec, v2, v1));
+}
+
+bool GreaterEqNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return lessThanEq(exec, v2, v1);
 }
 
@@ -2063 +2153 @@
 
 // ECMA 11.8.6
-JSValue *InstanceOfNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  if (!v2->isObject())
-      return throwError(exec,  TypeError,
-                          "Value %s (result of expression %s) is not an object. Cannot be used with instanceof operator.", v2, expr2.get());
-
-  JSObject *o2(static_cast<JSObject*>(v2));
-  if (!o2->implementsHasInstance())
-      // According to the spec, only some types of objects "implement" the [[HasInstance]] property.
-      // But we are supposed to throw an exception where the object does not "have" the [[HasInstance]]
-      // property. It seems that all object have the property, but not all implement it, so in this
-      // case we return false (consistent with mozilla)
-      return jsBoolean(false);
-  return jsBoolean(o2->hasInstance(exec, v1));
+JSValue* InstanceOfNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    if (!v2->isObject())
+        return throwError(exec, TypeError, "Value %s (result of expression %s) is not an object. Cannot be used with instanceof operator.", v2, expr2.get());
+
+    JSObject* o2 = static_cast<JSObject*>(v2);
+
+    // According to the spec, only some types of objects "implement" the [[HasInstance]] property.
+    // But we are supposed to throw an exception where the object does not "have" the [[HasInstance]]
+    // property. It seems that all objects have the property, but not all implement it, so in this
+    // case we return false (consistent with Mozilla).
+    if (!o2->implementsHasInstance())
+        return jsBoolean(false);
+
+    return jsBoolean(o2->hasInstance(exec, v1));
+}
+
+bool InstanceOfNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+
+    if (!v2->isObject()) {
+        throwError(exec, TypeError, "Value %s (result of expression %s) is not an object. Cannot be used with 'instanceof' operator.", v2, expr2.get());
+        return false;
+    }
+
+    JSObject* o2 = static_cast<JSObject*>(v2);
+
+    // According to the spec, only some types of objects "implement" the [[HasInstance]] property.
+    // But we are supposed to throw an exception where the object does not "have" the [[HasInstance]]
+    // property. It seems that all objects have the property, but not all implement it, so in this
+    // case we return false (consistent with Mozilla).
+    if (!o2->implementsHasInstance())
+        return false;
+
+    return o2->hasInstance(exec, v1);
 }
 
@@ -2091 +2212 @@
 
 // ECMA 11.8.7
-JSValue *InNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  // Is all of this OK for host objects?
-  if (!v2->isObject())
-      return throwError(exec,  TypeError,
-                         "Value %s (result of expression %s) is not an object. Cannot be used with IN expression.", v2, expr2.get());
-  JSObject *o2(static_cast<JSObject*>(v2));
-  return jsBoolean(o2->hasProperty(exec, Identifier(v1->toString(exec))));
+JSValue* InNode::evaluate(ExecState *exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    if (!v2->isObject())
+        return throwError(exec, TypeError, "Value %s (result of expression %s) is not an object. Cannot be used with 'in' operator.", v2, expr2.get());
+
+    return jsBoolean(static_cast<JSObject*>(v2)->hasProperty(exec, Identifier(v1->toString(exec))));
+}
+
+bool InNode::evaluateToBoolean(ExecState *exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+
+    if (!v2->isObject())
+        return throwError(exec, TypeError, "Value %s (result of expression %s) is not an object. Cannot be used with 'in' operator.", v2, expr2.get());
+
+    return static_cast<JSObject*>(v2)->hasProperty(exec, Identifier(v1->toString(exec)));
 }
 
@@ -2115 +2253 @@
 
 // ECMA 11.9.1
-JSValue *EqualNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return jsBoolean(equal(exec,v1, v2));
+JSValue* EqualNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    return jsBoolean(equal(exec, v1, v2));
+}
+
+bool EqualNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+
+    return equal(exec, v1, v2);
 }
 
@@ -2132 +2286 @@
 
 // ECMA 11.9.2
-JSValue *NotEqualNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return jsBoolean(!equal(exec,v1, v2));
+JSValue* NotEqualNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    return jsBoolean(!equal(exec,v1, v2));
+}
+
+bool NotEqualNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+
+    return !equal(exec,v1, v2);
 }
 
@@ -2149 +2319 @@
 
 // ECMA 11.9.4
-JSValue *StrictEqualNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return jsBoolean(strictEqual(exec,v1, v2));
+JSValue* StrictEqualNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    return jsBoolean(strictEqual(exec,v1, v2));
+}
+
+bool StrictEqualNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+
+    return strictEqual(exec,v1, v2);
 }
 
@@ -2166 +2352 @@
 
 // ECMA 11.9.5
-JSValue *NotStrictEqualNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return jsBoolean(!strictEqual(exec,v1, v2));
+JSValue* NotStrictEqualNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+
+    return jsBoolean(!strictEqual(exec,v1, v2));
+}
+
+bool NotStrictEqualNode::evaluateToBoolean(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    JSValue* v2 = expr2->evaluate(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+
+    return !strictEqual(exec,v1, v2);
 }
 
@@ -2236 +2438 @@
 
 // ECMA 11.11
-JSValue *LogicalAndNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  bool b1 = v1->toBoolean(exec);
-  if (!b1)
-    return v1;
-
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return v2;
+JSValue* LogicalAndNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    bool b1 = v1->toBoolean(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    if (!b1)
+        return v1;
+    JSValue* v2 = expr2->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return v2;
+}
+
+bool LogicalAndNode::evaluateToBoolean(ExecState* exec)
+{
+    bool b = expr1->evaluateToBoolean(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return b && expr2->evaluateToBoolean(exec);
 }
 
@@ -2256 +2467 @@
 }
 
-JSValue *LogicalOrNode::evaluate(ExecState *exec)
-{
-  JSValue *v1 = expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  bool b1 = v1->toBoolean(exec);
-  if (b1)
-    return v1;
-
-  JSValue *v2 = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return v2;
+JSValue* LogicalOrNode::evaluate(ExecState* exec)
+{
+    JSValue* v1 = expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    if (v1->toBoolean(exec))
+        return v1;
+    return expr2->evaluate(exec);
+}
+
+bool LogicalOrNode::evaluateToBoolean(ExecState* exec)
+{
+    bool b = expr1->evaluateToBoolean(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return b || expr2->evaluateToBoolean(exec);
 }
 
@@ -2280 +2496 @@
 
 // ECMA 11.12
-JSValue *ConditionalNode::evaluate(ExecState *exec)
-{
-  JSValue *v = logical->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  bool b = v->toBoolean(exec);
-
-  if (b)
-    v = expr1->evaluate(exec);
-  else
-    v = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return v;
+JSValue* ConditionalNode::evaluate(ExecState* exec)
+{
+    bool b = logical->evaluateToBoolean(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return b ? expr1->evaluate(exec) : expr2->evaluate(exec);
+}
+
+bool ConditionalNode::evaluateToBoolean(ExecState* exec)
+{
+    bool b = logical->evaluateToBoolean(exec);
+    if (exec->hadException()) {
+        handleException(exec);
+        return false;
+    }
+    return b ? expr1->evaluateToBoolean(exec) : expr2->evaluateToBoolean(exec);
 }
 
@@ -2618 +2836 @@
 
 // ECMA 11.14
-JSValue *CommaNode::evaluate(ExecState *exec)
-{
-  expr1->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-  JSValue *v = expr2->evaluate(exec);
-  KJS_CHECKEXCEPTIONVALUE
-
-  return v;
+JSValue* CommaNode::evaluate(ExecState *exec)
+{
+    expr1->evaluate(exec);
+    KJS_CHECKEXCEPTIONVALUE
+    return expr2->evaluate(exec);
 }
 
@@ -2903 +3118 @@
 
 // ECMA 12.5
-Completion IfNode::execute(ExecState *exec)
-{
-  KJS_BREAKPOINT;
-
-  JSValue *v = expr->evaluate(exec);
-  KJS_CHECKEXCEPTION
-  bool b = v->toBoolean(exec);
-
-  // if ... then
-  if (b)
-    return statement1->execute(exec);
-
-  // no else
-  if (!statement2)
-    return Completion(Normal);
-
-  // else
-  return statement2->execute(exec);
+Completion IfNode::execute(ExecState* exec)
+{
+    KJS_BREAKPOINT;
+
+    bool b = expr->evaluateToBoolean(exec);
+    KJS_CHECKEXCEPTION
+
+    // if ... then
+    if (b)
+        return statement1->execute(exec);
+
+    // no else
+    if (!statement2)
+        return Completion(Normal);
+
+    // else
+    return statement2->execute(exec);
 }
 
@@ -2942 +3156 @@
 Completion DoWhileNode::execute(ExecState *exec)
 {
-  KJS_BREAKPOINT;
-
-  JSValue *bv;
-  Completion c;
-  JSValue* value = 0;
-
-  do {
-    exec->pushIteration();
-    c = statement->execute(exec);
-    exec->popIteration();
-    
-    if (exec->dynamicInterpreter()->timedOut())
-        return Completion(Interrupted);
-
-    if (c.isValueCompletion())
-        value = c.value();
-
-    if (!((c.complType() == Continue) && ls.contains(c.target()))) {
-      if ((c.complType() == Break) && ls.contains(c.target()))
-        return Completion(Normal, value);
-      if (c.complType() != Normal)
-        return c;
-    }
-    bv = expr->evaluate(exec);
-    KJS_CHECKEXCEPTION
-  } while (bv->toBoolean(exec));
-
-  return Completion(Normal, value);
+    KJS_BREAKPOINT;
+
+    JSValue* value = 0;
+
+    while (1) {
+        exec->pushIteration();
+        Completion c = statement->execute(exec);
+        exec->popIteration();
+
+        if (exec->dynamicInterpreter()->timedOut())
+            return Completion(Interrupted);
+
+        if (c.isValueCompletion())
+            value = c.value();
+
+        if (!((c.complType() == Continue) && ls.contains(c.target()))) {
+            if ((c.complType() == Break) && ls.contains(c.target()))
+                return Completion(Normal, value);
+            if (c.complType() != Normal)
+                return c;
+        }
+
+        bool b = expr->evaluateToBoolean(exec);
+        KJS_CHECKEXCEPTION
+        if (!b)
+            return Completion(Normal, value);
+    }
+
+    return Completion(); // work around gcc 4.0 bug
 }
 
@@ -2989 +3204 @@
 Completion WhileNode::execute(ExecState *exec)
 {
-  KJS_BREAKPOINT;
-
-  JSValue *bv;
-  Completion c;
-  bool b(false);
-  JSValue *value = 0;
-
-  while (1) {
-    bv = expr->evaluate(exec);
-    KJS_CHECKEXCEPTION
-    b = bv->toBoolean(exec);
-
-    if (!b)
-      return Completion(Normal, value);
-
-    exec->pushIteration();
-    c = statement->execute(exec);
-    exec->popIteration();
-
-    if (exec->dynamicInterpreter()->timedOut())
-        return Completion(Interrupted);
-    
-    if (c.isValueCompletion())
-      value = c.value();
-
-    if ((c.complType() == Continue) && ls.contains(c.target()))
-      continue;
-    if ((c.complType() == Break) && ls.contains(c.target()))
-      return Completion(Normal, value);
-    if (c.complType() != Normal)
-      return c;
-  }
-
-  return Completion(); // work around gcc 4.0 bug
+    KJS_BREAKPOINT;
+
+    JSValue* value = 0;
+
+    while (1) {
+        bool b = expr->evaluateToBoolean(exec);
+        KJS_CHECKEXCEPTION
+        if (!b)
+            return Completion(Normal, value);
+
+        exec->pushIteration();
+        Completion c = statement->execute(exec);
+        exec->popIteration();
+
+        if (exec->dynamicInterpreter()->timedOut())
+            return Completion(Interrupted);
+    
+        if (c.isValueCompletion())
+            value = c.value();
+
+        if ((c.complType() == Continue) && ls.contains(c.target()))
+            continue;
+        if ((c.complType() == Break) && ls.contains(c.target()))
+            return Completion(Normal, value);
+        if (c.complType() != Normal)
+            return c;
+    }
+
+    return Completion(); // work around gcc 4.0 bug
 }
 
@@ -3047 +3257 @@
 Completion ForNode::execute(ExecState *exec)
 {
-  JSValue *v, *cval = 0;
-
-  if (expr1) {
-    v = expr1->evaluate(exec);
-    KJS_CHECKEXCEPTION
-  }
-  while (1) {
-    if (expr2) {
-      v = expr2->evaluate(exec);
-      KJS_CHECKEXCEPTION
-      if (!v->toBoolean(exec))
-        return Completion(Normal, cval);
-    }
-
-    exec->pushIteration();
-    Completion c = statement->execute(exec);
-    exec->popIteration();
-    if (c.isValueCompletion())
-      cval = c.value();
-    if (!((c.complType() == Continue) && ls.contains(c.target()))) {
-      if ((c.complType() == Break) && ls.contains(c.target()))
-        return Completion(Normal, cval);
-      if (c.complType() != Normal)
-      return c;
-    }
-    
-    if (exec->dynamicInterpreter()->timedOut())
-        return Completion(Interrupted);
-    
-    if (expr3) {
-      v = expr3->evaluate(exec);
-      KJS_CHECKEXCEPTION
-    }
-  }
+    JSValue* cval = 0;
+
+    if (expr1) {
+        expr1->evaluate(exec);
+        KJS_CHECKEXCEPTION
+    }
+
+    while (1) {
+        if (expr2) {
+            bool b = expr2->evaluateToBoolean(exec);
+            KJS_CHECKEXCEPTION
+            if (!b)
+                return Completion(Normal, cval);
+        }
+
+        exec->pushIteration();
+        Completion c = statement->execute(exec);
+        exec->popIteration();
+        if (c.isValueCompletion())
+            cval = c.value();
+        if (!((c.complType() == Continue) && ls.contains(c.target()))) {
+            if ((c.complType() == Break) && ls.contains(c.target()))
+                return Completion(Normal, cval);
+            if (c.complType() != Normal)
+                return c;
+        }
+
+        if (exec->dynamicInterpreter()->timedOut())
+            return Completion(Interrupted);
+
+        if (expr3) {
+            expr3->evaluate(exec);
+            KJS_CHECKEXCEPTION
+        }
+    }
   
-  return Completion(); // work around gcc 4.0 bug
+    return Completion(); // work around gcc 4.0 bug
 }
 
@@ -3363 +3574 @@
 }
 
-JSValue *ClauseListNode::evaluate(ExecState *)
-{
-  // should never be called
-  ASSERT(false);
-  return 0;
-}
-
 // ------------------------------ CaseBlockNode --------------------------------
 
@@ -3398 +3602 @@
     if (list1 && list1->mayHaveDeclarations()) 
         stacks.nodeStack.append(list1.get()); 
-}
-
-JSValue *CaseBlockNode::evaluate(ExecState *)
-{
-  // should never be called
-  ASSERT(false);
-  return 0;
 }
 
@@ -3593 +3790 @@
 }
 
-// ------------------------------ ParameterNode --------------------------------
-
-// ECMA 13
-JSValue *ParameterNode::evaluate(ExecState *)
-{
-  return jsUndefined();
-}
-
 // ------------------------------ FunctionBodyNode -----------------------------
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -1 @@
-// -*- c-basic-offset: 2 -*-
 /*
  *  Copyright (C) 1999-2000 Harri Porten (porten@kde.org)
@@ -112 +111 @@
   };
 
-  class Node {
+  class Node : Noncopyable {
   public:
     Node() KJS_FAST_CALL;
@@ -136 +135 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL { }
 
-    // Used to optimize those nodes that do extra work when returning a result, even if the result has no semantic relevance
-    virtual void optimizeForUnnecessaryResult() { }
-      
   protected:
     Completion createErrorCompletion(ExecState *, ErrorType, const char *msg) KJS_FAST_CALL;
@@ -160 +156 @@
     int m_line : 31;
     bool m_mayHaveDeclarations : 1;
-  private:
-    // disallow assignment
-    Node& operator=(const Node&) KJS_FAST_CALL;
-    Node(const Node &other) KJS_FAST_CALL;
   };
     
     class ExpressionNode : public Node {
     public:
-        ExpressionNode() KJS_FAST_CALL
-            : Node()
-        {
-        }
+        ExpressionNode() KJS_FAST_CALL { }
         
         // Special constructor for cases where we overwrite an object in place.
@@ -187 +176 @@
         virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL = 0;
         virtual double evaluateToNumber(ExecState*) KJS_FAST_CALL;
-    };
+        virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
+
+        // Used to optimize those nodes that do extra work when returning a result, even if the result has no semantic relevance
+        virtual void optimizeForUnnecessaryResult() { }
+   };
 
   class StatementNode : public Node {
@@ -207 +200 @@
   class NullNode : public ExpressionNode {
   public:
-    NullNode() KJS_FAST_CALL {}
+    NullNode() KJS_FAST_CALL { }
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
@@ -213 +206 @@
   };
 
-  class BooleanNode : public ExpressionNode {
-  public:
-    BooleanNode(bool v) KJS_FAST_CALL : value(v) {}
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+  class FalseNode : public ExpressionNode {
+  public:
+    FalseNode() KJS_FAST_CALL { }
+    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL { return false; }
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecPrimary; }
-  private:
-    bool value;
+  };
+
+  class TrueNode : public ExpressionNode {
+  public:
+    TrueNode() KJS_FAST_CALL { }
+    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL { return true; }
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { return PrecPrimary; }
   };
 
@@ -228 +229 @@
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual double evaluateToNumber(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecPrimary; }
@@ -234 +236 @@
     double value() const KJS_FAST_CALL { return m_double; }
     virtual void setValue(double d) KJS_FAST_CALL { m_double = d; }
+
   protected:
     double m_double;
@@ -253 +256 @@
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual double evaluateToNumber(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecPrimary; }
+
   private:
     UString value;
@@ -318 +323 @@
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual double evaluateToNumber(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
   private:
     ALWAYS_INLINE JSValue* inlineEvaluate(ExecState*);
   };
 
-  class ElementNode : public ExpressionNode {
+  class ElementNode : public Node {
   public:
     ElementNode(int e, ExpressionNode* n) KJS_FAST_CALL : elision(e), node(n) { }
     ElementNode(ElementNode* l, int e, ExpressionNode* n) KJS_FAST_CALL
       : elision(e), node(n) { l->next = this; }
-    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
+
     PassRefPtr<ElementNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+
   private:
     friend class ArrayNode;
@@ -356 +365 @@
   };
 
-  class PropertyNode : public ExpressionNode {
+  class PropertyNode : public Node {
   public:
     enum Type { Constant, Getter, Setter };
@@ -362 +371 @@
       : m_name(n), assign(a), type(t) { }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    const Identifier& name() const { return m_name; }
+
+  private:
     friend class PropertyListNode;
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
-    const Identifier& name() const { return m_name; }
-  private:
     Identifier m_name;
     RefPtr<ExpressionNode> assign;
@@ -373 +384 @@
   };
   
-  class PropertyListNode : public ExpressionNode {
+  class PropertyListNode : public Node {
   public:
     PropertyListNode(PropertyNode* n) KJS_FAST_CALL
@@ -380 +391 @@
       : node(n) { l->next = this; }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+    JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     PassRefPtr<PropertyListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
   private:
     friend class ObjectLiteralNode;
@@ -408 +421 @@
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     virtual double evaluateToNumber(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecMember; }
@@ -440 +454 @@
   };
 
-  class ArgumentListNode : public ExpressionNode {
+  class ArgumentListNode : public Node {
   public:
     ArgumentListNode(ExpressionNode* e) KJS_FAST_CALL : expr(e) { }
@@ -446 +460 @@
       : expr(e) { l->next = this; }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
     void evaluateList(ExecState*, List&) KJS_FAST_CALL;
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     PassRefPtr<ArgumentListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
   private:
     friend class ArgumentsNode;
@@ -457 +472 @@
   };
 
-  class ArgumentsNode : public ExpressionNode {
+  class ArgumentsNode : public Node {
   public:
     ArgumentsNode() KJS_FAST_CALL { }
@@ -463 +478 @@
       : listNode(l) { }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
     void evaluateList(ExecState* exec, List& list) KJS_FAST_CALL { if (listNode) listNode->evaluateList(exec, list); }
-    virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
-    virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
   private:
     RefPtr<ArgumentListNode> listNode;
@@ -560 +576 @@
   };
 
-    class PrePostResolveNode : public ExpressionNode {
+  class PrePostResolveNode : public ExpressionNode {
   public:
     PrePostResolveNode(const Identifier& i) KJS_FAST_CALL : m_ident(i) {}
@@ -634 +650 @@
   };
 
-    class PostfixBracketNode : public ExpressionNode {
+  class PostfixBracketNode : public ExpressionNode {
   public:
     PostfixBracketNode(ExpressionNode* b, ExpressionNode* s) KJS_FAST_CALL : m_base(b), m_subscript(s) {}
@@ -992 +1008 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecUnary; }
@@ -1112 +1129 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecRelational; }
@@ -1125 +1143 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecRelational; }
@@ -1138 +1157 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecRelational; }
@@ -1151 +1171 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecRelational; }
@@ -1164 +1185 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecRelational; }
@@ -1177 +1199 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecRelational; }
@@ -1190 +1213 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecEquality; }
@@ -1203 +1227 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecEquality; }
@@ -1216 +1241 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecEquality; }
@@ -1229 +1255 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecEquality; }
@@ -1284 +1311 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecLogicalAnd; }
@@ -1297 +1325 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecLogicalOr; }
@@ -1313 +1342 @@
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+    virtual bool evaluateToBoolean(ExecState*) KJS_FAST_CALL;
     virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
     virtual Precedence precedence() const { return PrecConditional; }
@@ -1470 +1500 @@
     class CommaNode : public ExpressionNode {
   public:
-    CommaNode(ExpressionNode* e1, ExpressionNode* e2) KJS_FAST_CALL : expr1(e1), expr2(e2) {}
+    CommaNode(ExpressionNode* e1, ExpressionNode* e2) KJS_FAST_CALL : expr1(e1), expr2(e2)
+    {
+        e1->optimizeForUnnecessaryResult();
+    }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
@@ -1544 +1577 @@
   class ExprStatementNode : public StatementNode {
   public:
-    ExprStatementNode(ExpressionNode* e) KJS_FAST_CALL : expr(e) { }
+    ExprStatementNode(ExpressionNode* e) KJS_FAST_CALL : expr(e)
+    {
+        e->optimizeForUnnecessaryResult();
+    }
     virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
     virtual Completion execute(ExecState*) KJS_FAST_CALL;
@@ -1596 +1632 @@
     {
         m_mayHaveDeclarations = true; 
+        if (expr1)
+            expr1->optimizeForUnnecessaryResult();
         if (expr3)
             expr3->optimizeForUnnecessaryResult();
@@ -1707 +1745 @@
   };
 
-    class ParameterNode : public ExpressionNode {
+    class ParameterNode : public Node {
   public:
     ParameterNode(const Identifier& i) KJS_FAST_CALL : id(i) { }
     ParameterNode(ParameterNode* l, const Identifier& i) KJS_FAST_CALL
       : id(i) { l->next = this; }
-    virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
     Identifier ident() KJS_FAST_CALL { return id; }
     ParameterNode *nextParam() KJS_FAST_CALL { return next.get(); }
@@ -1799 +1836 @@
   };
 
-    class CaseClauseNode : public ExpressionNode {
+    class CaseClauseNode : public Node {
   public:
       CaseClauseNode(ExpressionNode* e) KJS_FAST_CALL : expr(e) { m_mayHaveDeclarations = true; }
@@ -1805 +1842 @@
       : expr(e), m_children(children) { m_mayHaveDeclarations = true; }
       virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-      virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-      Completion evalStatements(ExecState*) KJS_FAST_CALL;
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
       virtual void getDeclarations(DeclarationStacks&) KJS_FAST_CALL;
       virtual Precedence precedence() const { ASSERT_NOT_REACHED(); return PrecExpression; }
+
+      JSValue* evaluate(ExecState*) KJS_FAST_CALL;
+      Completion evalStatements(ExecState*) KJS_FAST_CALL;
+
   private:
       RefPtr<ExpressionNode> expr;
@@ -1815 +1854 @@
   };
   
-    class ClauseListNode : public ExpressionNode {
+    class ClauseListNode : public Node {
   public:
       ClauseListNode(CaseClauseNode* c) KJS_FAST_CALL : clause(c) { m_mayHaveDeclarations = true; }
@@ -1821 +1860 @@
       : clause(c) { n->next = this; m_mayHaveDeclarations = true; }
       virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-      virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
-      CaseClauseNode *getClause() const KJS_FAST_CALL { return clause.get(); }
-      ClauseListNode *getNext() const KJS_FAST_CALL { return next.get(); }
+      CaseClauseNode* getClause() const KJS_FAST_CALL { return clause.get(); }
+      ClauseListNode* getNext() const KJS_FAST_CALL { return next.get(); }
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
       PassRefPtr<ClauseListNode> releaseNext() KJS_FAST_CALL { return next.release(); }
@@ -1834 +1872 @@
   };
   
-    class CaseBlockNode : public ExpressionNode {
+    class CaseBlockNode : public Node {
   public:
       CaseBlockNode(ClauseListNode* l1, CaseClauseNode* d, ClauseListNode* l2) KJS_FAST_CALL;
       virtual void optimizeVariableAccess(FunctionBodyNode*, DeclarationStacks::NodeStack&) KJS_FAST_CALL;
-      virtual JSValue* evaluate(ExecState*) KJS_FAST_CALL;
       Completion evalBlock(ExecState *exec, JSValue *input) KJS_FAST_CALL;
       virtual void streamTo(SourceStream&) const KJS_FAST_CALL;

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -269 +269 @@
 }
 
-void BooleanNode::streamTo(SourceStream& s) const
-{
-    s << (value ? "true" : "false");
+void FalseNode::streamTo(SourceStream& s) const
+{
+    s << "false";
+}
+
+void TrueNode::streamTo(SourceStream& s) const
+{
+    s << "true";
 }