Fix pointer crashes and round-trip const void *.

diff --git a/Execute.cpp b/Execute.cpp
index 5baca2a60def57512ab190bba35edbf684b77c9e..c4a1fbb937cca1856f4545ffe3ee09d1365f57b6 100644 (file)
--- a/Execute.cpp
+++ b/Execute.cpp
@@ -152,7 +152,6 @@ void CYFinalize(JSObjectRef object) {
 void Structor_(CYPool &pool, sig::Type *&type) {
     if (
         type->primitive == sig::pointer_P &&
 void Structor_(CYPool &pool, sig::Type *&type) {
     if (
         type->primitive == sig::pointer_P &&

-        type->data.data.type != NULL &&

         type->data.data.type->primitive == sig::struct_P &&
         type->data.data.type->name != NULL &&
         strcmp(type->data.data.type->name, "_objc_class") == 0
         type->data.data.type->primitive == sig::struct_P &&
         type->data.data.type->name != NULL &&
         strcmp(type->data.data.type->name, "_objc_class") == 0

diff --git a/Internal.hpp b/Internal.hpp
index abb48eda52198f30a74e394ed674bc599063c341..7c278b4afc1851a1b04f811872bbd212352a2af7 100644 (file)
--- a/Internal.hpp
+++ b/Internal.hpp
@@ -73,8 +73,9 @@ struct Type_privateData :
     Type_privateData(sig::Type *type) :
         ffi_(NULL)
     {
     Type_privateData(sig::Type *type) :
         ffi_(NULL)
     {

-        if (type != NULL)
-            Set(type);
+        // XXX: just in case I messed up migrating
+        _assert(type != NULL);
+        Set(type);

     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {
     }
 
     Type_privateData(sig::Type *type, ffi_type *ffi) {

diff --git a/Replace.cpp b/Replace.cpp
index ce013033a25dba9caaa8b9dc4372fbd0a8d1dcec..ba73201d1c2c57a39ed1766011102e81aae9100c 100644 (file)
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -951,7 +951,7 @@ CYFunctionParameter *CYTypedParameter::Parameters(CYContext &context) { $T(NULL)
 }
 
 CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *prefix) { $T(prefix)
 }
 
 CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *prefix) { $T(prefix)

-    return next_->TypeSignature(context, $ CYAdd(prefix, typed_->specifier_->Replace(context)));
+    return next_->TypeSignature(context, $ CYAdd(prefix, typed_->Replace(context)));

 }
 
 CYStatement *CYVar::Replace(CYContext &context) {
 }
 
 CYStatement *CYVar::Replace(CYContext &context) {

diff --git a/sig/parse.cpp b/sig/parse.cpp
index da590a8431226dff0076b264503681ddbf879cb1..d95af2fa57e053ccaac778fd97c9c9a0ac78b803 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -149,14 +149,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':


@@ -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);