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 e6240a11b5f8d888f2001b0660af724f0ae94336..1c8b94db8bf009e9a79b1a2d2b00b1e28cf18ce4 100644 (file)
--- a/sig/types.hpp
+++ b/sig/types.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

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

 */
 
 */
 

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

 /*
 /*

- * 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.
+ * 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 Lesser General Public
- * License for more details.
+ * 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 Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -22,16 +22,22 @@
 #ifndef SIG_TYPES_H
 #define SIG_TYPES_H
 
 #ifndef SIG_TYPES_H
 #define SIG_TYPES_H
 

+#include <cstdlib>
+#include <stdint.h>
+

 #include "Standard.hpp"
 
 namespace sig {
 
 enum Primitive {
 #include "Standard.hpp"
 
 namespace sig {
 
 enum Primitive {

+    function_P = '\0',
+    block_P = '\a',
+
+    unknown_P = '?',

     typename_P = '#',
     union_P = '(',
     string_P = '*',
     selector_P = ':',
     typename_P = '#',
     union_P = '(',
     string_P = '*',
     selector_P = ':',

-    block_P = '?',

     object_P = 'W',
     boolean_P = 'B',
     uchar_P = 'C',
     object_P = 'W',
     boolean_P = 'B',
     uchar_P = 'C',


@@ -54,7 +60,7 @@ enum Primitive {
 };
 
 struct Element {
 };
 
 struct Element {

-    char *name;
+    const char *name;

     struct Type *type;
     size_t offset;
 };
     struct Type *type;
     size_t offset;
 };


@@ -74,7 +80,7 @@ struct Signature {
 
 struct Type {
     enum Primitive primitive;
 
 struct Type {
     enum Primitive primitive;

-    char *name;
+    const char *name;

     uint8_t flags;
 
     union {
     uint8_t flags;
 
     union {


@@ -90,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);
 
 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;
 }
 _finline bool IsAggregate(Primitive primitive) {
     return primitive == struct_P || primitive == union_P;
 }