Changeset 2744 in webkit for trunk/JavaScriptCore

Timestamp:

Nov 18, 2002, 6:15:17 PM (23 years ago)

Author:

mjs

Message:

Another step towards the List conversion: stop inheriting from Value.

• kjs/types.cpp: (ListIterator::ListIterator): (List::List): (List::operator=): (List::~List): (List::mark): (List::append): (List::prepend): (List::appendList): (List::prependList): (List::removeFirst): (List::removeLast): (List::remove): (List::clear): (List::copy): (List::begin): (List::end): (List::isEmpty): (List::size): (List::at): (List::operator[]):
• kjs/types.h:

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• ChangeLog-2002-12-03 (modified) (1 diff)
• ChangeLog-2003-10-25 (modified) (1 diff)
• kjs/types.cpp (modified) (7 diffs)
• kjs/types.h (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2002-11-18  Maciej Stachowiak  <[email protected]>
+
+        Another step towards the List conversion: stop inheriting from Value.
+        
+        * kjs/types.cpp:
+        (ListIterator::ListIterator):
+        (List::List):
+        (List::operator=):
+        (List::~List):
+        (List::mark):
+        (List::append):
+        (List::prepend):
+        (List::appendList):
+        (List::prependList):
+        (List::removeFirst):
+        (List::removeLast):
+        (List::remove):
+        (List::clear):
+        (List::copy):
+        (List::begin):
+        (List::end):
+        (List::isEmpty):
+        (List::size):
+        (List::at):
+        (List::operator[]):
+        * kjs/types.h:
+
 2002-11-18  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2002-12-03

@@ +1 @@
+2002-11-18  Maciej Stachowiak  <[email protected]>
+
+        Another step towards the List conversion: stop inheriting from Value.
+        
+        * kjs/types.cpp:
+        (ListIterator::ListIterator):
+        (List::List):
+        (List::operator=):
+        (List::~List):
+        (List::mark):
+        (List::append):
+        (List::prepend):
+        (List::appendList):
+        (List::prependList):
+        (List::removeFirst):
+        (List::removeLast):
+        (List::remove):
+        (List::clear):
+        (List::copy):
+        (List::begin):
+        (List::end):
+        (List::isEmpty):
+        (List::size):
+        (List::at):
+        (List::operator[]):
+        * kjs/types.h:
+
 2002-11-18  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/ChangeLog-2003-10-25

@@ +1 @@
+2002-11-18  Maciej Stachowiak  <[email protected]>
+
+        Another step towards the List conversion: stop inheriting from Value.
+        
+        * kjs/types.cpp:
+        (ListIterator::ListIterator):
+        (List::List):
+        (List::operator=):
+        (List::~List):
+        (List::mark):
+        (List::append):
+        (List::prepend):
+        (List::appendList):
+        (List::prependList):
+        (List::removeFirst):
+        (List::removeLast):
+        (List::remove):
+        (List::clear):
+        (List::copy):
+        (List::begin):
+        (List::end):
+        (List::isEmpty):
+        (List::size):
+        (List::at):
+        (List::operator[]):
+        * kjs/types.h:
+
 2002-11-18  Maciej Stachowiak  <[email protected]>
 

trunk/JavaScriptCore/kjs/types.cpp

@@ -115 +115 @@
 
 ListIterator::ListIterator(const List &l)
-  : node(static_cast<ListImp*>(l.imp())->hook->next)
+  : node(l.imp->hook->next)
 {
 }
@@ -170 +170 @@
 
 List::List(bool needsMarking)
-  : Value(needsMarking ? ListImp::empty() : new ListImp()),
-    m_needsMarking(needsMarking)
-{
-  if (m_needsMarking) {
-    imp()->deref();
+  : m_needsMarking(needsMarking)
+{
+  imp = m_needsMarking ? ListImp::empty() : new ListImp();
+    
+  if (!m_needsMarking) {
+    imp->ref();
   }
 }
@@ -180 +181 @@
 
 List::List(const List& l)
-  : Value(l),
-    m_needsMarking(false)
+  : m_needsMarking(false)
 {  
-}
-
-List::List(ListImp *imp) 
-  : Value(imp),
-    m_needsMarking(false)
-{
+  imp = l.imp;
+
+  if (!m_needsMarking) {
+    imp->ref();
+  }
+}
+
+List::List(ListImp *p_imp) 
+  : m_needsMarking(false)
+{
+  imp = p_imp;
+
+  if (!m_needsMarking) {
+    imp->ref();
+  }
 }
 
@@ -194 +203 @@
 List& List::operator=(const List& l)
 {
-  if (m_needsMarking) {
-    imp()->ref();
-  }
-
-  Value::operator=(l);
-
-  if (m_needsMarking) {
-    imp()->deref();
-  }
+  if (!m_needsMarking) {
+    l.imp->ref();
+    imp->deref();
+  }
+
+  imp = l.imp;
 
   return *this;
@@ -209 +215 @@
 List::~List()
 {
-  if (m_needsMarking) {
-    imp()->ref();
+  if (!m_needsMarking) {
+    imp->deref();
   }
 }
@@ -216 +222 @@
 void List::mark()
 {
-  if (!imp()->marked()) {
-    imp()->mark();
+  if (!imp->marked()) {
+    imp->mark();
   }
 }
@@ -223 +229 @@
 void List::append(const Value& val)
 {
-  static_cast<ListImp*>(rep)->append(val);
+  imp->append(val);
 }
 
 void List::prepend(const Value& val)
 {
-  static_cast<ListImp*>(rep)->prepend(val);
+  imp->prepend(val);
 }
 
 void List::appendList(const List& lst)
 {
-  static_cast<ListImp*>(rep)->appendList(lst);
+  imp->appendList(lst);
 }
 
 void List::prependList(const List& lst)
 {
-  static_cast<ListImp*>(rep)->prependList(lst);
+  imp->prependList(lst);
 }
 
 void List::removeFirst()
 {
-  static_cast<ListImp*>(rep)->removeFirst();
+  imp->removeFirst();
 }
 
 void List::removeLast()
 {
-  static_cast<ListImp*>(rep)->removeLast();
+  imp->removeLast();
 }
 
 void List::remove(const Value &val)
 {
-  static_cast<ListImp*>(rep)->remove(val);
+  imp->remove(val);
 }
 
 void List::clear()
 {
-  static_cast<ListImp*>(rep)->clear();
+  imp->clear();
 }
 
 List List::copy() const
 {
-  return static_cast<ListImp*>(rep)->copy();
+  return imp->copy();
 }
 
 ListIterator List::begin() const
 {
-  return static_cast<ListImp*>(rep)->begin();
+  return imp->begin();
 }
 
 ListIterator List::end() const
 {
-  return static_cast<ListImp*>(rep)->end();
+  return imp->end();
 }
 
 bool List::isEmpty() const
 {
-  return static_cast<ListImp*>(rep)->isEmpty();
+  return imp->isEmpty();
 }
 
 int List::size() const
 {
-  return static_cast<ListImp*>(rep)->size();
+  return imp->size();
 }
 
 Value List::at(int i) const
 {
-  return static_cast<ListImp*>(rep)->at(i);
+  return imp->at(i);
 }
 
 Value List::operator[](int i) const
 {
-  return static_cast<ListImp*>(rep)->at(i);
+  return imp->at(i);
 }
 

trunk/JavaScriptCore/kjs/types.h

@@ -105 +105 @@
    * copy of the list the referenced objects are still shared.
    */
-  class List : private Value {
+  class List {
     friend class ListIterator;
   public:
@@ -198 +198 @@
   private:
     List(ListImp *);
-    ListImp *imp() const { return (ListImp *)Value::imp(); }
+
+    ListImp *imp;
     bool m_needsMarking;
+    friend class ListNode;
   };