Changeset 2741 in webkit for trunk/JavaScriptCore/kjs/internal.h

Timestamp:

Nov 18, 2002, 5:01:16 PM (23 years ago)

Author:

mjs

Message:

JavaScriptCore:

Partway to removing Value from List. Created a marking List
variant, used it in place of ListImp.

• kjs/internal.h: Removed List stuff.
• kjs/internal.cpp: (InterpreterImp::mark): Call appropriate List method to do marking of empty ListImp.
• kjs/object.h:
• kjs/object.cpp: Use marking List instead of ListImp *.
• kjs/types.h:
• kjs/types.cpp: (List::List): New boolean needsMarking parameter. (List::operator=): Perform trickery related to needsMarking. (List::~List): Likewise. (List::mark): Mark the ListImp. (List::markEmptyList): (ListImp::*): Moved here fron internal.cpp, they will be integrated into the relevant List methods soon.

WebCore:

• force-js-clean-timestamp: Rebuild for JSC changes.

File:

• trunk/JavaScriptCore/kjs/internal.h (modified) (1 diff)

trunk/JavaScriptCore/kjs/internal.h

@@ -139 +139 @@
   inline Number::Number(NumberImp *imp) : Value(imp) { }
 
-  // ---------------------------------------------------------------------------
-  //                            Internal type impls
-  // ---------------------------------------------------------------------------
-
-  /**
-   * @internal
-   */
-  class ListNode {
-    friend class List;
-    friend class ListImp;
-    friend class ListIterator;
-    ListNode(Value val, ListNode *p, ListNode *n)
-      : member(val.imp()), prev(p), next(n) {};
-    ValueImp *member;
-    ListNode *prev, *next;
-  };
-
-  class ListImp : public ValueImp {
-    friend class ListIterator;
-    friend class List;
-    friend class InterpreterImp;
-    friend class ObjectImp;
-  private:
-    ListImp();
-    ~ListImp();
-
-    Type type() const { return ListType; }
-
-    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;
-
-    void append(const Value& val);
-    void prepend(const Value& val);
-    void appendList(const List& lst);
-    void prependList(const List& lst);
-    void removeFirst();
-    void removeLast();
-    void remove(const Value &val);
-    void clear();
-    ListImp *copy() const;
-    ListIterator begin() const { return ListIterator(hook->next); }
-    ListIterator end() const { return ListIterator(hook); }
-    //    bool isEmpty() const { return (hook->prev == hook); }
-    bool isEmpty() const;
-    int size() const;
-    Value at(int i) const;
-    Value operator[](int i) const { return at(i); }
-    static ListImp* empty();
-
-#ifdef KJS_DEBUG_MEM
-    static int count;
-#endif
-  private:
-    void erase(ListNode *n);
-    ListNode *hook;
-    static ListImp *emptyList;
-  };
-  
-  inline List::List(ListImp *imp) : Value(imp) { }
-
   /**
    * @short The "label set" in Ecma-262 spec