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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a99274702f3e41c42f54e1182ed1a1d1e021a97c..01a0c9659b4be9973b1606cd8bd66e491b8bf4bb 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -85,7 +85,7 @@ all := cycript
 #arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 #endif
 
-header := Cycript.tab.hh Parser.hpp Pooling.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
+header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
 
 code := 
 code += Replace.lo Output.lo

diff --git a/List.hpp b/List.hpp
new file mode 100644 (file)
index 0000000..7113492
--- /dev/null
+++ b/List.hpp
@@ -0,0 +1,59 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010  Jay Freeman (saurik)
+*/
+
+/* GNU Lesser General Public License, Version 3 {{{ */
+/*
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
+ *
+ * Cycript is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
+#ifndef CYCRIPT_LIST_HPP
+#define CYCRIPT_LIST_HPP
+
+template <typename Type_>
+struct CYNext {
+    Type_ *next_;
+
+    CYNext() :
+        next_(NULL)
+    {
+    }
+
+    CYNext(Type_ *next) :
+        next_(next)
+    {
+    }
+
+    void SetNext(Type_ *next) {
+        next_ = next;
+    }
+};
+
+template <typename Type_>
+void CYSetLast(Type_ *&list, Type_ *item) {
+    if (list == NULL)
+        list = item;
+    else {
+        Type_ *next(list);
+        while (next->next_ != NULL)
+            next = next->next_;
+        next->next_ = item;
+    }
+}
+
+#define CYForEach(value, list) \
+    for (__typeof__(*list) *value(list); value != NULL; value = value->next_)
+
+#endif/*CYCRIPT_LIST_HPP*/

diff --git a/Parser.hpp b/Parser.hpp
index 0b9099adfa8059009323d8f016a7451e68a40c49..d8539399fb9c13a016ce5cb7c63284a7390741f5 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -33,45 +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;
-    }
-};
-
-template <typename Type_>
-void CYSetLast(Type_ *&list, Type_ *item) {
-    if (list == NULL)
-        list = item;
-    else {
-        Type_ *next(list);
-        while (next->next_ != NULL)
-            next = next->next_;
-        next->next_ = item;
-    }
-}
-
-#define CYForEach(value, list) \
-    for (__typeof__(*list) *value(list); value != NULL; value = value->next_)
-
 struct CYThing {
     virtual ~CYThing() {
     }

diff --git a/makefile b/makefile
index f84a82119a629aba142a16e97ea22180a5a74e31..cf4e76975fae2e033d3979414b83653eb8f9ced2 100644 (file)
--- a/makefile
+++ b/makefile
@@ -23,7 +23,7 @@ ifneq ($(dpkg_architecture),)
 arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
-header := Cycript.tab.hh Parser.hpp Pooling.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
+header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
 
 code := 
 code += Replace.o Output.o