merge SingleLinkList.inline.cc into .cc, .h

mpictor · mpictor · commit 34c452e658d6 · 2015-02-08T17:51:05.000-05:00
diff --git a/src/clstepcore/CMakeLists.txt b/src/clstepcore/CMakeLists.txt
@@ -11,7 +11,6 @@ set(LIBSTEPCORE_SRCS
   sdai.cc
   sdaiSelect.cc
   SingleLinkList.cc
-  SingleLinkList.inline.cc
   Registry.inline.cc
   ExpDict.cc
   ExpDict.inline.cc
diff --git a/src/clstepcore/SingleLinkList.cc b/src/clstepcore/SingleLinkList.cc
@@ -12,6 +12,50 @@
 
 #include <SingleLinkList.h>
 #include "sc_memmgr.h"
+#include <iostream>
+
+//
+SingleLinkNode * SingleLinkNode::NextNode()  const {
+    return next;
+}
+
+SingleLinkList::SingleLinkList() : head( 0 ), tail( 0 ) {
+}
+
+SingleLinkList::~SingleLinkList() {
+    Empty();
+}
+
+void SingleLinkList::Empty() {
+    SingleLinkNode * tmp = head;
+    while( tmp ) {
+        tmp = head -> NextNode();
+        delete head;
+        head = tmp;
+    }
+}
+
+SingleLinkNode * SingleLinkList::NewNode() {
+    //  defined in subtypes
+    std::cerr << "\n\n******BUG****** a virtually defined function should \n"
+    << "be called for SingleLinkList::NewNode()\n\n";
+    return new SingleLinkNode();
+}
+
+SingleLinkNode * SingleLinkList::GetHead() const {
+    return ( head );
+}
+
+int SingleLinkList::EntryCount() const {
+    int entryCount = 0;
+    SingleLinkNode * entryPtr = head;
+
+    while( entryPtr != 0 ) {
+        entryPtr = entryPtr->NextNode();
+        entryCount++;
+    }
+    return entryCount;
+}
 
 void SingleLinkList::DeleteFollowingNodes( SingleLinkNode * item ) {
     if( head ) {
diff --git a/src/clstepcore/SingleLinkList.h b/src/clstepcore/SingleLinkList.h
@@ -14,18 +14,17 @@
 
 #include <sc_export.h>
 
+/** Base class for a singly-linked list.
+ * \sa SingleLinkNode
+ *
+ * node which represents the value is contained in the subclass
+ * since it may have different types for different lists
+ */
 class SC_CORE_EXPORT SingleLinkList  {
-
-        // node which represents the value is contained in the subclass
-        //  since it may have different types for different lists
-
     protected:
-
         class  SingleLinkNode  * head;
         SingleLinkNode  * tail;
-
     public:
-
         virtual SingleLinkNode * NewNode();
         virtual void AppendNode( SingleLinkNode * );
         virtual void DeleteNode( SingleLinkNode * );
@@ -38,23 +37,26 @@ class SC_CORE_EXPORT SingleLinkList  {
 
         SingleLinkList();
         virtual ~SingleLinkList();
+};
 
-}
-;
-
-
+/** Base class for nodes of a single-linked list.
+ * \sa SingleLinkList
+ */
 class SC_CORE_EXPORT SingleLinkNode {
         friend class SingleLinkList;
-    protected:
-
     public:
         SingleLinkList * owner;
         SingleLinkNode * next;
 
-        virtual SingleLinkNode * NextNode() const;
-        SingleLinkNode() : owner( 0 ), next( 0 )  { }
-        virtual ~SingleLinkNode() { }
+        virtual SingleLinkNode * NextNode() const {
+            return next;
+        }
+
+        SingleLinkNode() : owner( 0 ), next( 0 ) {
+        }
 
+        virtual ~SingleLinkNode() {
+        }
 };
 
 #endif
diff --git a/src/clstepcore/SingleLinkList.inline.cc b/src/clstepcore/SingleLinkList.inline.cc
