Actually, non-terminal attachment now works fine.

[cycript.git] / sig / parse.cpp

diff --git a/sig/parse.cpp b/sig/parse.cpp
index da590a8431226dff0076b264503681ddbf879cb1..3a8a7afe0a6dd3a0b55b1bef12b6204173f287a4 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -84,8 +84,6 @@ void Parse_(CYPool &pool, struct Signature *signature, const char **name, char e
 
 Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback) {
     char next = *(*name)++;
 
 Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback) {
     char next = *(*name)++;

-    if (next == '?')
-        return NULL;

 
     Type *type(new(pool) Type());
     _assert(type != NULL);
 
     Type *type(new(pool) Type());
     _assert(type != NULL);


@@ -93,6 +91,7 @@ Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback cal
 
   parse:
     switch (next) {
 
   parse:
     switch (next) {

+        case '?': type->primitive = unknown_P; break;

         case '#': type->primitive = typename_P; break;
 
         case '(':
         case '#': type->primitive = typename_P; break;
 
         case '(':


@@ -149,14 +148,11 @@ Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback cal
 
         case '^':
             type->primitive = pointer_P;
 
         case '^':
             type->primitive = pointer_P;

-            if (**name == '"') {
+            if (**name == '"')
+                // XXX: why is this here?

                 type->data.data.type = NULL;
                 type->data.data.type = NULL;

-            } else {
+            else

                 type->data.data.type = Parse_(pool, name, eos, named, callback);
                 type->data.data.type = Parse_(pool, name, eos, named, callback);

-                sig::Type *&target(type->data.data.type);
-                if (target != NULL && target->primitive == void_P)
-                    target = NULL;
-            }

         break;
 
         case 'b':
         break;
 
         case 'b':


@@ -261,6 +257,7 @@ const char *Unparse_(CYPool &pool, struct Type *type) {
             return pool.strdup(out.str().c_str());
         } break;
 
             return pool.strdup(out.str().c_str());
         } break;
 

+        case unknown_P: return "?";

         case typename_P: return "#";
         case union_P: return pool.strcat("(", Unparse(pool, &type->data.signature), ")", NULL);
         case string_P: return "*";
         case typename_P: return "#";
         case union_P: return pool.strcat("(", Unparse(pool, &type->data.signature), ")", NULL);
         case string_P: return "*";


@@ -280,9 +277,9 @@ const char *Unparse_(CYPool &pool, struct Type *type) {
         } break;
 
         case pointer_P: {
         } break;
 
         case pointer_P: {

-            if (type->data.data.type == NULL)
-                return "^v";
-            else if (type->data.data.type->primitive == function_P)
+            // XXX: protect against the weird '"' check in Parse_
+            _assert(type->data.data.type != NULL);
+            if (type->data.data.type->primitive == function_P)

                 return "^?";
             else
                 return pool.strcat("^", Unparse(pool, type->data.data.type), NULL);
                 return "^?";
             else
                 return pool.strcat("^", Unparse(pool, type->data.data.type), NULL);