Fix issue in 64-bit choose() reported by heardrwt.

[cycript.git] / sig / types.hpp

diff --git a/sig/types.hpp b/sig/types.hpp
index 580d999bf4ea0841618344a971183ad81bd7116a..1c8b94db8bf009e9a79b1a2d2b00b1e28cf18ce4 100644 (file)
--- a/sig/types.hpp
+++ b/sig/types.hpp
@@ -1,55 +1,43 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU 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 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 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 General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
 #ifndef SIG_TYPES_H
 #define SIG_TYPES_H
 
+#include <cstdlib>
+#include <stdint.h>
+
 #include "Standard.hpp"
 
 namespace sig {
 
 enum Primitive {
+    function_P = '\0',
+    block_P = '\a',
+
+    unknown_P = '?',
     typename_P = '#',
     union_P = '(',
     string_P = '*',
     selector_P = ':',
-    block_P = '?',
     object_P = 'W',
     boolean_P = 'B',
     uchar_P = 'C',
@@ -72,7 +60,7 @@ enum Primitive {
 };
 
 struct Element {
-    char *name;
+    const char *name;
     struct Type *type;
     size_t offset;
 };
@@ -92,7 +80,7 @@ struct Signature {
 
 struct Type {
     enum Primitive primitive;
-    char *name;
+    const char *name;
     uint8_t flags;
 
     union {
@@ -108,6 +96,10 @@ struct Type {
 struct Type *joc_parse_type(char **name, char eos, bool variable, bool signature);
 void joc_parse_signature(struct Signature *signature, char **name, char eos, bool variable);
 
+_finline bool IsFunctional(Primitive primitive) {
+    return primitive == block_P || primitive == function_P;
+}
+
 _finline bool IsAggregate(Primitive primitive) {
     return primitive == struct_P || primitive == union_P;
 }