/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010 Jay Freeman (saurik)
+ * Copyright (C) 2009-2013 Jay Freeman (saurik)
*/
-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */
/*
- * 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.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.
*
- * 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.
+ * 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 General Public License for more details.
*
- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License
* along with Cycript. If not, see <http://www.gnu.org/licenses/>.
**/
/* }}} */
#include <iomanip>
+CYFunctionExpression *CYNonLocalize(CYContext &context, CYFunctionExpression *function) {
+ function->nonlocal_ = context.nextlocal_;
+ return function;
+}
+
CYExpression *CYAdd::Replace(CYContext &context) {
CYInfix::Replace(context);
}
CYExpression *CYAddressOf::Replace(CYContext &context) {
- CYPrefix::Replace(context);
return $C0($M(rhs_, $S("$cya")));
}
-void CYArgument::Replace(CYContext &context) { $T()
+CYArgument *CYArgument::Replace(CYContext &context) { $T(NULL)
context.Replace(value_);
- next_->Replace(context);
+ next_ = next_->Replace(context);
+
+ if (value_ == NULL) {
+ if (next_ == NULL)
+ return NULL;
+ else
+ value_ = $U;
+ }
+
+ return this;
}
CYExpression *CYArray::Replace(CYContext &context) {
CYExpression *CYArrayComprehension::Replace(CYContext &context) {
CYVariable *cyv($V("$cyv"));
- return $C0($F(NULL, $P1("$cyv", comprehensions_->Parameters(context)), $$->*
+ return $C0($F(NULL, $P1($L("$cyv"), comprehensions_->Parameters(context)), $$->*
$E($ CYAssign(cyv, $ CYArray()))->*
comprehensions_->Replace(context, $E($C1($M(cyv, $S("push")), expression_)))->*
$ CYReturn(cyv)
namespace Syntax {
void Catch::Replace(CYContext &context) { $T()
- CYScope scope(CYScopeCatch, context, code_.statements_);
+ CYScope scope(true, context, code_.statements_);
context.Replace(name_);
context.scope_->Declare(context, name_, CYIdentifierCatch);
return this;
}
+CYExpression *CYCompound::Primitive(CYContext &context) {
+ CYExpression *expression(expressions_);
+ if (expression == NULL)
+ return NULL;
+ while (expression->next_ != NULL)
+ expression = expression->next_;
+ return expression->Primitive(context);
+}
+
CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
CYFunctionParameter *next(next_->Parameters(context));
if (CYFunctionParameter *parameter = Parameter(context)) {
CYIdentifier *unique(nextlocal_->identifier_->Replace(context));
CYStatement *declare(
- $ CYVar($L1($L(unique, $ CYObject()))));
+ $ CYVar($L1($ CYDeclaration(unique, $ CYObject()))));
cy::Syntax::Catch *rescue(
$ cy::Syntax::Catch(cye, $$->*
}
CYIdentifier *CYContext::Unique() {
- return $ CYIdentifier(apr_psprintf($pool, "$cy%u", unique_++));
+ return $ CYIdentifier($pool.strcat("$cy", $pool.itoa(unique_++), NULL));
}
CYStatement *CYContinue::Replace(CYContext &context) {
return this;
}
+CYStatement *CYDebugger::Replace(CYContext &context) {
+ return this;
+}
+
CYAssignment *CYDeclaration::Assignment(CYContext &context) {
- context.Replace(identifier_);
- CYExpression *variable(Replace(context));
- context.scope_->Declare(context, identifier_, CYIdentifierVariable);
- return initialiser_ == NULL ? NULL : $ CYAssign(variable, initialiser_);
+ if (initialiser_ == NULL)
+ return NULL;
+
+ CYAssignment *value($ CYAssign(Variable(context), initialiser_));
+ initialiser_ = NULL;
+ return value;
+}
+
+CYVariable *CYDeclaration::Variable(CYContext &context) {
+ return $V(identifier_);
}
CYStatement *CYDeclaration::ForEachIn(CYContext &context, CYExpression *value) {
- return $ CYVar($L1($L(identifier_, value)));
+ return $ CYVar($L1($ CYDeclaration(identifier_, value)));
}
CYExpression *CYDeclaration::Replace(CYContext &context) {
- return $V(identifier_);
+ context.Replace(identifier_);
+ context.scope_->Declare(context, identifier_, CYIdentifierVariable);
+ return Variable(context);
+}
+
+void CYDeclarations::Replace(CYContext &context) { $T()
+ declaration_->Replace(context);
+ next_->Replace(context);
}
CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
- return $ CYProperty(declaration_->identifier_, declaration_->initialiser_ ?: $U, next_->Property(context));
+ return $ CYProperty(declaration_->identifier_, declaration_->initialiser_, next_->Property(context));
+}
+
+CYFunctionParameter *CYDeclarations::Parameter(CYContext &context) { $T(NULL)
+ return $ CYFunctionParameter($ CYDeclaration(declaration_->identifier_), next_->Parameter(context));
+}
+
+CYArgument *CYDeclarations::Argument(CYContext &context) { $T(NULL)
+ return $ CYArgument(declaration_->initialiser_, next_->Argument(context));
}
-CYCompound *CYDeclarations::Replace(CYContext &context) {
- CYCompound *compound(next_ == NULL ? $ CYCompound() : next_->Replace(context));
+CYCompound *CYDeclarations::Compound(CYContext &context) { $T(NULL)
+ CYCompound *compound(next_->Compound(context) ?: $ CYCompound());
if (CYAssignment *assignment = declaration_->Assignment(context))
compound->AddPrev(assignment);
return compound;
}
CYExpression *CYDirectMember::Replace(CYContext &context) {
- Replace_(context);
+ context.Replace(object_);
+ context.Replace(property_);
return this;
}
return $S("false");
}
+CYExpression *CYFatArrow::Replace(CYContext &context) {
+ CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
+ function->this_.SetNext(context.this_);
+ return function;
+}
+
void CYFinally::Replace(CYContext &context) { $T()
code_.Replace(context);
}
return this;
}
+CYCompound *CYForDeclarations::Replace(CYContext &context) {
+ declarations_->Replace(context);
+ return declarations_->Compound(context);
+}
+
+// XXX: this still feels highly suboptimal
CYStatement *CYForIn::Replace(CYContext &context) {
- CYAssignment *assignment(initialiser_->Assignment(context));
+ if (CYAssignment *assignment = initialiser_->Assignment(context))
+ return $ CYBlock($$->*
+ $E(assignment)->*
+ this
+ );
context.Replace(initialiser_);
context.Replace(set_);
context.Replace(code_);
-
- if (assignment == NULL)
- return this;
-
- return $ CYBlock($$->*
- $E(assignment)->*
- this
- );
+ return this;
}
CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
- return $ CYFunctionParameter(name_);
+ return $ CYFunctionParameter($ CYDeclaration(name_));
}
CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *statement) const {
return $ CYForIn($V(name_), set_, CYComprehension::Replace(context, statement));
}
-CYStatement *CYForEachIn::Replace(CYContext &context) {
+CYStatement *CYForOf::Replace(CYContext &context) {
+ if (CYAssignment *assignment = initialiser_->Assignment(context))
+ return $ CYBlock($$->*
+ $E(assignment)->*
+ this
+ );
+
CYIdentifier *cys($I("$cys")), *cyt($I("$cyt"));
- return $ CYLet($L2($L(cys, set_), $L(cyt)), $$->*
+ return $ CYLetStatement($L2($ CYDeclaration(cys, set_), $ CYDeclaration(cyt)), $$->*
$ CYForIn($V(cyt), $V(cys), $ CYBlock($$->*
initialiser_->ForEachIn(context, $M($V(cys), $V(cyt)))->*
code_
);
}
-CYFunctionParameter *CYForEachInComprehension::Parameter(CYContext &context) const {
- return $ CYFunctionParameter(name_);
+CYFunctionParameter *CYForOfComprehension::Parameter(CYContext &context) const {
+ return $ CYFunctionParameter($ CYDeclaration(name_));
}
-CYStatement *CYForEachInComprehension::Replace(CYContext &context, CYStatement *statement) const {
+CYStatement *CYForOfComprehension::Replace(CYContext &context, CYStatement *statement) const {
CYIdentifier *cys($I("cys"));
- return $E($C0($F(NULL, $P1("$cys"), $$->*
+ return $E($C0($F(NULL, $P1($L("$cys")), $$->*
$E($ CYAssign($V(cys), set_))->*
$ CYForIn($V(name_), $V(cys), $ CYBlock($$->*
$E($ CYAssign($V(name_), $M($V(cys), $V(name_))))->*
if (outer)
Inject(context);
- CYScope scope(CYScopeFunction, context, code_.statements_);
+ CYThisScope *_this(context.this_);
+ context.this_ = CYGetLast(&this_);
CYNonLocal *nonlocal(context.nonlocal_);
CYNonLocal *nextlocal(context.nextlocal_);
context.nextlocal_ = nonlocal_;
}
+ CYScope scope(!localize, context, code_.statements_);
+
if (!outer && name_ != NULL)
Inject(context);
- if (parameters_ != NULL)
- parameters_ = parameters_->Replace(context, code_);
-
+ parameters_->Replace(context, code_);
code_.Replace(context);
+ if (CYIdentifier *identifier = this_.identifier_)
+ code_.statements_ = $$->*
+ $ CYVar($L1($ CYDeclaration(identifier, $ CYThis())))->*
+ code_.statements_;
+
if (localize)
context.NonLocal(code_.statements_);
context.nextlocal_ = nextlocal;
context.nonlocal_ = nonlocal;
+ context.this_ = _this;
+
scope.Close();
}
return this;
}
-CYFunctionParameter *CYFunctionParameter::Replace(CYContext &context, CYBlock &code) {
- context.Replace(name_);
- context.scope_->Declare(context, name_, CYIdentifierArgument);
- if (next_ != NULL)
- next_ = next_->Replace(context, code);
- return this;
+void CYFunctionParameter::Replace(CYContext &context, CYBlock &code) { $T()
+ CYAssignment *assignment(initialiser_->Assignment(context));
+ context.Replace(initialiser_);
+
+ next_->Replace(context, code);
+
+ if (assignment != NULL)
+ // XXX: this cast is quite incorrect
+ code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(dynamic_cast<CYExpression *>(initialiser_)), $S("undefined")), $$->*
+ $E(assignment)
+ ));
}
CYStatement *CYFunctionStatement::Replace(CYContext &context) {
}
CYExpression *CYIndirect::Replace(CYContext &context) {
- CYPrefix::Replace(context);
return $M(rhs_, $S("$cyi"));
}
CYExpression *CYIndirectMember::Replace(CYContext &context) {
- Replace_(context);
return $M($ CYIndirect(object_), property_);
}
return this;
}
-CYStatement *CYLet::Replace(CYContext &context) {
- return $ CYWith($ CYObject(declarations_->Property(context)), &code_);
-}
-
-void CYMember::Replace_(CYContext &context) {
- context.Replace(object_);
- context.Replace(property_);
+CYStatement *CYLetStatement::Replace(CYContext &context) {
+ return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
}
namespace cy {
namespace Syntax {
CYExpression *New::AddArgument(CYContext &context, CYExpression *value) {
- CYSetLast(arguments_, $ CYArgument(value));
+ CYSetLast(arguments_) = $ CYArgument(value);
return this;
}
CYString *CYNumber::String(CYContext &context) {
// XXX: there is a precise algorithm for this
- return $S(apr_psprintf($pool, "%.17g", Value()));
+ return $S($pool.sprintf(24, "%.17g", Value()));
}
CYExpression *CYObject::Replace(CYContext &context) {
return this;
}
-CYFunctionParameter *CYOptionalFunctionParameter::Replace(CYContext &context, CYBlock &code) {
- CYFunctionParameter *parameter($ CYFunctionParameter(name_, next_));
- parameter = parameter->Replace(context, code);
- context.Replace(initializer_);
-
- CYVariable *name($V(name_));
- code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(name), $S("undefined")), $$->*
- $E($ CYAssign(name, initializer_))
- ));
-
- return parameter;
-}
-
CYExpression *CYPostfix::Replace(CYContext &context) {
context.Replace(lhs_);
return this;
}
void CYProgram::Replace(CYContext &context) {
- CYScope scope(CYScopeProgram, context, statements_);
+ CYScope scope(true, context, statements_);
context.nextlocal_ = $ CYNonLocal();
context.ReplaceAll(statements_);
const char *name;
if (context.options_.verbose_)
- name = apr_psprintf($pool, "$%"APR_SIZE_T_FMT"", offset);
+ name = $pool.strcat("$", $pool.itoa(offset), NULL);
else {
char id[8];
id[7] = '\0';
goto id;
}
- name = apr_pstrmemdup($pool, id + position, 7 - position);
+ name = $pool.strmemdup(id + position, 7 - position);
// XXX: at some point, this could become a keyword
}
void CYProperty::Replace(CYContext &context) { $T()
context.Replace(value_);
next_->Replace(context);
+ if (value_ == NULL)
+ value_ = $U;
}
CYStatement *CYReturn::Replace(CYContext &context) {
}
CYExpression *CYRubyProc::Replace(CYContext &context) {
- CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
- function->nonlocal_ = context.nextlocal_;
- return function;
+ return CYNonLocalize(context, $ CYFunctionExpression(NULL, parameters_, code_));
}
-CYScope::CYScope(CYScopeType type, CYContext &context, CYStatement *&statements) :
- type_(type),
+CYScope::CYScope(bool transparent, CYContext &context, CYStatement *&statements) :
+ transparent_(transparent),
context_(context),
statements_(statements),
parent_(context.scope_)
}
void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {
- if (type_ == CYScopeCatch && flags != CYIdentifierCatch)
- parent_->Declare(context, identifier, flags);
- else
+ if (!transparent_ || flags == CYIdentifierArgument || flags == CYIdentifierCatch)
internal_.insert(CYIdentifierAddressFlagsMap::value_type(identifier, flags));
+ else if (parent_ != NULL)
+ parent_->Declare(context, identifier, flags);
}
CYIdentifier *CYScope::Lookup(CYContext &context, CYIdentifier *identifier) {
}
CYExpression *CYThis::Replace(CYContext &context) {
+ if (context.this_ != NULL)
+ return $V(context.this_->Identifier(context));
return this;
}
} }
CYStatement *CYVar::Replace(CYContext &context) {
- return $E(declarations_->Replace(context));
+ declarations_->Replace(context);
+ return $E(declarations_->Compound(context));
}
CYExpression *CYVariable::Replace(CYContext &context) {
projects / cycript.git / blobdiff