Add Bridge.hpp to clean, grr!

[cycript.git] / sig / parse.cpp

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 5dcfd4faa194097c03aeebf8c6507c58ab77a26f..7fc663fc0eb18df671b81d98daae1e5ced11cd45 100644 (file)
--- a/sig/parse.cpp
+++ b/sig/parse.cpp
@@ -1,4 +1,4 @@
-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Inlining/Optimizing JavaScript Compiler

  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -37,24 +37,18 @@
 */
 /* }}} */
 
 */
 /* }}} */
 

-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE
-#endif
-
-#include "minimal/stdlib.h"
-
-#include <apr-1/apr_strings.h>
-
-#include <string.h>
-
+#include <apr_strings.h>

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

+#include "Error.hpp"

 
 

-namespace sig {
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>

 
 

-void (*sig_aggregate)(apr_pool_t *pool, enum Primitive primitive, const char *name, struct Signature *signature, const char *types) = NULL;
+namespace sig {

 
 

-void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos);
-struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named);
+void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos, Callback callback);
+struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, Callback callback);

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


@@ -64,10 +58,11 @@ void *prealloc_(apr_pool_t *pool, void *odata, size_t osize, size_t nsize) {
     return ndata;
 }
 
     return ndata;
 }
 

-void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, char eos) {
+void Parse_(apr_pool_t *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;


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

-            char *quote = strchr(++*name, '"');
+            const char *quote = strchr(++*name, '"');

             element->name = apr_pstrmemdup(pool, *name, quote - *name);
             *name = quote + 1;
         }
 
             element->name = apr_pstrmemdup(pool, *name, quote - *name);
             *name = quote + 1;
         }
 

-        element->type = Parse_(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);


@@ -105,7 +100,7 @@ void Parse_(apr_pool_t *pool, struct Signature *signature, const char **name, ch
     }
 }
 
     }
 }
 

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

     char next = *(*name)++;
     if (next == '?')
         return NULL;
     char next = *(*name)++;
     if (next == '?')
         return NULL;


@@ -119,7 +114,10 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named) {
         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;
 
             next = ')';
         goto aggregate;
 


@@ -128,7 +126,7 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named) {
 
         case '@':
             if (**name == '"') {
 
         case '@':
             if (**name == '"') {

-                char *quote = strchr(*name + 1, '"');
+                const 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;
                 if (!named || quote[1] == eos || quote[1] == '"') {
                     type->name = apr_pstrmemdup(pool, *name + 1, quote - *name - 1);
                     *name = quote + 1;


@@ -148,7 +146,7 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named) {
         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 = Parse_(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);


@@ -158,13 +156,13 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named) {
 
         case '^':
             type->primitive = pointer_P;
 
         case '^':
             type->primitive = pointer_P;

-            if (**name == 'v') {
-                type->data.data.type = NULL;
-                ++*name;
-            } else if (**name == '"') {
+            if (**name == '"') {

                 type->data.data.type = NULL;
             } else {
                 type->data.data.type = NULL;
             } else {

-                type->data.data.type = Parse_(pool, name, eos, named);
+                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;
 
             }
         break;
 


@@ -201,24 +199,10 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named) {
             else
                 type->name = NULL;
 
             else
                 type->name = NULL;
 

-            char *types;
-            if (next != '=')
-                types = NULL;
-            else {
-                const char *temp = *name;
-                Parse_(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;


@@ -239,12 +223,15 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named) {
             _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(apr_pool_t *pool, struct Signature *signature, const char *name, Callback callback) {

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

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

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


@@ -278,11 +265,11 @@ const char *Unparse(apr_pool_t *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 apr_psprintf(pool, "[%lu%s]", type->data.data.size, value);
+            return apr_psprintf(pool, "[%"APR_SIZE_T_FMT"%s]", type->data.data.size, value);

         } break;
 
         } break;
 

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

         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";