-/* Cycript - Remove Execution Server and Disassembler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
- * 1. Redistributions of source code must retain the
- * above copyright notice, this list of conditions
- * and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions
- * and the following disclaimer in the documentation
- * and/or other materials provided with the
- * distribution.
- * 3. The name of the author may not be used to endorse
- * or promote products derived from this software
- * without specific prior written permission.
+ * Cycript 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 Lesser General Public
+ * License for more details.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript. If not, see <http://www.gnu.org/licenses/>.
+**/
/* }}} */
-#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 "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 */
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);
- bool named = **name == '"';
+ // XXX: this is just a stupid check :(
+ bool named(**name == '"');
signature->elements = NULL;
signature->count = 0;
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->type = Parse_(pool, name, eos, named);
+ element->type = Parse_(pool, name, eos, named, callback);
if (**name < '0' || **name > '9')
element->offset = _not(size_t);
}
}
-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;
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;
- 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 '[':
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);
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);
+ 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;
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;
_assert(false);
}
+ if (callback != NULL)
+ (*callback)(pool, 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;
- Parse_(pool, signature, &temp, '\0');
+ Parse_(pool, signature, &temp, '\0', callback);
_assert(temp[-1] == '\0');
}
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 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;
- 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";
projects / cycript.git / blobdiff