X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c2c9f509581b8c8e78b5745498c782ef1affd51a..a2ab0fd327b427d1f537cb7bc79de985fae3a0f5:/Output.cpp?ds=inline
diff --git a/Output.cpp b/Output.cpp
index ee58d06..12c72df 100644
--- a/Output.cpp
+++ b/Output.cpp
@@ -1,21 +1,21 @@
/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010 Jay Freeman (saurik)
+ * Copyright (C) 2009-2015 Jay Freeman (saurik)
*/
-/* GNU Lesser 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 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 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.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with Cycript. If not, see .
+ * 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 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 .
**/
/* }}} */
@@ -24,34 +24,6 @@
#include
-_finline CYFlags operator ~(CYFlags rhs) {
- return static_cast(~static_cast(rhs));
-}
-
-_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
- return static_cast(static_cast(lhs) & static_cast(rhs));
-}
-
-_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
- return static_cast(static_cast(lhs) | static_cast(rhs));
-}
-
-_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
- return lhs = lhs | rhs;
-}
-
-_finline CYFlags CYLeft(CYFlags flags) {
- return flags & ~(CYNoDangle | CYNoInteger);
-}
-
-_finline CYFlags CYRight(CYFlags flags) {
- return flags & ~CYNoBF;
-}
-
-_finline CYFlags CYCenter(CYFlags flags) {
- return CYLeft(CYRight(flags));
-}
-
void CYOutput::Terminate() {
out_ << ';';
mode_ = NoMode;
@@ -146,8 +118,7 @@ void CYArgument::Output(CYOutput &out) const {
if (value_ != NULL)
value_->Output(out, CYAssign::Precedence_, CYNoFlags);
if (next_ != NULL) {
- if (next_->name_ == NULL)
- out << ',';
+ out << ',';
out << ' ' << *next_;
}
}
@@ -222,19 +193,13 @@ void CYComment::Output(CYOutput &out, CYFlags flags) const {
}
void CYCompound::Output(CYOutput &out, CYFlags flags) const {
- if (CYExpression *expression = expressions_)
- if (CYExpression *next = expression->next_) {
- expression->Output(out, CYLeft(flags));
- CYFlags center(CYCenter(flags));
- while (next != NULL) {
- expression = next;
- out << ',' << ' ';
- next = expression->next_;
- CYFlags right(next != NULL ? center : CYRight(flags));
- expression->Output(out, right);
- }
- } else
- expression->Output(out, flags);
+ if (next_ == NULL)
+ expression_->Output(out, flags);
+ else {
+ expression_->Output(out, CYLeft(flags));
+ out << ',' << ' ';
+ next_->Output(out, CYRight(flags));
+ }
}
void CYCondition::Output(CYOutput &out, CYFlags flags) const {
@@ -264,8 +229,8 @@ void CYClause::Output(CYOutput &out) const {
out << next_;
}
-const char *CYDeclaration::ForEachIn() const {
- return identifier_->Word();
+void CYDebugger::Output(CYOutput &out, CYFlags flags) const {
+ out << "debugger" << ';';
}
void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
@@ -282,9 +247,9 @@ void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
}
}
-void CYDeclarations::For(CYOutput &out) const {
+void CYForDeclarations::Output(CYOutput &out, CYFlags flags) const {
out << "var";
- Output(out, CYNoIn);
+ declarations_->Output(out, CYRight(flags));
}
void CYDeclarations::Output(CYOutput &out) const {
@@ -294,16 +259,19 @@ void CYDeclarations::Output(CYOutput &out) const {
void CYDeclarations::Output(CYOutput &out, CYFlags flags) const {
const CYDeclarations *declaration(this);
bool first(true);
- output:
- CYDeclarations *next(declaration->next_);
- CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
- first = false;
- declaration->declaration_->Output(out, jacks);
- if (next != NULL) {
+ for (;;) {
+ CYDeclarations *next(declaration->next_);
+
+ CYFlags jacks(first ? CYLeft(flags) : next == NULL ? CYRight(flags) : CYCenter(flags));
+ first = false;
+ declaration->declaration_->Output(out, jacks);
+
+ if (next == NULL)
+ break;
+
out << ',' << ' ';
declaration = next;
- goto output;
}
}
@@ -346,14 +314,6 @@ void CYExpression::ClassName(CYOutput &out, bool object) const {
Output(out, CYAssign::Precedence_, CYNoFlags);
}
-const char *CYExpression::ForEachIn() const {
- return NULL;
-}
-
-void CYExpression::For(CYOutput &out) const {
- Output(out, CYNoIn);
-}
-
void CYExpression::ForIn(CYOutput &out, CYFlags flags) const {
Output(out, flags | CYNoRightHand);
}
@@ -362,13 +322,21 @@ void CYExpression::Output(CYOutput &out) const {
Output(out, CYNoFlags);
}
-void CYExpression::Output(CYOutput &out, unsigned precedence, CYFlags flags) const {
+void CYExpression::Output(CYOutput &out, int precedence, CYFlags flags) const {
if (precedence < Precedence() || (flags & CYNoRightHand) != 0 && RightHand())
out << '(' << *this << ')';
else
Output(out, flags);
}
+void CYExternal::Output(CYOutput &out, CYFlags flags) const {
+ out << "extern" << abi_ << typed_ << ';';
+}
+
+void CYFatArrow::Output(CYOutput &out, CYFlags flags) const {
+ out << '(' << parameters_ << ')' << ' ' << "=>" << ' ' << code_;
+}
+
void CYFinally::Output(CYOutput &out) const {
out << ' ' << "finally" << ' ' << code_;
}
@@ -376,23 +344,27 @@ void CYFinally::Output(CYOutput &out) const {
void CYFor::Output(CYOutput &out, CYFlags flags) const {
out << "for" << ' ' << '(';
if (initialiser_ != NULL)
- initialiser_->For(out);
+ initialiser_->Output(out, CYNoIn);
out.Terminate();
+ if (test_ != NULL)
+ out << ' ';
out << test_;
out.Terminate();
+ if (increment_ != NULL)
+ out << ' ';
out << increment_;
out << ')';
code_->Single(out, CYRight(flags));
}
-void CYForEachIn::Output(CYOutput &out, CYFlags flags) const {
+void CYForOf::Output(CYOutput &out, CYFlags flags) const {
out << "for" << ' ' << "each" << ' ' << '(';
initialiser_->ForIn(out, CYNoIn);
out << "in" << *set_ << ')';
code_->Single(out, CYRight(flags));
}
-void CYForEachInComprehension::Output(CYOutput &out) const {
+void CYForOfComprehension::Output(CYOutput &out) const {
out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_;
}
@@ -431,7 +403,7 @@ void CYFunctionStatement::Output(CYOutput &out, CYFlags flags) const {
}
void CYFunctionParameter::Output(CYOutput &out) const {
- out << *name_;
+ initialiser_->Output(out, CYNoFlags);
if (next_ != NULL)
out << ',' << ' ' << *next_;
}
@@ -460,7 +432,7 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const {
true_->Single(out, jacks);
if (false_ != NULL) {
- out << "else";
+ out << '\t' << "else";
false_->Single(out, right);
}
@@ -472,6 +444,10 @@ void CYIfComprehension::Output(CYOutput &out) const {
out << "if" << ' ' << '(' << *test_ << ')' << next_;
}
+void CYImport::Output(CYOutput &out, CYFlags flags) const {
+ out << "@import";
+}
+
void CYIndirectMember::Output(CYOutput &out, CYFlags flags) const {
object_->Output(out, Precedence(), CYLeft(flags));
if (const char *word = property_->Word())
@@ -499,8 +475,90 @@ void CYLabel::Output(CYOutput &out, CYFlags flags) const {
statement_->Single(out, CYRight(flags));
}
-void CYLet::Output(CYOutput &out, CYFlags flags) const {
- out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_;
+void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const {
+ next_->Output(out, Precedence(), identifier);
+ out << '[';
+ out << size_;
+ out << ']';
+}
+
+void CYTypeBlockWith::Output(CYOutput &out, CYIdentifier *identifier) const {
+ out << '(' << '^';
+ next_->Output(out, Precedence(), identifier);
+ out << ')' << '(' << parameters_ << ')';
+}
+
+void CYTypeConstant::Output(CYOutput &out, CYIdentifier *identifier) const {
+ out << "const";
+ next_->Output(out, Precedence(), identifier);
+}
+
+void CYTypeFunctionWith::Output(CYOutput &out, CYIdentifier *identifier) const {
+ next_->Output(out, Precedence(), identifier);
+ out << '(' << parameters_ << ')';
+}
+
+void CYTypePointerTo::Output(CYOutput &out, CYIdentifier *identifier) const {
+ out << '*';
+ next_->Output(out, Precedence(), identifier);
+}
+
+void CYTypeVolatile::Output(CYOutput &out, CYIdentifier *identifier) const {
+ out << "volatile";
+ next_->Output(out, Precedence(), identifier);
+}
+
+void CYTypeModifier::Output(CYOutput &out, int precedence, CYIdentifier *identifier) const {
+ if (this == NULL) {
+ out << identifier;
+ return;
+ }
+
+ bool protect(precedence > Precedence());
+
+ if (protect)
+ out << '(';
+ Output(out, identifier);
+ if (protect)
+ out << ')';
+}
+
+void CYTypedIdentifier::Output(CYOutput &out) const {
+ specifier_->Output(out);
+ modifier_->Output(out, 0, identifier_);
+}
+
+void CYEncodedType::Output(CYOutput &out, CYFlags flags) const {
+ out << "@encode(" << typed_ << ")";
+}
+
+void CYTypedParameter::Output(CYOutput &out) const {
+ out << typed_;
+ if (next_ != NULL)
+ out << ',' << ' ' << next_;
+}
+
+void CYLambda::Output(CYOutput &out, CYFlags flags) const {
+ // XXX: this is seriously wrong
+ out << "[](";
+ out << ")->";
+ out << "{";
+ out << "}";
+}
+
+void CYTypeDefinition::Output(CYOutput &out, CYFlags flags) const {
+ out << "typedef" << *typed_;
+}
+
+void CYLetStatement::Output(CYOutput &out, CYFlags flags) const {
+ out << "let" << ' ' << '(' << *declarations_ << ')';
+ code_->Single(out, CYRight(flags));
+}
+
+void CYModule::Output(CYOutput &out) const {
+ out << part_;
+ if (next_ != NULL)
+ out << '.' << next_;
}
namespace cy {
@@ -547,13 +605,6 @@ void CYObject::Output(CYOutput &out, CYFlags flags) const {
out << ')';
}
-void CYOptionalFunctionParameter::Output(CYOutput &out) const {
- out << *name_ << '=';
- initializer_->Output(out, CYAssign::Precedence_, CYNoFlags);
- if (next_ != NULL)
- out << ',' << ' ' << *next_;
-}
-
void CYPostfix::Output(CYOutput &out, CYFlags flags) const {
lhs_->Output(out, Precedence(), CYLeft(flags));
out << Operator();
@@ -618,6 +669,9 @@ void CYStatement::Multiple(CYOutput &out, CYFlags flags) const {
}
void CYStatement::Single(CYOutput &out, CYFlags flags) const {
+ if (this == NULL)
+ return out.Terminate();
+
_assert(next_ == NULL);
out << '\n';
++out.indent_;
@@ -701,6 +755,34 @@ void Try::Output(CYOutput &out, CYFlags flags) const {
} }
+void CYTypeError::Output(CYOutput &out) const {
+ out << "@error";
+}
+
+void CYTypeLong::Output(CYOutput &out) const {
+ out << "long" << specifier_;
+}
+
+void CYTypeShort::Output(CYOutput &out) const {
+ out << "short" << specifier_;
+}
+
+void CYTypeSigned::Output(CYOutput &out) const {
+ out << "signed" << specifier_;
+}
+
+void CYTypeUnsigned::Output(CYOutput &out) const {
+ out << "unsigned" << specifier_;
+}
+
+void CYTypeVariable::Output(CYOutput &out) const {
+ out << *name_;
+}
+
+void CYTypeVoid::Output(CYOutput &out) const {
+ out << "void";
+}
+
void CYVar::Output(CYOutput &out, CYFlags flags) const {
out << "var";
declarations_->Output(out, flags);