Add support back for ARM inject.

[cycript.git] / sig / parse.cpp

diff --git a/sig/parse.cpp b/sig/parse.cpp
index 3452e5a3159bd2046cd332904e24b6d1fd967111..02e54291eb07ee4a198ca65f9c9c6445e1e4492b 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,17 +37,13 @@
 */
 /* }}} */
 
 */
 /* }}} */
 

-#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"
+
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>

 
 namespace sig {
 
 
 namespace sig {
 


@@ -85,7 +81,7 @@ 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;
         }


@@ -128,17 +124,25 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
         case '*': type->primitive = string_P; break;
         case ':': type->primitive = selector_P; break;
 
         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 (!named || quote[1] == eos || quote[1] == '"') {
+                        type->name = apr_pstrmemdup(pool, *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;


@@ -160,13 +164,13 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
 
         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 = Parse_(pool, name, eos, named, callback);
                 type->data.data.type = NULL;
             } else {
                 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;
 


@@ -205,17 +209,8 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
 
             // XXX: this types thing is a throwback to JocStrap
 
 
             // XXX: this types thing is a throwback to JocStrap
 

-            char *types;
-            if (next != '=') {
-                types = NULL;
-            } else {
-                const char *temp(*name);
+            if (next == '=')

                 Parse_(pool, &type->data.signature, name, end, callback);
                 Parse_(pool, &type->data.signature, name, end, callback);

-                types = (char *) apr_pstrmemdup(pool, temp, *name - temp - 1);
-            }
-
-            if (callback != NULL)
-                (*callback)(pool, type->name, types, type);

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


@@ -236,6 +231,9 @@ struct Type *Parse_(apr_pool_t *pool, const char **name, char eos, bool named, C
             _assert(false);
     }
 
             _assert(false);
     }
 

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

     return type;
 }
 
     return type;
 }
 


@@ -265,6 +263,7 @@ const char *Unparse(apr_pool_t *pool, struct Type *type) {
         case union_P: return apr_psprintf(pool, "(%s)", Unparse(pool, &type->data.signature));
         case string_P: return "*";
         case selector_P: return ":";
         case union_P: return apr_psprintf(pool, "(%s)", Unparse(pool, &type->data.signature));
         case string_P: return "*";
         case selector_P: return ":";

+        case block_P: return "@?";

         case object_P: return type->name == NULL ? "@" : apr_psprintf(pool, "@\"%s\"", type->name);
         case boolean_P: return "B";
         case uchar_P: return "C";
         case object_P: return type->name == NULL ? "@" : apr_psprintf(pool, "@\"%s\"", type->name);
         case boolean_P: return "B";
         case uchar_P: return "C";


@@ -275,11 +274,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";