X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/ea2d184cbcdf25cfa51727f175356fe2ee211136..2447e531132913a88707e5d457fb2946fa3b0478:/sig/types.hpp

diff --git a/sig/types.hpp b/sig/types.hpp
index 3e8d1f2..175d172 100644
--- a/sig/types.hpp
+++ b/sig/types.hpp
@@ -1,16 +1,44 @@
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
+*/
+
+/* GNU Affero General Public License, Version 3 {{{ */
+/*
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/
+/* }}} */
+
 #ifndef SIG_TYPES_H
 #define SIG_TYPES_H
 
-#include "minimal/stdlib.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 = ':',
-    object_P = '@',
+    object_P = 'W',
     boolean_P = 'B',
     uchar_P = 'C',
     uint_P = 'I',
@@ -32,7 +60,7 @@ enum Primitive {
 };
 
 struct Element {
-    char *name;
+    const char *name;
     struct Type *type;
     size_t offset;
 };
@@ -52,7 +80,7 @@ struct Signature {
 
 struct Type {
     enum Primitive primitive;
-    char *name;
+    const char *name;
     uint8_t flags;
 
     union {
@@ -62,13 +90,20 @@ struct Type {
         } data;
 
         struct Signature signature;
-        char *extra;
     } data;
 };
 
 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;
+}
+
 }
 
 #endif/*SIG_TYPES_H*/