Changeset 1859 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Aug 18, 2002, 12:21:26 AM (23 years ago)

Author:

mjs

Message:

Separated Completion from Value and made it a pure stack
object. This removed another 160,000 of the remaining 580,000
garbage collected object allocations.

6% speed increas on cvs-js-performance test.

• kjs/completion.cpp: Added. New implementation that doesn't require a ValueImp *. (Completion::Completion): (Completion::complType): (Completion::value): (Completion::target): (Completion::isValueCompletion):
• kjs/completion.h: Added.
• kjs/function.cpp: (GlobalFuncImp::call): Removed some (apparently mistaken) uses of Completion as a Value.
• kjs/internal.cpp:
• kjs/internal.h:
• kjs/types.cpp: Removed Completion stuff.
• kjs/types.h: Removed Completion stuff.
• JavaScriptCore.pbproj/project.pbxproj: Added new header.

Location:

trunk/JavaScriptCore/kjs

Files:

• completion.cpp (added)
• completion.h (added)
• function.cpp (modified) (2 diffs)
• internal.cpp (modified) (1 diff)
• internal.h (modified) (1 diff)
• types.cpp (modified) (1 diff)
• types.h (modified) (2 diffs)

trunk/JavaScriptCore/kjs/function.cpp

@@ -417 +417 @@
           delete progNode;
       if (c.complType() == ReturnValue)
-          return c;
+          return c.value();
       // ### setException() on throw?
       else if (c.complType() == Normal) {
@@ -425 +425 @@
               return Undefined();
       } else {
-          return c;
+          return Undefined();
       }
     }

trunk/JavaScriptCore/kjs/internal.cpp

@@ -330 +330 @@
     tos = prev;
   }
-}
-
-// ------------------------------ CompletionImp --------------------------------
-
-CompletionImp::CompletionImp(ComplType c, const Value& v, const UString& t)
-  : comp(c), val(v.imp()), tar(t)
-{
-}
-
-CompletionImp::~CompletionImp()
-{
-}
-
-void CompletionImp::mark()
-{
-  ValueImp::mark();
-
-  if (val && !val->marked())
-    val->mark();
-}
-
-Value CompletionImp::toPrimitive(ExecState */*exec*/, Type /*preferredType*/) const
-{
-  // invalid for Completion
-  assert(false);
-  return Value();
-}
-
-bool CompletionImp::toBoolean(ExecState */*exec*/) const
-{
-  // invalid for Completion
-  assert(false);
-  return false;
-}
-
-double CompletionImp::toNumber(ExecState */*exec*/) const
-{
-  // invalid for Completion
-  assert(false);
-  return 0;
-}
-
-UString CompletionImp::toString(ExecState */*exec*/) const
-{
-  // invalid for Completion
-  assert(false);
-  return UString::null;
-}
-
-Object CompletionImp::toObject(ExecState */*exec*/) const
-{
-  // invalid for Completion
-  assert(false);
-  return Object();
 }
 

trunk/JavaScriptCore/kjs/internal.h

@@ -143 +143 @@
   // ---------------------------------------------------------------------------
 
-  class CompletionImp : public ValueImp {
-  public:
-    Type type() const { return CompletionType; }
-
-    CompletionImp(ComplType c, const Value& v, const UString& t);
-    virtual ~CompletionImp();
-    virtual void mark();
-
-    Value toPrimitive(ExecState *exec, Type preferred = UnspecifiedType) const;
-    bool toBoolean(ExecState *exec) const;
-    double toNumber(ExecState *exec) const;
-    UString toString(ExecState *exec) const;
-    Object toObject(ExecState *exec) const;
-
-    ComplType complType() const { return comp; }
-    Value value() const { return Value(val); }
-    UString target() const { return tar; }
-
-  private:
-    ComplType comp;
-    ValueImp * val;
-    UString tar;
-  };
-
-  inline Completion::Completion(CompletionImp *imp) : Value(imp) { }
-
   /**
    * @internal

trunk/JavaScriptCore/kjs/types.cpp

@@ -204 +204 @@
 #endif
 
-
-// ------------------------------ Completion -----------------------------------
-
-Completion::Completion(ComplType c, const Value& v, const UString &t)
-  : Value(new CompletionImp(c,v,t))
-{
-}
-
-Completion Completion::dynamicCast(const Value &v)
-{
-  if (v.isNull() || v.type() != CompletionType)
-    return 0;
-
-  return static_cast<CompletionImp*>(v.imp());
-}
-
-ComplType Completion::complType() const
-{
-  return static_cast<CompletionImp*>(rep)->complType();
-}
-
-Value Completion::value() const
-{
-  return static_cast<CompletionImp*>(rep)->value();
-}
-
-UString Completion::target() const
-{
-  return static_cast<CompletionImp*>(rep)->target();
-}
-
-bool Completion::isValueCompletion() const
-{
-  return !value().isNull();
-}

trunk/JavaScriptCore/kjs/types.h

@@ -28 +28 @@
 
 #include "value.h"
+#include "reference.h"
+#include "completion.h"
 
 namespace KJS {
@@ -200 +202 @@
   };
 
-  /**
-   * Completion types.
-   */
-  enum ComplType { Normal, Break, Continue, ReturnValue, Throw };
-
-  /**
-   * Completion objects are used to convey the return status and value
-   * from functions.
-   *
-   * See @ref FunctionImp::execute()
-   *
-   * @see FunctionImp
-   *
-   * @short Handle for a Completion type.
-   */
-  class Completion : public Value {
-  public:
-    Completion(ComplType c = Normal, const Value& v = Value(),
-               const UString &t = UString::null);
-    Completion(CompletionImp *v);
-
-    /**
-     * Converts a Value into an Completion. If the value's type is not
-     * CompletionType, a null object will be returned (i.e. one with it's
-     * internal pointer set to 0). If you do not know for sure whether the
-     * value is of type CompletionType, you should check the @ref isNull()
-     * methods afterwards before calling any methods on the returned value.
-     *
-     * @return The value converted to an Completion
-     */
-    static Completion dynamicCast(const Value &v);
-
-    ComplType complType() const;
-    Value value() const;
-    UString target() const;
-    bool isValueCompletion() const;
-  };
-
 }; // namespace