X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/03db6a67c728f631b6c6f6fd140eb86a8050cf12..51b2dc6b0c969f9297c8464cb91e93d65819e0ae:/Replace.cpp?ds=sidebyside
diff --git a/Replace.cpp b/Replace.cpp
index f914af9..ac673ad 100644
--- a/Replace.cpp
+++ b/Replace.cpp
@@ -1,50 +1,64 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013 Jay Freeman (saurik)
+ * Copyright (C) 2009-2015 Jay Freeman (saurik)
*/
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
/*
- * 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
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 General Public License
- * along with Cycript. If not, see .
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see .
**/
/* }}} */
-#include "Parser.hpp"
-#include "Replace.hpp"
-
#include
+#include "Replace.hpp"
+#include "Syntax.hpp"
+
CYFunctionExpression *CYNonLocalize(CYContext &context, CYFunctionExpression *function) {
function->nonlocal_ = context.nextlocal_;
return function;
}
+CYFunctionExpression *CYSuperize(CYContext &context, CYFunctionExpression *function) {
+ function->super_ = context.super_;
+ return function;
+}
+
+CYStatement *CYDefineProperty(CYExpression *object, CYExpression *name, bool configurable, bool enumerable, CYProperty *descriptor) {
+ return $E($C3($M($V("Object"), $S("defineProperty")), object, name, $ CYObject(CYList()
+ ->* (configurable ? $ CYPropertyValue($S("configurable"), $ CYTrue()) : NULL)
+ ->* (enumerable ? $ CYPropertyValue($S("enumerable"), $ CYTrue()) : NULL)
+ ->* descriptor)));
+}
+
+static void CYImplicitReturn(CYStatement *&code) {
+ if (CYStatement *&last = CYGetLast(code))
+ last = last->Return();
+}
+
CYExpression *CYAdd::Replace(CYContext &context) {
CYInfix::Replace(context);
- CYExpression *lhp(lhs_->Primitive(context));
- CYExpression *rhp(rhs_->Primitive(context));
-
- CYString *lhs(dynamic_cast(lhp));
- CYString *rhs(dynamic_cast(rhp));
+ CYString *lhs(dynamic_cast(lhs_));
+ CYString *rhs(dynamic_cast(rhs_));
if (lhs != NULL || rhs != NULL) {
if (lhs == NULL) {
- lhs = lhp->String(context);
+ lhs = lhs_->String(context);
if (lhs == NULL)
return this;
} else if (rhs == NULL) {
- rhs = rhp->String(context);
+ rhs = rhs_->String(context);
if (rhs == NULL)
return this;
}
@@ -52,8 +66,8 @@ CYExpression *CYAdd::Replace(CYContext &context) {
return lhs->Concat(context, rhs);
}
- if (CYNumber *lhn = lhp->Number(context))
- if (CYNumber *rhn = rhp->Number(context))
+ if (CYNumber *lhn = lhs_->Number(context))
+ if (CYNumber *rhn = rhs_->Number(context))
return $D(lhn->Value() + rhn->Value());
return this;
@@ -78,14 +92,15 @@ CYArgument *CYArgument::Replace(CYContext &context) { $T(NULL)
}
CYExpression *CYArray::Replace(CYContext &context) {
- elements_->Replace(context);
+ if (elements_ != NULL)
+ elements_->Replace(context);
return this;
}
CYExpression *CYArrayComprehension::Replace(CYContext &context) {
CYVariable *cyv($V("$cyv"));
- return $C0($F(NULL, $P1($L("$cyv"), comprehensions_->Parameters(context)), $$->*
+ return $C0($F(NULL, $P1($L($I("$cyv")), comprehensions_->Parameters(context)), $$->*
$E($ CYAssign(cyv, $ CYArray()))->*
comprehensions_->Replace(context, $E($C1($M(cyv, $S("push")), expression_)))->*
$ CYReturn(cyv)
@@ -98,9 +113,14 @@ CYExpression *CYAssignment::Replace(CYContext &context) {
return this;
}
+CYStatement *CYBlock::Return() {
+ CYImplicitReturn(code_);
+ return this;
+}
+
CYStatement *CYBlock::Replace(CYContext &context) {
- context.ReplaceAll(statements_);
- if (statements_ == NULL)
+ context.ReplaceAll(code_);
+ if (code_ == NULL)
return $ CYEmpty();
return this;
}
@@ -127,41 +147,87 @@ namespace cy {
namespace Syntax {
void Catch::Replace(CYContext &context) { $T()
- CYScope scope(true, context, code_.statements_);
+ CYScope scope(true, context);
context.Replace(name_);
context.scope_->Declare(context, name_, CYIdentifierCatch);
- code_.Replace(context);
- scope.Close();
+ context.ReplaceAll(code_);
+ scope.Close(context, code_);
}
} }
+CYExpression *CYClassExpression::Replace(CYContext &context) {
+ CYBuilder builder;
+
+ CYIdentifier *super(context.Unique());
+
+ CYIdentifier *old(context.super_);
+ context.super_ = super;
+
+ CYIdentifier *constructor(context.Unique());
+ CYForEach (member, tail_->static_)
+ member->Replace(context, builder, $V(constructor), true);
+
+ CYIdentifier *prototype(context.Unique());
+ CYForEach (member, tail_->instance_)
+ member->Replace(context, builder, $V(prototype), true);
+
+ if (tail_->constructor_ == NULL)
+ tail_->constructor_ = $ CYFunctionExpression(NULL, NULL, NULL);
+ tail_->constructor_ = CYSuperize(context, tail_->constructor_);
+
+ context.super_ = old;
+
+ return $C1($ CYFunctionExpression(NULL, $P($L(super)), $$
+ ->* $ CYVar($L1($L(constructor, tail_->constructor_)))
+ ->* $ CYVar($L1($L(prototype, $ CYFunctionExpression(NULL, NULL, NULL))))
+ ->* $E($ CYAssign($M($V(prototype), $S("prototype")), $M($V(super), $S("prototype"))))
+ ->* $E($ CYAssign($V(prototype), $N($V(prototype))))
+ ->* CYDefineProperty($V(prototype), $S("constructor"), false, false, $ CYPropertyValue($S("value"), $V(constructor)))
+ ->* $ CYVar(builder.declarations_)
+ ->* builder.statements_
+ ->* CYDefineProperty($V(constructor), $S("prototype"), false, false, $ CYPropertyValue($S("value"), $V(prototype)))
+ ->* $ CYReturn($V(constructor))
+ ), tail_->extends_ ?: $V($I("Object")));
+}
+
+CYStatement *CYClassStatement::Replace(CYContext &context) {
+ return $ CYVar($L1($L(name_, $ CYClassExpression(name_, tail_))));
+}
+
void CYClause::Replace(CYContext &context) { $T()
context.Replace(case_);
- context.ReplaceAll(statements_);
+ context.ReplaceAll(code_);
next_->Replace(context);
}
-CYStatement *CYComment::Replace(CYContext &context) {
+CYExpression *CYCompound::Replace(CYContext &context) {
+ context.Replace(expression_);
+ context.Replace(next_);
+
+ if (CYCompound *compound = dynamic_cast(expression_)) {
+ expression_ = compound->expression_;
+ compound->expression_ = compound->next_;
+ compound->next_ = next_;
+ next_ = compound;
+ }
+
return this;
}
-CYExpression *CYCompound::Replace(CYContext &context) {
- context.ReplaceAll(expressions_);
- if (expressions_ == NULL)
+CYFunctionParameter *CYCompound::Parameter() const {
+ CYFunctionParameter *next(next_->Parameter());
+ if (next == NULL)
return NULL;
- return this;
-}
-CYExpression *CYCompound::Primitive(CYContext &context) {
- CYExpression *expression(expressions_);
- if (expression == NULL)
+ CYFunctionParameter *parameter(expression_->Parameter());
+ if (parameter == NULL)
return NULL;
- while (expression->next_ != NULL)
- expression = expression->next_;
- return expression->Primitive(context);
+
+ parameter->SetNext(next);
+ return parameter;
}
CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
@@ -177,6 +243,10 @@ CYStatement *CYComprehension::Replace(CYContext &context, CYStatement *statement
return next_ == NULL ? statement : next_->Replace(context, statement);
}
+CYExpression *CYComputed::PropertyName(CYContext &context) {
+ return expression_;
+}
+
CYExpression *CYCondition::Replace(CYContext &context) {
context.Replace(test_);
context.Replace(true_);
@@ -192,7 +262,7 @@ void CYContext::NonLocal(CYStatement *&statements) {
CYIdentifier *unique(nextlocal_->identifier_->Replace(context));
CYStatement *declare(
- $ CYVar($L1($ CYDeclaration(unique, $ CYObject()))));
+ $ CYVar($L1($L(unique, $ CYObject()))));
cy::Syntax::Catch *rescue(
$ cy::Syntax::Catch(cye, $$->*
@@ -200,6 +270,7 @@ void CYContext::NonLocal(CYStatement *&statements) {
$ CYReturn($M($V(cye), $S("$cyv"))))->*
$ cy::Syntax::Throw($V(cye))));
+ // XXX: I don't understand any of this
context.Replace(declare);
rescue->Replace(context);
@@ -249,10 +320,6 @@ void CYDeclarations::Replace(CYContext &context) { $T()
next_->Replace(context);
}
-CYProperty *CYDeclarations::Property(CYContext &context) { $T(NULL)
- return $ CYProperty(declaration_->identifier_, declaration_->initialiser_, next_->Property(context));
-}
-
CYFunctionParameter *CYDeclarations::Parameter(CYContext &context) { $T(NULL)
return $ CYFunctionParameter($ CYDeclaration(declaration_->identifier_), next_->Parameter(context));
}
@@ -261,10 +328,13 @@ CYArgument *CYDeclarations::Argument(CYContext &context) { $T(NULL)
return $ CYArgument(declaration_->initialiser_, next_->Argument(context));
}
-CYCompound *CYDeclarations::Compound(CYContext &context) { $T(NULL)
- CYCompound *compound(next_->Compound(context) ?: $ CYCompound());
+CYExpression *CYDeclarations::Expression(CYContext &context) { $T(NULL)
+ CYExpression *compound(next_->Expression(context));
if (CYAssignment *assignment = declaration_->Assignment(context))
- compound->AddPrev(assignment);
+ if (compound == NULL)
+ compound = assignment;
+ else
+ compound = $ CYCompound(assignment, compound);
return compound;
}
@@ -276,13 +346,18 @@ CYExpression *CYDirectMember::Replace(CYContext &context) {
CYStatement *CYDoWhile::Replace(CYContext &context) {
context.Replace(test_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
-void CYElement::Replace(CYContext &context) { $T()
+void CYElementSpread::Replace(CYContext &context) {
context.Replace(value_);
- next_->Replace(context);
+}
+
+void CYElementValue::Replace(CYContext &context) {
+ context.Replace(value_);
+ if (next_ != NULL)
+ next_->Replace(context);
}
CYStatement *CYEmpty::Replace(CYContext &context) {
@@ -293,20 +368,12 @@ CYExpression *CYEncodedType::Replace(CYContext &context) {
return typed_->Replace(context);
}
-CYStatement *CYExpress::Replace(CYContext &context) {
- while (CYExpress *express = dynamic_cast(next_)) {
- CYCompound *compound(dynamic_cast(express->expression_));
- if (compound == NULL)
- compound = $ CYCompound(express->expression_);
- compound->AddPrev(expression_);
- expression_ = compound;
- SetNext(express->next_);
- }
+CYStatement *CYExpress::Return() {
+ return $ CYReturn(expression_);
+}
+CYStatement *CYExpress::Replace(CYContext &context) {
context.Replace(expression_);
- if (expression_ == NULL)
- return $ CYEmpty();
-
return this;
}
@@ -314,10 +381,6 @@ CYExpression *CYExpression::AddArgument(CYContext &context, CYExpression *value)
return $C1(this, value);
}
-CYExpression *CYExpression::ClassName(CYContext &context, bool object) {
- return this;
-}
-
CYStatement *CYExpression::ForEachIn(CYContext &context, CYExpression *value) {
return $E($ CYAssign(this, value));
}
@@ -326,6 +389,14 @@ CYAssignment *CYExpression::Assignment(CYContext &context) {
return NULL;
}
+CYFunctionParameter *CYExpression::Parameter() const {
+ return NULL;
+}
+
+CYStatement *CYExternal::Replace(CYContext &context) {
+ return $E($ CYAssign($V(typed_->identifier_), $C1(typed_->Replace(context), $C2($V("dlsym"), $V("RTLD_DEFAULT"), $S(typed_->identifier_->Word())))));
+}
+
CYNumber *CYFalse::Number(CYContext &context) {
return $D(0);
}
@@ -341,20 +412,20 @@ CYExpression *CYFatArrow::Replace(CYContext &context) {
}
void CYFinally::Replace(CYContext &context) { $T()
- code_.Replace(context);
+ context.ReplaceAll(code_);
}
CYStatement *CYFor::Replace(CYContext &context) {
context.Replace(initialiser_);
context.Replace(test_);
context.Replace(increment_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
-CYCompound *CYForDeclarations::Replace(CYContext &context) {
+CYExpression *CYForDeclarations::Replace(CYContext &context) {
declarations_->Replace(context);
- return declarations_->Compound(context);
+ return declarations_->Expression(context);
}
// XXX: this still feels highly suboptimal
@@ -367,16 +438,16 @@ CYStatement *CYForIn::Replace(CYContext &context) {
context.Replace(initialiser_);
context.Replace(set_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
CYFunctionParameter *CYForInComprehension::Parameter(CYContext &context) const {
- return $ CYFunctionParameter($ CYDeclaration(name_));
+ return $ CYFunctionParameter(declaration_);
}
CYStatement *CYForInComprehension::Replace(CYContext &context, CYStatement *statement) const {
- return $ CYForIn($V(name_), set_, CYComprehension::Replace(context, statement));
+ return $ CYForIn(declaration_->Variable(context), set_, CYComprehension::Replace(context, statement));
}
CYStatement *CYForOf::Replace(CYContext &context) {
@@ -386,43 +457,39 @@ CYStatement *CYForOf::Replace(CYContext &context) {
this
);
- CYIdentifier *cys($I("$cys")), *cyt($I("$cyt"));
+ CYIdentifier *cys(context.Unique()), *cyt(context.Unique());
- return $ CYLetStatement($L2($ CYDeclaration(cys, set_), $ CYDeclaration(cyt)), $$->*
- $ CYForIn($V(cyt), $V(cys), $ CYBlock($$->*
- initialiser_->ForEachIn(context, $M($V(cys), $V(cyt)))->*
- code_
- ))
- );
+ return $ CYBlock($$
+ ->* $ CYLet($L2($L(cys, set_), $L(cyt)))
+ ->* $ CYForIn($V(cyt), $V(cys), $ CYBlock($$
+ ->* initialiser_->ForEachIn(context, $M($V(cys), $V(cyt)))
+ ->* code_
+ )));
}
CYFunctionParameter *CYForOfComprehension::Parameter(CYContext &context) const {
- return $ CYFunctionParameter($ CYDeclaration(name_));
+ return $ CYFunctionParameter(declaration_);
}
CYStatement *CYForOfComprehension::Replace(CYContext &context, CYStatement *statement) const {
- CYIdentifier *cys($I("cys"));
+ CYIdentifier *cys($I("$cys"));
- return $E($C0($F(NULL, $P1($L("$cys")), $$->*
+ return $E($C0($F(NULL, $P1($L($I("$cys"))), $$->*
$E($ CYAssign($V(cys), set_))->*
- $ CYForIn($V(name_), $V(cys), $ CYBlock($$->*
- $E($ CYAssign($V(name_), $M($V(cys), $V(name_))))->*
+ $ CYForIn(declaration_->Variable(context), $V(cys), $ CYBlock($$->*
+ $E($ CYAssign(declaration_->Variable(context), $M($V(cys), declaration_->Variable(context))))->*
CYComprehension::Replace(context, statement)
))
)));
}
-void CYFunction::Inject(CYContext &context) {
- context.Replace(name_);
- context.scope_->Declare(context, name_, CYIdentifierOther);
-}
-
-void CYFunction::Replace_(CYContext &context, bool outer) {
- if (outer)
- Inject(context);
-
+void CYFunction::Replace(CYContext &context) {
CYThisScope *_this(context.this_);
- context.this_ = CYGetLast(&this_);
+ context.this_ = &this_;
+ context.this_ = CYGetLast(context.this_);
+
+ CYIdentifier *super(context.super_);
+ context.super_ = super_;
CYNonLocal *nonlocal(context.nonlocal_);
CYNonLocal *nextlocal(context.nextlocal_);
@@ -437,50 +504,62 @@ void CYFunction::Replace_(CYContext &context, bool outer) {
context.nextlocal_ = nonlocal_;
}
- CYScope scope(!localize, context, code_.statements_);
-
- if (!outer && name_ != NULL)
- Inject(context);
+ CYScope scope(!localize, context);
parameters_->Replace(context, code_);
- code_.Replace(context);
- if (CYIdentifier *identifier = this_.identifier_)
- code_.statements_ = $$->*
- $ CYVar($L1($ CYDeclaration(identifier, $ CYThis())))->*
- code_.statements_;
+ context.ReplaceAll(code_);
+
+ if (implicit_)
+ CYImplicitReturn(code_);
+
+ if (CYIdentifier *identifier = this_.identifier_) {
+ context.scope_->Declare(context, identifier, CYIdentifierVariable);
+ code_ = $$
+ ->*$E($ CYAssign($V(identifier), $ CYThis()))
+ ->*code_
+ ;
+ }
if (localize)
- context.NonLocal(code_.statements_);
+ context.NonLocal(code_);
context.nextlocal_ = nextlocal;
context.nonlocal_ = nonlocal;
+ context.super_ = super;
context.this_ = _this;
- scope.Close();
+ scope.Close(context, code_);
}
CYExpression *CYFunctionExpression::Replace(CYContext &context) {
- Replace_(context, false);
+ CYScope scope(false, context);
+ if (name_ != NULL)
+ context.scope_->Declare(context, name_, CYIdentifierOther);
+ CYFunction::Replace(context);
+ scope.Close(context, code_);
return this;
}
-void CYFunctionParameter::Replace(CYContext &context, CYBlock &code) { $T()
+void CYFunctionParameter::Replace(CYContext &context, CYStatement *&statements) { $T()
CYAssignment *assignment(initialiser_->Assignment(context));
context.Replace(initialiser_);
- next_->Replace(context, code);
+ next_->Replace(context, statements);
if (assignment != NULL)
- // XXX: this cast is quite incorrect
- code.AddPrev($ CYIf($ CYIdentical($ CYTypeOf(dynamic_cast(initialiser_)), $S("undefined")), $$->*
- $E(assignment)
- ));
+ statements = $$->*
+ // XXX: this cast is quite incorrect
+ $ CYIf($ CYIdentical($ CYTypeOf(dynamic_cast(initialiser_)), $S("undefined")), $$->*
+ $E(assignment)
+ )->*
+ statements;
}
CYStatement *CYFunctionStatement::Replace(CYContext &context) {
- Replace_(context, true);
+ context.scope_->Declare(context, name_, CYIdentifierOther);
+ CYFunction::Replace(context);
return this;
}
@@ -491,10 +570,16 @@ CYIdentifier *CYIdentifier::Replace(CYContext &context) {
return replace_;
}
+CYStatement *CYIf::Return() {
+ CYImplicitReturn(true_);
+ CYImplicitReturn(false_);
+ return this;
+}
+
CYStatement *CYIf::Replace(CYContext &context) {
context.Replace(test_);
- context.Replace(true_);
- context.Replace(false_);
+ context.ReplaceAll(true_);
+ context.ReplaceAll(false_);
return this;
}
@@ -506,6 +591,10 @@ CYStatement *CYIfComprehension::Replace(CYContext &context, CYStatement *stateme
return $ CYIf(test_, CYComprehension::Replace(context, statement));
}
+CYStatement *CYImport::Replace(CYContext &context) {
+ return $ CYVar($L1($L($I(module_->part_->Word()), $C1($V("require"), module_->Replace(context, "/")))));
+}
+
CYExpression *CYIndirect::Replace(CYContext &context) {
return $M(rhs_, $S("$cyi"));
}
@@ -526,21 +615,35 @@ CYStatement *CYLabel::Replace(CYContext &context) {
}
CYExpression *CYLambda::Replace(CYContext &context) {
- return $N2($V("Functor"), $ CYFunctionExpression(NULL, parameters_->Parameters(context), statements_), parameters_->TypeSignature(context, typed_->Replace(context)));
+ return $N2($V("Functor"), $ CYFunctionExpression(NULL, parameters_->Parameters(context), code_), parameters_->TypeSignature(context, typed_->Replace(context)));
+}
+
+CYStatement *CYLet::Replace(CYContext &context) {
+ declarations_->Replace(context);
+ if (CYExpression *expression = declarations_->Expression(context))
+ return $E(expression);
+ return $ CYEmpty();
+}
+
+CYFunctionExpression *CYMethod::Constructor() {
+ return NULL;
+}
+
+void CYMethod::Replace(CYContext &context) {
+ CYFunction::Replace(context);
}
-CYStatement *CYLetStatement::Replace(CYContext &context) {
- return $E($ CYCall(CYNonLocalize(context, $ CYFunctionExpression(NULL, declarations_->Parameter(context), code_)), declarations_->Argument(context)));
+CYString *CYModule::Replace(CYContext &context, const char *separator) const {
+ if (next_ == NULL)
+ return $ CYString(part_);
+ return $ CYString($pool.strcat(next_->Replace(context, separator)->Value(), separator, part_->Word(), NULL));
}
CYExpression *CYMultiply::Replace(CYContext &context) {
CYInfix::Replace(context);
- CYExpression *lhp(lhs_->Primitive(context));
- CYExpression *rhp(rhs_->Primitive(context));
-
- if (CYNumber *lhn = lhp->Number(context))
- if (CYNumber *rhn = rhp->Number(context))
+ if (CYNumber *lhn = lhs_->Number(context))
+ if (CYNumber *rhn = rhs_->Number(context))
return $D(lhn->Value() * rhn->Value());
return this;
@@ -579,11 +682,31 @@ CYString *CYNumber::String(CYContext &context) {
return $S($pool.sprintf(24, "%.17g", Value()));
}
+CYExpression *CYNumber::PropertyName(CYContext &context) {
+ return String(context);
+}
+
CYExpression *CYObject::Replace(CYContext &context) {
- properties_->Replace(context);
+ CYBuilder builder;
+ if (properties_ != NULL)
+ properties_ = properties_->ReplaceAll(context, builder, $ CYThis(), false);
+
+ if (builder) {
+ return $C1($M($ CYFunctionExpression(NULL, builder.declarations_->Parameter(context),
+ builder.statements_->*
+ $ CYReturn($ CYThis())
+ ), $S("call")), this, builder.declarations_->Argument(context));
+ }
+
+ CYForEach (property, properties_)
+ property->Replace(context);
return this;
}
+CYExpression *CYParenthetical::Replace(CYContext &context) {
+ return expression_;
+}
+
CYExpression *CYPostfix::Replace(CYContext &context) {
context.Replace(lhs_);
return this;
@@ -594,6 +717,68 @@ CYExpression *CYPrefix::Replace(CYContext &context) {
return this;
}
+CYProperty *CYProperty::ReplaceAll(CYContext &context, CYBuilder &builder, CYExpression *self, bool update) {
+ update |= name_->Computed();
+ if (update)
+ Replace(context, builder, self, false);
+ if (next_ != NULL)
+ next_ = next_->ReplaceAll(context, builder, self, update);
+ return update ? next_ : this;
+}
+
+void CYProperty::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, bool protect) {
+ CYExpression *name(name_->PropertyName(context));
+ if (name_->Computed()) {
+ CYIdentifier *unique(context.Unique());
+ builder.declarations_->*$L1($L(unique, name));
+ name = $V(unique);
+ }
+
+ Replace(context, builder, self, name, protect);
+}
+
+void CYPropertyGetter::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
+ CYIdentifier *unique(context.Unique());
+ builder.declarations_
+ ->* $L1($L(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
+ builder.statements_
+ ->* CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("get"), $V(unique)));
+}
+
+CYFunctionExpression *CYPropertyMethod::Constructor() {
+ return name_->Constructor() ? $ CYFunctionExpression(NULL, parameters_, code_) : NULL;
+}
+
+void CYPropertyMethod::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
+ CYIdentifier *unique(context.Unique());
+ builder.declarations_
+ ->* $L1($L(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
+ builder.statements_
+ ->* (!protect ? $E($ CYAssign($M(self, name), $V(unique))) :
+ CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("value"), $V(unique), $ CYPropertyValue($S("writable"), $ CYTrue()))));
+}
+
+void CYPropertySetter::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
+ CYIdentifier *unique(context.Unique());
+ builder.declarations_
+ ->* $L1($L(unique, CYSuperize(context, $ CYFunctionExpression(NULL, parameters_, code_))));
+ builder.statements_
+ ->* CYDefineProperty(self, name, true, !protect, $ CYPropertyValue($S("set"), $V(unique)));
+}
+
+void CYPropertyValue::Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) {
+ _assert(!protect);
+ CYIdentifier *unique(context.Unique());
+ builder.declarations_
+ ->* $L1($L(unique, value_));
+ builder.statements_
+ ->* $E($ CYAssign($M(self, name), $V(unique)));
+}
+
+void CYPropertyValue::Replace(CYContext &context) {
+ context.Replace(value_);
+}
+
// XXX: this is evil evil black magic. don't ask, don't tell... don't believe!
#define MappingSet "0etnirsoalfucdphmgyvbxTwSNECAFjDLkMOIBPqzRH$_WXUVGYKQJZ"
//#define MappingSet "0abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_"
@@ -612,14 +797,14 @@ namespace {
typedef std::set IdentifierUsages;
}
-void CYProgram::Replace(CYContext &context) {
- CYScope scope(true, context, statements_);
+void CYScript::Replace(CYContext &context) {
+ CYScope scope(true, context);
context.nextlocal_ = $ CYNonLocal();
- context.ReplaceAll(statements_);
- context.NonLocal(statements_);
+ context.ReplaceAll(code_);
+ context.NonLocal(code_);
- scope.Close();
+ scope.Close(context, code_);
size_t offset(0);
@@ -668,18 +853,11 @@ void CYProgram::Replace(CYContext &context) {
}
}
-void CYProperty::Replace(CYContext &context) { $T()
- context.Replace(value_);
- next_->Replace(context);
- if (value_ == NULL)
- value_ = $U;
-}
-
CYStatement *CYReturn::Replace(CYContext &context) {
if (context.nonlocal_ != NULL) {
- CYProperty *value(value_ == NULL ? NULL : $ CYProperty($S("$cyv"), value_));
+ CYProperty *value(value_ == NULL ? NULL : $ CYPropertyValue($S("$cyv"), value_));
return $ cy::Syntax::Throw($ CYObject(
- $ CYProperty($S("$cyk"), $V(context.nonlocal_->Target(context)), value)
+ $ CYPropertyValue($S("$cyk"), $V(context.nonlocal_->Target(context)), value)
));
}
@@ -688,29 +866,25 @@ CYStatement *CYReturn::Replace(CYContext &context) {
}
CYExpression *CYRubyBlock::Replace(CYContext &context) {
- // XXX: this needs to do something much more epic to handle return
return call_->AddArgument(context, proc_->Replace(context));
}
+CYExpression *CYRubyBlock::AddArgument(CYContext &context, CYExpression *value) {
+ return Replace(context)->AddArgument(context, value);
+}
+
CYExpression *CYRubyProc::Replace(CYContext &context) {
- return CYNonLocalize(context, $ CYFunctionExpression(NULL, parameters_, code_));
+ CYFunctionExpression *function($ CYFunctionExpression(NULL, parameters_, code_));
+ function = CYNonLocalize(context, function);
+ function->implicit_ = true;
+ return function;
}
-CYScope::CYScope(bool transparent, CYContext &context, CYStatement *&statements) :
+CYScope::CYScope(bool transparent, CYContext &context) :
transparent_(transparent),
- context_(context),
- statements_(statements),
parent_(context.scope_)
{
- context_.scope_ = this;
-}
-
-CYScope::~CYScope() {
-}
-
-void CYScope::Close() {
- context_.scope_ = parent_;
- Scope(context_, statements_);
+ context.scope_ = this;
}
void CYScope::Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags) {
@@ -768,7 +942,9 @@ namespace {
typedef std::set IdentifierOffsets;
}
-void CYScope::Scope(CYContext &context, CYStatement *&statements) {
+void CYScope::Close(CYContext &context, CYStatement *&statements) {
+ context.scope_ = parent_;
+
if (parent_ == NULL)
return;
@@ -818,6 +994,14 @@ void CYScope::Scope(CYContext &context, CYStatement *&statements) {
}
}
+CYElementValue *CYSpan::Replace(CYContext &context) { $T(NULL)
+ return $ CYElementValue(expression_, $ CYElementValue(string_, next_->Replace(context)));
+}
+
+CYStatement *CYStatement::Return() {
+ return this;
+}
+
CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
size_t size(size_ + rhs->size_);
char *value($ char[size + 1]);
@@ -832,16 +1016,32 @@ CYNumber *CYString::Number(CYContext &context) {
return NULL;
}
+CYExpression *CYString::PropertyName(CYContext &context) {
+ return this;
+}
+
CYString *CYString::String(CYContext &context) {
return this;
}
+CYExpression *CYSuperAccess::Replace(CYContext &context) {
+ return $C1($M($M($M($V(context.super_), $S("prototype")), property_), $S("bind")), $ CYThis());
+}
+
+CYExpression *CYSuperCall::Replace(CYContext &context) {
+ return $C($C1($M($V(context.super_), $S("bind")), $ CYThis()), arguments_);
+}
+
CYStatement *CYSwitch::Replace(CYContext &context) {
context.Replace(value_);
clauses_->Replace(context);
return this;
}
+CYExpression *CYTemplate::Replace(CYContext &context) {
+ return $C2($M($M($M($V("String"), $S("prototype")), $S("concat")), $S("apply")), $S(""), $ CYArray($ CYElementValue(string_, spans_->Replace(context))));
+}
+
CYExpression *CYThis::Replace(CYContext &context) {
if (context.this_ != NULL)
return $V(context.this_->Identifier(context));
@@ -874,7 +1074,7 @@ namespace cy {
namespace Syntax {
CYStatement *Try::Replace(CYContext &context) {
- code_.Replace(context);
+ context.ReplaceAll(code_);
catch_->Replace(context);
finally_->Replace(context);
return this;
@@ -947,6 +1147,19 @@ CYExpression *CYTypedIdentifier::Replace(CYContext &context) {
return modifier_->Replace(context, specifier_->Replace(context));
}
+CYTypeFunctionWith *CYTypedIdentifier::Function() {
+ CYTypeModifier **modifier(&modifier_);
+ if (*modifier == NULL)
+ return NULL;
+ while ((*modifier)->next_ != NULL)
+ modifier = &(*modifier)->next_;
+ CYTypeFunctionWith *function((*modifier)->Function());
+ if (function == NULL)
+ return NULL;
+ *modifier = NULL;
+ return function;
+}
+
CYArgument *CYTypedParameter::Argument(CYContext &context) { $T(NULL)
return $ CYArgument(typed_->Replace(context), next_->Argument(context));
}
@@ -961,7 +1174,9 @@ CYExpression *CYTypedParameter::TypeSignature(CYContext &context, CYExpression *
CYStatement *CYVar::Replace(CYContext &context) {
declarations_->Replace(context);
- return $E(declarations_->Compound(context));
+ if (CYExpression *expression = declarations_->Expression(context))
+ return $E(expression);
+ return $ CYEmpty();
}
CYExpression *CYVariable::Replace(CYContext &context) {
@@ -969,22 +1184,22 @@ CYExpression *CYVariable::Replace(CYContext &context) {
return this;
}
+CYFunctionParameter *CYVariable::Parameter() const {
+ return $ CYFunctionParameter($ CYDeclaration(name_));
+}
+
CYStatement *CYWhile::Replace(CYContext &context) {
context.Replace(test_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
CYStatement *CYWith::Replace(CYContext &context) {
context.Replace(scope_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
-CYExpression *CYWord::ClassName(CYContext &context, bool object) {
- CYString *name($S(this));
- if (object)
- return $C1($V("objc_getClass"), name);
- else
- return name;
+CYExpression *CYWord::PropertyName(CYContext &context) {
+ return $S(this);
}