X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/029bc65b46de676c6733fff684000c7363eda512..dd983804e1895bd4c24d81a89886881dd02c6afe:/Library.cpp diff --git a/Library.cpp b/Library.cpp index 610e11b..881506d 100644 --- a/Library.cpp +++ b/Library.cpp @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2010 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 . +**/ /* }}} */ #include @@ -43,7 +25,6 @@ #include "cycript.hpp" #include "Pooling.hpp" -#include "Context.hpp" #include @@ -60,6 +41,8 @@ #include "Error.hpp" #include "String.hpp" +#include "Execute.hpp" +#include "JavaScript.hpp" /* C Strings {{{ */ template @@ -240,11 +223,33 @@ double CYCastDouble(const char *value) { return CYCastDouble(value, strlen(value)); } -extern "C" void CydgetPoolParse(apr_pool_t *pool, const uint16_t **data, size_t *size) { - CYDriver driver(""); +size_t CYArrayLength(JSContextRef context, JSObjectRef array) { + return CYCastDouble(context, CYGetProperty(context, array, length_s)); +} + +JSValueRef CYArrayGet(JSContextRef context, JSObjectRef array, size_t index) { + JSValueRef exception(NULL); + JSValueRef value(JSObjectGetPropertyAtIndex(context, array, index, &exception)); + CYThrow(context, exception); + return value; +} + +void CYArrayPush(JSContextRef context, JSObjectRef array, JSValueRef value) { + JSValueRef exception(NULL); + JSValueRef arguments[1]; + arguments[0] = value; + JSObjectRef Array(CYGetCachedObject(context, CYJSString("Array_prototype"))); + JSObjectCallAsFunction(context, CYCastJSObject(context, CYGetProperty(context, Array, push_s)), array, 1, arguments, &exception); + CYThrow(context, exception); +} + +extern "C" void CydgetPoolParse(apr_pool_t *remote, const uint16_t **data, size_t *size) { + CYLocalPool local; + + CYDriver driver; cy::parser parser(driver); - CYUTF8String utf8(CYPoolUTF8String(pool, CYUTF16String(*data, *size))); + CYUTF8String utf8(CYPoolUTF8String(local, CYUTF16String(*data, *size))); driver.data_ = utf8.data; driver.size_ = utf8.size; @@ -253,14 +258,14 @@ extern "C" void CydgetPoolParse(apr_pool_t *pool, const uint16_t **data, size_t return; CYOptions options; - CYContext context(driver.pool_, options); + CYContext context(options); driver.program_->Replace(context); std::ostringstream str; CYOutput out(str, options); out << *driver.program_; std::string code(str.str()); - CYUTF16String utf16(CYPoolUTF16String(pool, CYUTF8String(code.c_str(), code.size()))); + CYUTF16String utf16(CYPoolUTF16String(remote, CYUTF8String(code.c_str(), code.size()))); *data = utf16.data; *size = utf16.size;