Add -Wno-dangling-else, required by clang++ -Wall.

[cycript.git] / Pooling.hpp

diff --git a/Pooling.hpp b/Pooling.hpp
index 84adad2c04a03e52ee6ebb2bdc738f61edc0e586..a8c1fd929b72f0a379aaa70bb712749acb88cd3c 100644 (file)
--- a/Pooling.hpp
+++ b/Pooling.hpp
@@ -1,10 +1,35 @@
-#ifndef CYPOOLING_HPP
-#define CYPOOLING_HPP
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
+*/
+
+/* GNU 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
+ * 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/>.
+**/
+/* }}} */
+
+#ifndef CYCRIPT_POOLING_HPP
+#define CYCRIPT_POOLING_HPP
 
 #include <apr_pools.h>
 #include <apr_strings.h>
 
-#include <minimal/stdlib.h>
+#include "Exception.hpp"
+#include "Local.hpp"
+#include "Standard.hpp"
+
+#include <cstdlib>
 
 _finline void *operator new(size_t size, apr_pool_t *pool) {
     return apr_palloc(pool, size);
@@ -19,8 +44,8 @@ class CYPool {
     apr_pool_t *pool_;
 
   public:
-    CYPool() {
-        _aprcall(apr_pool_create(&pool_, NULL));
+    CYPool(apr_pool_t *pool = NULL) {
+        _aprcall(apr_pool_create(&pool_, pool));
     }
 
     ~CYPool() {
@@ -46,6 +71,12 @@ class CYPool {
 
 struct CYData {
     apr_pool_t *pool_;
+    unsigned count_;
+
+    CYData() :
+        count_(1)
+    {
+    }
 
     virtual ~CYData() {
     }
@@ -65,7 +96,77 @@ struct CYData {
     static void operator delete(void *data) {
         apr_pool_destroy(reinterpret_cast<CYData *>(data)->pool_);
     }
+};
+
+template <typename Type_>
+struct CYPoolAllocator {
+    apr_pool_t *pool_;
+
+    typedef Type_ value_type;
+    typedef value_type *pointer;
+    typedef const value_type *const_pointer;
+    typedef value_type &reference;
+    typedef const value_type &const_reference;
+    typedef std::size_t size_type;
+    typedef std::ptrdiff_t difference_type;
+
+    CYPoolAllocator() :
+        pool_(NULL)
+    {
+    }
 
+    template <typename Right_>
+    CYPoolAllocator(const CYPoolAllocator<Right_> &rhs) :
+        pool_(rhs.pool_)
+    {
+    }
+
+    pointer allocate(size_type size, const void *hint = 0) {
+        return reinterpret_cast<pointer>(apr_palloc(pool_, size));
+    }
+
+    void deallocate(pointer data, size_type size) {
+    }
+
+    void construct(pointer address, const Type_ &rhs) {
+        new(address) Type_(rhs);
+    }
+
+    void destroy(pointer address) {
+        address->~Type_();
+    }
+
+    template <typename Right_>
+    inline bool operator==(const CYPoolAllocator<Right_> &rhs) {
+        return pool_ == rhs.pool_;
+    }
+
+    template <typename Right_>
+    inline bool operator!=(const CYPoolAllocator<Right_> &rhs) {
+        return !operator==(rhs);
+    }
+
+    template <typename Right_>
+    struct rebind {
+        typedef CYPoolAllocator<Right_> other;
+    };
 };
 
-#endif/*CYPOOLING_HPP*/
+class CYLocalPool :
+    public CYPool
+{
+  private:
+    CYLocal<apr_pool_t> local_;
+
+  public:
+    CYLocalPool() :
+        CYPool(),
+        local_(operator apr_pool_t *())
+    {
+    }
+};
+
+#define $pool \
+    CYLocal<apr_pool_t>::Get()
+
+#endif/*CYCRIPT_POOLING_HPP*/