Avoid error caused by passing -pthread to libtool.

[cycript.git] / sig / parse.cpp

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 8de5eb455ef1d150e6746a43cef158882b42850a..f1e63ff7e75f1671835789e9f1aeb7e9c9827a58 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -1,21 +1,21 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2013  Jay Freeman (saurik)
+ * Copyright (C) 2009-2014  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU 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 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
+ * 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
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+ * 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/>.

 **/
 /* }}} */
 
 **/
 /* }}} */
 


@@ -25,6 +25,7 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>

+#include <sstream>

 
 namespace sig {
 
 
 namespace sig {
 


@@ -34,7 +35,7 @@ struct Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callb
 
 /* XXX: I really screwed up this time */
 void *prealloc_(CYPool &pool, void *odata, size_t osize, size_t nsize) {
 
 /* XXX: I really screwed up this time */
 void *prealloc_(CYPool &pool, void *odata, size_t osize, size_t nsize) {

-    void *ndata(pool(nsize));
+    void *ndata(pool.malloc<void>(nsize));

     memcpy(ndata, odata, osize);
     return ndata;
 }
     memcpy(ndata, odata, osize);
     return ndata;
 }


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


@@ -92,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 '(':


@@ -148,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':


@@ -172,6 +169,12 @@ Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback cal
         case 's': type->primitive = short_P; break;
         case 'v': type->primitive = void_P; break;
 
         case 's': type->primitive = short_P; break;
         case 'v': type->primitive = void_P; break;
 

+#ifdef __LP64__
+        case 'F': type->primitive = double_P; break;
+#else
+        case 'F': type->primitive = float_P; break;
+#endif
+

         case '{':
             type->primitive = struct_P;
             next = '}';
         case '{':
             type->primitive = struct_P;
             next = '}';


@@ -233,7 +236,7 @@ const char *Unparse(CYPool &pool, struct Signature *signature) {
 
     for (offset = 0; offset != signature->count; ++offset) {
         const char *type = Unparse(pool, signature->elements[offset].type);
 
     for (offset = 0; offset != signature->count; ++offset) {
         const char *type = Unparse(pool, signature->elements[offset].type);

-        value = apr_pstrcat(pool, value, type, NULL);
+        value = pool.strcat(value, type, NULL);

     }
 
     return value;
     }
 
     return value;


@@ -241,12 +244,26 @@ const char *Unparse(CYPool &pool, struct Signature *signature) {
 
 const char *Unparse_(CYPool &pool, struct Type *type) {
     switch (type->primitive) {
 
 const char *Unparse_(CYPool &pool, struct Type *type) {
     switch (type->primitive) {

+        case function_P: {
+            if (type->data.signature.count == 0)
+                return "?";
+            std::ostringstream out;
+            for (size_t i(0); i != type->data.signature.count; ++i) {
+                Element &element(type->data.signature.elements[i]);
+                out << Unparse(pool, element.type);
+                if (element.offset != _not(size_t))
+                    out << pool.itoa(element.offset);
+            }
+            return pool.strdup(out.str().c_str());
+        } break;
+
+        case unknown_P: return "?";

         case typename_P: return "#";
         case typename_P: return "#";

-        case union_P: return pool.sprintf("(%s)", Unparse(pool, &type->data.signature));
+        case union_P: return pool.strcat("(", Unparse(pool, &type->data.signature), ")", NULL);

         case string_P: return "*";
         case selector_P: return ":";
         case block_P: return "@?";
         case string_P: return "*";
         case selector_P: return ":";
         case block_P: return "@?";

-        case object_P: return type->name == NULL ? "@" : pool.sprintf("@\"%s\"", type->name);
+        case object_P: return type->name == NULL ? "@" : pool.strcat("@\"", type->name, "\"", NULL);

         case boolean_P: return "B";
         case uchar_P: return "C";
         case uint_P: return "I";
         case boolean_P: return "B";
         case uchar_P: return "C";
         case uint_P: return "I";


@@ -256,11 +273,19 @@ const char *Unparse_(CYPool &pool, struct Type *type) {
 
         case array_P: {
             const char *value = Unparse(pool, type->data.data.type);
 
         case array_P: {
             const char *value = Unparse(pool, type->data.data.type);

-            return pool.sprintf("[%"APR_SIZE_T_FMT"%s]", type->data.data.size, value);
+            return pool.strcat("[", pool.itoa(type->data.data.size), value, "]", NULL);
+        } break;
+
+        case pointer_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);

         } break;
 
         } break;
 

-        case pointer_P: return pool.sprintf("^%s", type->data.data.type == NULL ? "v" : Unparse(pool, type->data.data.type));
-        case bit_P: return pool.sprintf("b%"APR_SIZE_T_FMT"", type->data.data.size);
+        case bit_P: return pool.strcat("b", pool.itoa(type->data.data.size), NULL);

         case char_P: return "c";
         case double_P: return "d";
         case float_P: return "f";
         case char_P: return "c";
         case double_P: return "d";
         case float_P: return "f";


@@ -269,7 +294,7 @@ const char *Unparse_(CYPool &pool, struct Type *type) {
         case longlong_P: return "q";
         case short_P: return "s";
         case void_P: return "v";
         case longlong_P: return "q";
         case short_P: return "s";
         case void_P: return "v";

-        case struct_P: return pool.sprintf("{%s=%s}", type->name == NULL ? "?" : type->name, Unparse(pool, &type->data.signature));
+        case struct_P: return pool.strcat("{", type->name == NULL ? "?" : type->name, "=", Unparse(pool, &type->data.signature), "}", NULL);

     }
 
     _assert(false);
     }
 
     _assert(false);


@@ -287,26 +312,27 @@ const char *Unparse(CYPool &pool, struct Type *type) {
     #define iovec_(base, size) \
         (struct iovec) {const_cast<char *>(base), size}
 
     #define iovec_(base, size) \
         (struct iovec) {const_cast<char *>(base), size}
 

-    struct iovec parts[8];
-    memset(parts, 0, sizeof(parts));
+    size_t size(strlen(base));
+    char buffer[7 + size];
+    size_t offset(0);

 
     if ((type->flags & JOC_TYPE_INOUT) != 0)
 
     if ((type->flags & JOC_TYPE_INOUT) != 0)

-        parts[0] = iovec_("N", 1);
+        buffer[offset++] = 'N';

     if ((type->flags & JOC_TYPE_IN) != 0)
     if ((type->flags & JOC_TYPE_IN) != 0)

-        parts[1] = iovec_("n", 1);
+        buffer[offset++] = 'n';

     if ((type->flags & JOC_TYPE_BYCOPY) != 0)
     if ((type->flags & JOC_TYPE_BYCOPY) != 0)

-        parts[2] = iovec_("O", 1);
+        buffer[offset++] = 'O';

     if ((type->flags & JOC_TYPE_OUT) != 0)
     if ((type->flags & JOC_TYPE_OUT) != 0)

-        parts[3] = iovec_("o", 1);
+        buffer[offset++] = 'o';

     if ((type->flags & JOC_TYPE_BYREF) != 0)
     if ((type->flags & JOC_TYPE_BYREF) != 0)

-        parts[4] = iovec_("R", 1);
+        buffer[offset++] = 'R';

     if ((type->flags & JOC_TYPE_CONST) != 0)
     if ((type->flags & JOC_TYPE_CONST) != 0)

-        parts[5] = iovec_("r", 1);
+        buffer[offset++] = 'r';

     if ((type->flags & JOC_TYPE_ONEWAY) != 0)
     if ((type->flags & JOC_TYPE_ONEWAY) != 0)

-        parts[6] = iovec_("V", 1);
+        buffer[offset++] = 'V';

 
 

-    parts[7] = iovec_(base, strlen(base));
-    return apr_pstrcatv(pool, parts, 8, NULL);
+    memcpy(buffer + offset, base, size);
+    return pool.strmemdup(buffer, offset + size);

 }
 
 }
 }
 
 }