X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/e661185c1c35ad0eb684582c3f78cd032e84ae7b..fc8fc33d0c3a25e23e354fed740ff500fab218d9:/Output.cpp diff --git a/Output.cpp b/Output.cpp index e399d48..2ff5ad7 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,52 +24,24 @@ #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_ << ';'; + operator ()(';'); mode_ = NoMode; } CYOutput &CYOutput::operator <<(char rhs) { if (rhs == ' ' || rhs == '\n') if (pretty_) - out_ << rhs; + operator ()(rhs); else goto done; else if (rhs == '\t') if (pretty_) for (unsigned i(0); i != indent_; ++i) - out_ << " "; + operator ()(" ", 4); else goto done; else if (rhs == '\r') { if (right_) { - out_ << '\n'; + operator ()('\n'); right_ = false; } goto done; } else goto work; @@ -81,7 +53,7 @@ CYOutput &CYOutput::operator <<(char rhs) { work: if (mode_ == Terminated && rhs != '}') { right_ = true; - out_ << ';'; + operator ()(';'); } if (rhs == ';') { @@ -93,21 +65,21 @@ CYOutput &CYOutput::operator <<(char rhs) { } } else if (rhs == '+') { if (mode_ == NoPlus) - out_ << ' '; + operator ()(' '); mode_ = NoPlus; } else if (rhs == '-') { if (mode_ == NoHyphen) - out_ << ' '; + operator ()(' '); mode_ = NoHyphen; } else if (WordEndRange_[rhs]) { if (mode_ == NoLetter) - out_ << ' '; + operator ()(' '); mode_ = NoLetter; } else none: mode_ = NoMode; right_ = true; - out_ << rhs; + operator ()(rhs); done: return *this; } @@ -119,21 +91,22 @@ CYOutput &CYOutput::operator <<(const char *rhs) { return *this << *rhs; if (mode_ == Terminated) - out_ << ';'; + operator ()(';'); else if ( mode_ == NoPlus && *rhs == '+' || mode_ == NoHyphen && *rhs == '-' || mode_ == NoLetter && WordEndRange_[*rhs] ) - out_ << ' '; + operator ()(' '); - if (WordEndRange_[rhs[size - 1]]) + char last(rhs[size - 1]); + if (WordEndRange_[last] || last == '/') mode_ = NoLetter; else mode_ = NoMode; right_ = true; - out_ << rhs; + operator ()(rhs, size); return *this; } @@ -146,8 +119,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_; } } @@ -166,26 +138,18 @@ void CYAssignment::Output(CYOutput &out, CYFlags flags) const { rhs_->Output(out, Precedence(), CYRight(flags)); } -void CYBlock::Output(CYOutput &out) const { +void CYBlock::Output(CYOutput &out, CYFlags flags) const { out << '{' << '\n'; ++out.indent_; - if (statements_ != NULL) - statements_->Multiple(out); + out << code_; --out.indent_; out << '\t' << '}'; } -void CYBlock::Output(CYOutput &out, CYFlags flags) const { - if (statements_ == NULL) - out.Terminate(); - else if (statements_->next_ == NULL) - statements_->Single(out, flags); - else - Output(out); -} - void CYBoolean::Output(CYOutput &out, CYFlags flags) const { - out << (Value() ? "true" : "false"); + out << '!' << (Value() ? "0" : "1"); + if ((flags & CYNoInteger) != 0) + out << '.'; } void CYBreak::Output(CYOutput &out, CYFlags flags) const { @@ -209,32 +173,24 @@ namespace cy { namespace Syntax { void Catch::Output(CYOutput &out) const { - out << ' ' << "catch" << ' ' << '(' << *name_ << ')' << ' ' << code_; + out << ' ' << "catch" << ' ' << '(' << *name_ << ')' << ' '; + out << '{' << '\n'; + ++out.indent_; + out << code_; + --out.indent_; + out << '\t' << '}'; } } } -void CYComment::Output(CYOutput &out, CYFlags flags) const { - out << '\r'; - out.out_ << value_; - out.right_ = true; - out << '\r'; -} - 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 { @@ -254,22 +210,24 @@ void CYContinue::Output(CYOutput &out, CYFlags flags) const { } void CYClause::Output(CYOutput &out) const { + out << '\t'; if (case_ != NULL) out << "case" << ' ' << *case_; else out << "default"; out << ':' << '\n'; - if (statements_ != NULL) - statements_->Multiple(out); + ++out.indent_; + out << code_; + --out.indent_; 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 { - out << "var"; + out << "var" << ' '; Output(out, CYRight(flags)); } @@ -282,9 +240,9 @@ void CYDeclaration::Output(CYOutput &out, CYFlags flags) const { } } -void CYDeclarations::For(CYOutput &out) const { - out << "var"; - Output(out, CYNoIn); +void CYForDeclarations::Output(CYOutput &out, CYFlags flags) const { + out << "var" << ' '; + declarations_->Output(out, CYRight(flags)); } void CYDeclarations::Output(CYOutput &out) const { @@ -294,16 +252,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; } } @@ -317,16 +278,29 @@ void CYDirectMember::Output(CYOutput &out, CYFlags flags) const { void CYDoWhile::Output(CYOutput &out, CYFlags flags) const { out << "do"; - code_->Single(out, CYCenter(flags)); + + unsigned line(out.position_.line); + unsigned indent(out.indent_); + code_->Single(out, CYCenter(flags), CYCompactLong); + + if (out.position_.line != line && out.recent_ == indent) + out << ' '; + else + out << '\n' << '\t'; + out << "while" << ' ' << '(' << *test_ << ')'; } -void CYElement::Output(CYOutput &out) const { +void CYElementSpread::Output(CYOutput &out) const { + out << "..." << value_; +} + +void CYElementValue::Output(CYOutput &out) const { if (value_ != NULL) value_->Output(out, CYAssign::Precedence_, CYNoFlags); if (next_ != NULL || value_ == NULL) { out << ','; - if (next_ != NULL && next_->value_ != NULL) + if (next_ != NULL && !next_->Elision()) out << ' '; } if (next_ != NULL) @@ -346,14 +320,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,21 +328,34 @@ 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_; + out << ' ' << "finally" << ' '; + out << '{' << '\n'; + ++out.indent_; + out << code_; + --out.indent_; + out << '\t' << '}'; } 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 << ' '; @@ -386,17 +365,17 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const { out << ' '; out << increment_; out << ')'; - code_->Single(out, CYRight(flags)); + code_->Single(out, CYRight(flags), CYCompactShort); } -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)); + out << ' ' << "in" << ' ' << *set_ << ')'; + code_->Single(out, CYRight(flags), CYCompactShort); } -void CYForEachInComprehension::Output(CYOutput &out) const { +void CYForOfComprehension::Output(CYOutput &out) const { out << "for" << ' ' << "each" << ' ' << '(' << *name_ << ' ' << "in" << ' ' << *set_ << ')' << next_; } @@ -404,8 +383,8 @@ void CYForIn::Output(CYOutput &out, CYFlags flags) const { out << "for" << ' ' << '('; if (initialiser_ != NULL) initialiser_->ForIn(out, CYNoIn); - out << "in" << *set_ << ')'; - code_->Single(out, CYRight(flags)); + out << ' ' << "in" << ' ' << *set_ << ')'; + code_->Single(out, CYRight(flags), CYCompactShort); } void CYForInComprehension::Output(CYOutput &out) const { @@ -420,8 +399,12 @@ void CYFunction::Output(CYOutput &out, CYFlags flags) const { out << "function"; if (name_ != NULL) out << ' ' << *name_; - out << '(' << parameters_ << ')'; - out << ' ' << code_; + out << '(' << parameters_ << ')' << ' '; + out << '{' << '\n'; + ++out.indent_; + out << code_; + --out.indent_; + out << '\t' << '}'; if (protect) out << ')'; } @@ -435,7 +418,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_; } @@ -461,11 +444,18 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const { else jacks |= protect ? CYNoFlags : CYCenter(flags); - true_->Single(out, jacks); + unsigned line(out.position_.line); + unsigned indent(out.indent_); + true_->Single(out, jacks, CYCompactShort); if (false_ != NULL) { - out << '\t' << "else"; - false_->Single(out, right); + if (out.position_.line != line && out.recent_ == indent) + out << ' '; + else + out << '\n' << '\t'; + + out << "else"; + false_->Single(out, right, CYCompactLong); } if (protect) @@ -476,6 +466,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,12 +493,108 @@ void CYInfix::Output(CYOutput &out, CYFlags flags) const { } void CYLabel::Output(CYOutput &out, CYFlags flags) const { - out << *name_ << ':' << ' '; - statement_->Single(out, CYRight(flags)); + out << *name_ << ':'; + statement_->Single(out, CYRight(flags), CYCompactShort); +} + +void CYParenthetical::Output(CYOutput &out, CYFlags flags) const { + out << '('; + expression_->Output(out, CYCompound::Precedence_, CYNoFlags); + out << ')'; +} + +void CYStatement::Output(CYOutput &out) const { + Multiple(out); +} + +void CYTemplate::Output(CYOutput &out, CYFlags flags) const { + _assert(false); +} + +void CYTypeArrayOf::Output(CYOutput &out, CYIdentifier *identifier) const { + next_->Output(out, Precedence(), identifier); + out << '['; + out << size_; + out << ']'; } -void CYLet::Output(CYOutput &out, CYFlags flags) const { - out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_; +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), CYCompactShort); +} + +void CYModule::Output(CYOutput &out) const { + out << part_; + if (next_ != NULL) + out << '.' << next_; } namespace cy { @@ -521,7 +611,7 @@ void New::Output(CYOutput &out, CYFlags flags) const { } } void CYNull::Output(CYOutput &out, CYFlags flags) const { - CYWord::Output(out); + out << "null"; } void CYNumber::Output(CYOutput &out, CYFlags flags) const { @@ -551,13 +641,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(); @@ -571,9 +654,8 @@ void CYPrefix::Output(CYOutput &out, CYFlags flags) const { rhs_->Output(out, Precedence(), CYRight(flags)); } -void CYProgram::Output(CYOutput &out) const { - if (statements_ != NULL) - statements_->Multiple(out); +void CYScript::Output(CYOutput &out) const { + out << code_; } void CYProperty::Output(CYOutput &out) const { @@ -605,8 +687,11 @@ void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const { } void CYRubyProc::Output(CYOutput &out, CYFlags flags) const { - // XXX: this is not outputting the parameters + out << '{' << ' ' << '|' << parameters_ << '|' << '\n'; + ++out.indent_; out << code_; + --out.indent_; + out << '\t' << '}'; } void CYStatement::Multiple(CYOutput &out, CYFlags flags) const { @@ -621,14 +706,26 @@ void CYStatement::Multiple(CYOutput &out, CYFlags flags) const { } } -void CYStatement::Single(CYOutput &out, CYFlags flags) const { +void CYStatement::Single(CYOutput &out, CYFlags flags, CYCompactType request) const { + if (this == NULL) + return out.Terminate(); + _assert(next_ == NULL); - out << '\n'; - ++out.indent_; - out << '\t'; + + CYCompactType compact(Compact()); + + if (compact >= request) + out << ' '; + else { + out << '\n'; + ++out.indent_; + out << '\t'; + } + Output(out, flags); - out << '\n'; - --out.indent_; + + if (compact < request) + --out.indent_; } void CYString::Output(CYOutput &out, CYFlags flags) const { @@ -680,13 +777,15 @@ const char *CYString::Word() const { } void CYSwitch::Output(CYOutput &out, CYFlags flags) const { - out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{'; + out << "switch" << ' ' << '(' << *value_ << ')' << ' ' << '{' << '\n'; + ++out.indent_; out << clauses_; - out << '}'; + --out.indent_; + out << '\t' << '}'; } void CYThis::Output(CYOutput &out, CYFlags flags) const { - CYWord::Output(out); + out << "this"; } namespace cy { @@ -700,13 +799,47 @@ void Throw::Output(CYOutput &out, CYFlags flags) const { } void Try::Output(CYOutput &out, CYFlags flags) const { - out << "try" << ' ' << code_ << catch_ << finally_; + out << "try" << ' '; + out << '{' << '\n'; + ++out.indent_; + out << code_; + --out.indent_; + out << '\t' << '}'; + out << catch_ << finally_; } } } +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"; + out << "var" << ' '; declarations_->Output(out, flags); out << ';'; } @@ -716,13 +849,13 @@ void CYVariable::Output(CYOutput &out, CYFlags flags) const { } void CYWhile::Output(CYOutput &out, CYFlags flags) const { - out << "while" << '(' << *test_ << ')'; - code_->Single(out, CYRight(flags)); + out << "while" << ' ' << '(' << *test_ << ')'; + code_->Single(out, CYRight(flags), CYCompactShort); } void CYWith::Output(CYOutput &out, CYFlags flags) const { - out << "with" << '(' << *scope_ << ')'; - code_->Single(out, CYRight(flags)); + out << "with" << ' ' << '(' << *scope_ << ')'; + code_->Single(out, CYRight(flags), CYCompactShort); } void CYWord::ClassName(CYOutput &out, bool object) const { @@ -735,8 +868,12 @@ void CYWord::ClassName(CYOutput &out, bool object) const { void CYWord::Output(CYOutput &out) const { out << Word(); - if (out.options_.verbose_) - out.out_ << '@' << this; + if (out.options_.verbose_) { + out('@'); + char number[32]; + sprintf(number, "%p", this); + out(number); + } } void CYWord::PropertyName(CYOutput &out) const {