Relax (broken) restriction of void typedef/return.

[cycript.git] / List.hpp

diff --git a/List.hpp b/List.hpp
index e4a767e5c02884944cf4af03cce88109b45eec11..d2acedf63e26a327e11ce5f4359e6a27fc6d5b24 100644 (file)
--- a/List.hpp
+++ b/List.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

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


@@ -22,6 +22,8 @@
 #ifndef CYCRIPT_LIST_HPP
 #define CYCRIPT_LIST_HPP
 
 #ifndef CYCRIPT_LIST_HPP
 #define CYCRIPT_LIST_HPP
 

+#include "Exception.hpp"
+

 template <typename Type_>
 struct CYNext {
     Type_ *next_;
 template <typename Type_>
 struct CYNext {
     Type_ *next_;


@@ -53,16 +55,71 @@ 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() :
+        first_(NULL),
+        last_(NULL)
+    {
+    }
+
+    CYList(Type_ *first) :
+        first_(first),
+        last_(CYGetLast(first))
+    {
+    }
+
+    CYList(Type_ *first, Type_ *last) :
+        first_(first),
+        last_(last)
+    {
+    }
+
+    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 {
+                _assert(last_->next_ == NULL);
+                last_->next_ = next;
+                last_ = next;
+            }
+        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_)