Move CYNext, CYSetLast, and CYForEach to List.hpp.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 5d860182f315ec41d7c5a594915c1bec1edbefe7..d8539399fb9c13a016ce5cb7c63284a7390741f5 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -33,30 +33,13 @@
 #include <cstdlib>
 
 #include "location.hh"
+
+#include "List.hpp"
 #include "Pooling.hpp"
 #include "Options.hpp"
 
 class CYContext;
 
-template <typename Type_>
-struct CYNext {
-    Type_ *next_;
-
-    CYNext() :
-        next_(NULL)
-    {
-    }
-
-    CYNext(Type_ *next) :
-        next_(next)
-    {
-    }
-
-    void SetNext(Type_ *next) {
-        next_ = next;
-    }
-};
-
 struct CYThing {
     virtual ~CYThing() {
     }
@@ -370,7 +353,7 @@ struct CYContext {
     template <typename Type_>
     void ReplaceAll(Type_ *&values) {
         Type_ **last(&values);
-        for (Type_ *next(values); next != NULL; next = next->next_) {
+        CYForEach (next, values) {
             Replace(*last);
             last = &(*last)->next_;
         }
@@ -423,10 +406,7 @@ struct CYBlock :
     }
 
     void AddPrev(CYStatement *statement) {
-        CYStatement *last(statement);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(statements_);
+        CYSetLast(statement, statements_);
         statements_ = statement;
     }
 
@@ -611,10 +591,7 @@ struct CYCompound :
     }
 
     void AddPrev(CYExpression *expression) {
-        CYExpression *last(expression);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(expressions_);
+        CYSetLast(expression, expressions_);
         expressions_ = expression;
     }