/* 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 <http://www.gnu.org/licenses/>.
+ * 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 <http://www.gnu.org/licenses/>.
**/
/* }}} */
return function;
}
+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<CYString *>(lhp));
- CYString *rhs(dynamic_cast<CYString *>(rhp));
+ CYString *lhs(dynamic_cast<CYString *>(lhs_));
+ CYString *rhs(dynamic_cast<CYString *>(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;
}
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;
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;
}
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_);
}
} }
void CYClause::Replace(CYContext &context) { $T()
context.Replace(case_);
- context.ReplaceAll(statements_);
+ context.ReplaceAll(code_);
next_->Replace(context);
}
}
CYExpression *CYCompound::Replace(CYContext &context) {
- context.ReplaceAll(expressions_);
- if (expressions_ == NULL)
- return NULL;
+ context.Replace(expression_);
+ context.Replace(next_);
+
+ if (CYCompound *compound = dynamic_cast<CYCompound *>(expression_)) {
+ expression_ = compound->expression_;
+ compound->expression_ = compound->next_;
+ compound->next_ = next_;
+ next_ = compound;
+ }
+
return this;
}
-CYExpression *CYCompound::Primitive(CYContext &context) {
- CYExpression *expression(expressions_);
- if (expression == NULL)
+CYFunctionParameter *CYCompound::Parameter() const {
+ CYFunctionParameter *next(next_->Parameter());
+ if (next == NULL)
return NULL;
- while (expression->next_ != NULL)
- expression = expression->next_;
- return expression->Primitive(context);
+
+ CYFunctionParameter *parameter(expression_->Parameter());
+ if (parameter == NULL)
+ return NULL;
+
+ parameter->SetNext(next);
+ return parameter;
}
CYFunctionParameter *CYComprehension::Parameters(CYContext &context) const { $T(NULL)
$ 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);
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;
}
CYStatement *CYDoWhile::Replace(CYContext &context) {
context.Replace(test_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
return typed_->Replace(context);
}
-CYStatement *CYExpress::Replace(CYContext &context) {
- while (CYExpress *express = dynamic_cast<CYExpress *>(next_)) {
- CYCompound *compound(dynamic_cast<CYCompound *>(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;
}
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);
}
}
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
context.Replace(initialiser_);
context.Replace(set_);
- context.Replace(code_);
+ context.ReplaceAll(code_);
return this;
}
}
CYStatement *CYForOfComprehension::Replace(CYContext &context, CYStatement *statement) const {
- CYIdentifier *cys($I("cys"));
+ CYIdentifier *cys($I("$cys"));
return $E($C0($F(NULL, $P1($L("$cys")), $$->*
$E($ CYAssign($V(cys), set_))->*
Inject(context);
CYThisScope *_this(context.this_);
- context.this_ = CYGetLast(&this_);
+ context.this_ = &this_;
+ context.this_ = CYGetLast(context.this_);
CYNonLocal *nonlocal(context.nonlocal_);
CYNonLocal *nextlocal(context.nextlocal_);
context.nextlocal_ = nonlocal_;
}
- CYScope scope(!localize, context, code_.statements_);
+ CYScope scope(!localize, context);
if (!outer && name_ != NULL)
Inject(context);
parameters_->Replace(context, code_);
- code_.Replace(context);
+ context.ReplaceAll(code_);
+
+ if (implicit_)
+ CYImplicitReturn(code_);
if (CYIdentifier *identifier = this_.identifier_)
- code_.statements_ = $$->*
+ code_ = $$->*
$ CYVar($L1($ CYDeclaration(identifier, $ CYThis())))->*
- code_.statements_;
+ code_;
if (localize)
- context.NonLocal(code_.statements_);
+ context.NonLocal(code_);
context.nextlocal_ = nextlocal;
context.nonlocal_ = nonlocal;
context.this_ = _this;
- scope.Close();
+ scope.Close(context, code_);
}
CYExpression *CYFunctionExpression::Replace(CYContext &context) {
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<CYExpression *>(initialiser_)), $S("undefined")), $$->*
- $E(assignment)
- ));
+ statements = $$->*
+ // XXX: this cast is quite incorrect
+ $ CYIf($ CYIdentical($ CYTypeOf(dynamic_cast<CYExpression *>(initialiser_)), $S("undefined")), $$->*
+ $E(assignment)
+ )->*
+ statements;
}
CYStatement *CYFunctionStatement::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;
}
return $ CYIf(test_, CYComprehension::Replace(context, statement));
}
+CYStatement *CYImport::Replace(CYContext &context) {
+ return $ CYVar($L1($L(module_->part_->Word(), $C1($V("require"), module_->Replace(context, "/")))));
+}
+
CYExpression *CYIndirect::Replace(CYContext &context) {
return $M(rhs_, $S("$cyi"));
}
}
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 *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;
return this;
}
+CYExpression *CYParenthetical::Replace(CYContext &context) {
+ return expression_;
+}
+
CYExpression *CYPostfix::Replace(CYContext &context) {
context.Replace(lhs_);
return this;
}
void CYProgram::Replace(CYContext &context) {
- CYScope scope(true, context, statements_);
+ 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);
}
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 *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) {
typedef std::set<IdentifierOffset, IdentifierOffsetLess> IdentifierOffsets;
}
-void CYScope::Scope(CYContext &context, CYStatement *&statements) {
+void CYScope::Close(CYContext &context, CYStatement *&statements) {
+ context.scope_ = parent_;
+
if (parent_ == NULL)
return;
}
}
+CYStatement *CYStatement::Return() {
+ return this;
+}
+
CYString *CYString::Concat(CYContext &context, CYString *rhs) const {
size_t size(size_ + rhs->size_);
char *value($ char[size + 1]);
namespace Syntax {
CYStatement *Try::Replace(CYContext &context) {
- code_.Replace(context);
+ context.ReplaceAll(code_);
catch_->Replace(context);
finally_->Replace(context);
return this;
return $E($ CYAssign($V(typed_->identifier_), typed_->Replace(context)));
}
+CYExpression *CYTypeError::Replace(CYContext &context) {
+ _assert(false);
+ return NULL;
+}
+
CYExpression *CYTypeModifier::Replace(CYContext &context, CYExpression *type) { $T(type)
return Replace_(context, type);
}
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));
}
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) {
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;
}
projects / cycript.git / blobdiff