Sort-of improve multi-line editor when in vi mode.

[cycript.git] / sig / types.hpp

diff --git a/sig/types.hpp b/sig/types.hpp
index e6240a11b5f8d888f2001b0660af724f0ae94336..175d172c679ee086754371c13a010cc550f2b609 100644 (file)
--- a/sig/types.hpp
+++ b/sig/types.hpp
@@ -1,37 +1,43 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU Affero 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 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.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * 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 <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',
@@ -54,7 +60,7 @@ enum Primitive {
 };
 
 struct Element {
-    char *name;
+    const char *name;
     struct Type *type;
     size_t offset;
 };
@@ -74,7 +80,7 @@ struct Signature {
 
 struct Type {
     enum Primitive primitive;
-    char *name;
+    const char *name;
     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);
 
+_finline bool IsFunctional(Primitive primitive) {
+    return primitive == block_P || primitive == function_P;
+}
+
 _finline bool IsAggregate(Primitive primitive) {
     return primitive == struct_P || primitive == union_P;
 }