Avoid infinite recursion while CYONifying objects.

[cycript.git] / sig / types.hpp

diff --git a/sig/types.hpp b/sig/types.hpp
index e66e0c3e69aa4574bb49b72485eb19b7f701c9c6..1c8b94db8bf009e9a79b1a2d2b00b1e28cf18ce4 100644 (file)
--- a/sig/types.hpp
+++ b/sig/types.hpp
@@ -31,11 +31,13 @@ namespace sig {
 
 enum Primitive {
     function_P = '\0',
 
 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',


@@ -94,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;
 }