Revert a minor style change that broke ';function'.

[cycript.git] / Local.hpp

diff --git a/Local.hpp b/Local.hpp
index c2237927fb6852283c4ce505ab97e5e75299c4de..ddfdd62d2628636ea3e1c9adc7f74347021da226 100644 (file)
--- a/Local.hpp
+++ b/Local.hpp
@@ -1,63 +1,63 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * 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.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * 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.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * 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 CYLOCAL_HPP
-#define CYLOCAL_HPP
+#ifndef CYCRIPT_LOCAL_HPP
+#define CYCRIPT_LOCAL_HPP
+
+#include <pthread.h>

 
 template <typename Type_>
 
 template <typename Type_>

-struct CYLocal {
-    Type_ last_;
+class CYLocal {
+  private:
+    static ::pthread_key_t key_;
+
+    Type_ *last_;
+
+  protected:
+    static _finline void Set(Type_ *value) {
+        _assert(::pthread_setspecific(key_, value) == 0);
+    }

 
 

-    CYLocal(Type_ next) {
-        Type_ &top(Top());
-        last_ = top;
-        top = next;
+    static ::pthread_key_t Key_() {
+        ::pthread_key_t key;
+        ::pthread_key_create(&key, NULL);
+        return key;

     }
 
     }
 

-    ~CYLocal() {
-        Top() = last_;
+  public:
+    CYLocal(Type_ *next) {
+        last_ = Get();
+        Set(next);

     }
 
     }
 

-    static Type_ &Top() {
-        static __thread Type_ top;
-        return top;
+    _finline ~CYLocal() {
+        Set(last_);
+    }
+
+    static _finline Type_ *Get() {
+        return reinterpret_cast<Type_ *>(::pthread_getspecific(key_));

     }
 };
 
     }
 };
 

-#endif/*CYLOCAL_HPP*/
+template <typename Type_>
+::pthread_key_t CYLocal<Type_>::key_ = Key_();
+
+#endif/*CYCRIPT_LOCAL_HPP*/