Move non-RegEx lexer hacks from Scanner to Parser.

[cycript.git] / List.hpp

diff --git a/List.hpp b/List.hpp
index 154eb51b26173e11375db31eefdaa3c2db615925..4caa5361e35db6eceb83f1232c23e078f3b7c7ab 100644 (file)
--- a/List.hpp
+++ b/List.hpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify
- * it under the terms of the GNU 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


@@ -53,16 +53,60 @@ Type_ *&CYSetLast(Type_ *&list) {
 }
 
 template <typename Type_>
 }
 
 template <typename Type_>

-Type_ *CYGetLast(Type_ *list) {
+Type_ *&CYGetLast(Type_ *&list) {

     if (list == NULL)
     if (list == NULL)

-        return NULL;
+        return list;

 
 

-    Type_ *next(list);
-    while (next->next_ != NULL)
-        next = next->next_;
-    return next;
+    Type_ **next(&list);
+    while ((*next)->next_ != NULL)
+        next = &(*next)->next_;
+    return *next;

 }
 
 }
 

+template <typename Type_>
+struct CYList {
+    Type_ *first_;
+    Type_ *last_;
+
+    CYList(Type_ *first = NULL) :
+        first_(first),
+        last_(CYGetLast(first))
+    {
+    }
+
+    operator Type_ *() const {
+        return first_;
+    }
+
+    Type_ *operator ->() const {
+        return first_;
+    }
+
+    CYList &operator ->*(Type_ *next) {
+        if (next != NULL)
+            if (first_ == NULL) {
+                first_ = next;
+                last_ = next;
+            } else for (;; last_ = last_->next_)
+                if (last_->next_ == NULL) {
+                    last_->next_ = next;
+                    last_ = next;
+                    break;
+                }
+        return *this;
+    }
+
+    CYList &operator ->*(CYList &next) {
+        if (*this == NULL)
+            *this = next;
+        else if (next != NULL) {
+            last_->next_ = next.first_;
+            last_ = next.last_;
+        }
+        return *this;
+    }
+};
+

 #define CYForEach(value, list) \
     for (__typeof__(*list) *value(list); value != NULL; value = value->next_)
 
 #define CYForEach(value, list) \
     for (__typeof__(*list) *value(list); value != NULL; value = value->next_)