Avoid error caused by passing -pthread to libtool.

[cycript.git] / sig / parse.cpp

diff --git a/sig/parse.cpp b/sig/parse.cpp
index cf628a8e2ccfc69d5a513da6cc8d1730e49a23a1..f1e63ff7e75f1671835789e9f1aeb7e9c9827a58 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -1,30 +1,50 @@
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include "minimal/stdlib.h"
-
-#include <apr-1/apr_strings.h>
-
-#include <string.h>
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2014  Jay Freeman (saurik)
+*/
+
+/* GNU Affero General Public License, Version 3 {{{ */
+/*
+ * 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/>.
+**/
+/* }}} */

 
 #include "sig/parse.hpp"
 
 #include "sig/parse.hpp"

+#include "Error.hpp"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
+#include <sstream>

 
 namespace sig {
 
 
 namespace sig {
 

-void (*sig_aggregate)(apr_pool_t *pool, enum Primitive primitive, const char *name, struct Signature *signature, const char *types) = NULL;
+void Parse_(CYPool &pool, struct Signature *signature, const char **name, char eos, Callback callback);
+struct Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback);
+

 
 /* XXX: I really screwed up this time */
 
 /* XXX: I really screwed up this time */

-void *prealloc_(apr_pool_t *pool, void *odata, size_t osize, size_t nsize) {
-    void *ndata = apr_palloc(pool, nsize);
+void *prealloc_(CYPool &pool, void *odata, size_t osize, size_t nsize) {
+    void *ndata(pool.malloc<void>(nsize));

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

-void sig_parse_signature(apr_pool_t *pool, struct Signature *signature, const char **name, char eos) {
+void Parse_(CYPool &pool, struct Signature *signature, const char **name, char eos, Callback callback) {

     _assert(*name != NULL);
 
     _assert(*name != NULL);
 

-    bool named = **name == '"';
+    // XXX: this is just a stupid check :(
+    bool named(**name == '"');

 
     signature->elements = NULL;
     signature->count = 0;
 
     signature->elements = NULL;
     signature->count = 0;


@@ -43,12 +63,12 @@ void sig_parse_signature(apr_pool_t *pool, struct Signature *signature, const ch
         if (**name != '"')
             element->name = NULL;
         else {
         if (**name != '"')
             element->name = NULL;
         else {

-            char *quote = strchr(++*name, '"');
-            element->name = apr_pstrmemdup(pool, *name, quote - *name);
+            const char *quote = strchr(++*name, '"');
+            element->name = pool.strmemdup(*name, quote - *name);

             *name = quote + 1;
         }
 
             *name = quote + 1;
         }
 

-        element->type = sig_parse_type(pool, name, eos, named);
+        element->type = Parse_(pool, name, eos, named, callback);

 
         if (**name < '0' || **name > '9')
             element->offset = _not(size_t);
 
         if (**name < '0' || **name > '9')
             element->offset = _not(size_t);


@@ -62,38 +82,51 @@ void sig_parse_signature(apr_pool_t *pool, struct Signature *signature, const ch
     }
 }
 
     }
 }
 

-struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool named) {
+Type *Parse_(CYPool &pool, const char **name, char eos, bool named, Callback callback) {

     char next = *(*name)++;
     char next = *(*name)++;

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

 
 

-    struct Type *type = (struct Type *) apr_palloc(pool, sizeof(struct Type));
+    Type *type(new(pool) Type());

     _assert(type != NULL);
     _assert(type != NULL);

-    memset(type, 0, sizeof(struct Type));
+    memset(type, 0, sizeof(Type));

 
   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 '(':

-            type->primitive = union_P;
+            if (type->data.signature.count < 2)
+                type->primitive = struct_P;
+            else
+                type->primitive = union_P;

             next = ')';
         goto aggregate;
 
         case '*': type->primitive = string_P; break;
         case ':': type->primitive = selector_P; break;
 
             next = ')';
         goto aggregate;
 
         case '*': type->primitive = string_P; break;
         case ':': type->primitive = selector_P; break;
 

-        case '@':
-            if (**name == '"') {
-                char *quote = strchr(*name + 1, '"');
-                if (!named || quote[1] == eos || quote[1] == '"') {
-                    type->name = apr_pstrmemdup(pool, *name + 1, quote - *name - 1);
-                    *name = quote + 1;
+        case '@': {
+            char next(**name);
+
+            if (next == '?') {
+                type->primitive = block_P;
+                ++*name;
+            } else {
+                type->primitive = object_P;
+
+                if (next == '"') {
+                    const char *quote = strchr(*name + 1, '"');
+                    if (quote == NULL) {
+                        printf("unterminated specific id type {%s}\n", *name - 10);
+                        _assert(false);
+                    } else if (!named || quote[1] == eos || quote[1] == '"') {
+                        type->name = pool.strmemdup(*name + 1, quote - *name - 1);
+                        *name = quote + 1;
+                    }

                 }
             }
 
                 }
             }
 

-            type->primitive = object_P;
-        break;
+        } break;

 
         case 'B': type->primitive = boolean_P; break;
         case 'C': type->primitive = uchar_P; break;
 
         case 'B': type->primitive = boolean_P; break;
         case 'C': type->primitive = uchar_P; break;


@@ -105,7 +138,7 @@ struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool
         case '[':
             type->primitive = array_P;
             type->data.data.size = strtoul(*name, (char **) name, 10);
         case '[':
             type->primitive = array_P;
             type->data.data.size = strtoul(*name, (char **) name, 10);

-            type->data.data.type = sig_parse_type(pool, name, eos, false);
+            type->data.data.type = Parse_(pool, name, eos, false, callback);

             if (**name != ']') {
                 printf("']' != \"%s\"\n", *name);
                 _assert(false);
             if (**name != ']') {
                 printf("']' != \"%s\"\n", *name);
                 _assert(false);


@@ -115,14 +148,11 @@ struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool
 
         case '^':
             type->primitive = pointer_P;
 
         case '^':
             type->primitive = pointer_P;

-            if (**name == 'v') {
-                type->data.data.type = NULL;
-                ++*name;
-            } else if (**name == '"') {
+            if (**name == '"')
+                // XXX: why is this here?

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

-            } else {
-                type->data.data.type = sig_parse_type(pool, name, eos, named);
-            }
+            else
+                type->data.data.type = Parse_(pool, name, eos, named, callback);

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


@@ -139,6 +169,12 @@ struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool
         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 = '}';


@@ -154,28 +190,14 @@ struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool
             );
             size_t length = *name - begin - 1;
             if (strncmp(begin, "?", length) != 0)
             );
             size_t length = *name - begin - 1;
             if (strncmp(begin, "?", length) != 0)

-                type->name = (char *) apr_pstrmemdup(pool, begin, length);
+                type->name = (char *) pool.strmemdup(begin, length);

             else
                 type->name = NULL;
 
             else
                 type->name = NULL;
 

-            char *types;
-            if (next != '=')
-                types = NULL;
-            else {
-                const char *temp = *name;
-                sig_parse_signature(pool, &type->data.signature, name, end);
-                types = (char *) apr_pstrmemdup(pool, temp, *name - temp - 1);
-            }
+            // XXX: this types thing is a throwback to JocStrap

 
 

-            if (type->name != NULL && sig_aggregate != NULL) {
-                char *angle = strchr(type->name, '<');
-                if (angle == NULL)
-                    (*sig_aggregate)(pool, type->primitive, type->name, &type->data.signature, types);
-                else {
-                    angle = (char *) apr_pstrmemdup(pool, type->name, angle - type->name);
-                    (*sig_aggregate)(pool, type->primitive, angle, &type->data.signature, types);
-                }
-            }
+            if (next == '=')
+                Parse_(pool, &type->data.signature, name, end, callback);

         } break;
 
         case 'N': type->flags |= JOC_TYPE_INOUT; goto next;
         } break;
 
         case 'N': type->flags |= JOC_TYPE_INOUT; goto next;


@@ -196,36 +218,52 @@ struct Type *sig_parse_type(apr_pool_t *pool, const char **name, char eos, bool
             _assert(false);
     }
 
             _assert(false);
     }
 

+    if (callback != NULL)
+        (*callback)(pool, type);
+

     return type;
 }
 
     return type;
 }
 

-void Parse(apr_pool_t *pool, struct Signature *signature, const char *name) {
+void Parse(CYPool &pool, struct Signature *signature, const char *name, Callback callback) {

     const char *temp = name;
     const char *temp = name;

-    sig_parse_signature(pool, signature, &temp, '\0');
+    Parse_(pool, signature, &temp, '\0', callback);

     _assert(temp[-1] == '\0');
 }
 
     _assert(temp[-1] == '\0');
 }
 

-const char *sig_unparse_signature(apr_pool_t *pool, struct Signature *signature) {
+const char *Unparse(CYPool &pool, struct Signature *signature) {

     const char *value = "";
     size_t offset;
 
     for (offset = 0; offset != signature->count; ++offset) {
     const char *value = "";
     size_t offset;
 
     for (offset = 0; offset != signature->count; ++offset) {

-        const char *type = sig_unparse_type(pool, signature->elements[offset].type);
-        value = apr_pstrcat(pool, value, type, NULL);
+        const char *type = Unparse(pool, signature->elements[offset].type);
+        value = pool.strcat(value, type, NULL);

     }
 
     return value;
 }
 
     }
 
     return value;
 }
 

-const char *sig_unparse_type(apr_pool_t *pool, struct Type *type) {
-    if (type == NULL)
-        return "?";
-    else 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 apr_psprintf(pool, "(%s)", sig_unparse_signature(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 string_P: return "*";
         case selector_P: return ":";

-        case object_P: return type->name == NULL ? "@" : apr_psprintf(pool, "@\"%s\"", type->name);
+        case block_P: return "@?";
+        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";


@@ -234,12 +272,20 @@ const char *sig_unparse_type(apr_pool_t *pool, struct Type *type) {
         case ushort_P: return "S";
 
         case array_P: {
         case ushort_P: return "S";
 
         case array_P: {

-            const char *value = sig_unparse_type(pool, type->data.data.type);
-            return apr_psprintf(pool, "[%lu%s]", type->data.data.size, value);
+            const char *value = Unparse(pool, type->data.data.type);
+            return pool.strcat("[", pool.itoa(type->data.data.size), value, "]", NULL);

         } break;
 
         } break;
 

-        case pointer_P: return apr_psprintf(pool, "^%s", type->data.data.type == NULL ? "" : sig_unparse_type(pool, type->data.data.type));
-        case bit_P: return apr_psprintf(pool, "b%zu", type->data.data.size);
+        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;
+
+        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";


@@ -248,11 +294,45 @@ const char *sig_unparse_type(apr_pool_t *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 apr_psprintf(pool, "{%s=%s}", type->name == NULL ? "?" : type->name, sig_unparse_signature(pool, &type->data.signature));
+        case struct_P: return pool.strcat("{", type->name == NULL ? "?" : type->name, "=", Unparse(pool, &type->data.signature), "}", NULL);

     }
 
     _assert(false);
     return NULL;
 }
 
     }
 
     _assert(false);
     return NULL;
 }
 

+const char *Unparse(CYPool &pool, struct Type *type) {
+    if (type == NULL)
+        return "?";
+
+    const char *base(Unparse_(pool, type));
+    if (type->flags == 0)
+        return base;
+
+    #define iovec_(base, size) \
+        (struct iovec) {const_cast<char *>(base), size}
+
+    size_t size(strlen(base));
+    char buffer[7 + size];
+    size_t offset(0);
+
+    if ((type->flags & JOC_TYPE_INOUT) != 0)
+        buffer[offset++] = 'N';
+    if ((type->flags & JOC_TYPE_IN) != 0)
+        buffer[offset++] = 'n';
+    if ((type->flags & JOC_TYPE_BYCOPY) != 0)
+        buffer[offset++] = 'O';
+    if ((type->flags & JOC_TYPE_OUT) != 0)
+        buffer[offset++] = 'o';
+    if ((type->flags & JOC_TYPE_BYREF) != 0)
+        buffer[offset++] = 'R';
+    if ((type->flags & JOC_TYPE_CONST) != 0)
+        buffer[offset++] = 'r';
+    if ((type->flags & JOC_TYPE_ONEWAY) != 0)
+        buffer[offset++] = 'V';
+
+    memcpy(buffer + offset, base, size);
+    return pool.strmemdup(buffer, offset + size);
+}
+

 }
 }