X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/2d9d4d7b5fcbb8396355cb22949610d7650a1d43..f00bbc8e76b9b599a0795ca56b7d77c32773b592:/Output.cpp diff --git a/Output.cpp b/Output.cpp index 26dc81f..d1d033c 100644 --- a/Output.cpp +++ b/Output.cpp @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * 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. * - * 1. Redistributions of source code must retain the - * above copyright notice, this list of conditions - * and the following disclaimer. - * 2. Redistributions in binary form must reproduce the - * above copyright notice, this list of conditions - * and the following disclaimer in the documentation - * and/or other materials provided with the - * distribution. - * 3. The name of the author may not be used to endorse - * or promote products derived from this software - * without specific prior written permission. + * 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. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, - * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR - * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR - * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF - * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ + * You should have received a copy of the GNU General Public License + * along with Cycript. If not, see . +**/ /* }}} */ #include "cycript.hpp" @@ -42,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; @@ -162,7 +116,7 @@ void CYArgument::Output(CYOutput &out) const { out << ':' << ' '; } if (value_ != NULL) - value_->Output(out, CYPA, CYNoFlags); + value_->Output(out, CYAssign::Precedence_, CYNoFlags); if (next_ != NULL) { if (next_->name_ == NULL) out << ','; @@ -259,9 +213,9 @@ void CYCondition::Output(CYOutput &out, CYFlags flags) const { test_->Output(out, Precedence() - 1, CYLeft(flags)); out << ' ' << '?' << ' '; if (true_ != NULL) - true_->Output(out, CYPA, CYNoFlags); + true_->Output(out, CYAssign::Precedence_, CYNoFlags); out << ' ' << ':' << ' '; - false_->Output(out, CYPA, CYRight(flags)); + false_->Output(out, CYAssign::Precedence_, CYRight(flags)); } void CYContinue::Output(CYOutput &out, CYFlags flags) const { @@ -282,8 +236,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 { @@ -293,15 +247,16 @@ void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const { void CYDeclaration::Output(CYOutput &out, CYFlags flags) const { out << *identifier_; + //out.out_ << ':' << identifier_->usage_ << '#' << identifier_->offset_; if (initialiser_ != NULL) { out << ' ' << '=' << ' '; - initialiser_->Output(out, CYPA, CYRight(flags)); + initialiser_->Output(out, CYAssign::Precedence_, CYRight(flags)); } } -void CYDeclarations::For(CYOutput &out) const { +void CYForDeclarations::Output(CYOutput &out, CYFlags flags) const { out << "var"; - Output(out, CYNoIn); + Output(out, CYRight(flags)); } void CYDeclarations::Output(CYOutput &out) const { @@ -311,21 +266,24 @@ 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; } } void CYDirectMember::Output(CYOutput &out, CYFlags flags) const { - object_->Output(out, Precedence(), CYLeft(flags)); + object_->Output(out, Precedence(), CYLeft(flags) | CYNoInteger); if (const char *word = property_->Word()) out << '.' << word; else @@ -340,7 +298,7 @@ void CYDoWhile::Output(CYOutput &out, CYFlags flags) const { void CYElement::Output(CYOutput &out) const { if (value_ != NULL) - value_->Output(out, CYPA, CYNoFlags); + value_->Output(out, CYAssign::Precedence_, CYNoFlags); if (next_ != NULL || value_ == NULL) { out << ','; if (next_ != NULL && next_->value_ != NULL) @@ -360,15 +318,7 @@ void CYExpress::Output(CYOutput &out, CYFlags flags) const { } void CYExpression::ClassName(CYOutput &out, bool object) const { - Output(out, CYPA, CYNoFlags); -} - -const char *CYExpression::ForEachIn() const { - return NULL; -} - -void CYExpression::For(CYOutput &out) const { - Output(out, CYNoIn); + Output(out, CYAssign::Precedence_, CYNoFlags); } void CYExpression::ForIn(CYOutput &out, CYFlags flags) const { @@ -386,6 +336,10 @@ void CYExpression::Output(CYOutput &out, unsigned precedence, CYFlags flags) con Output(out, flags); } +void CYFatArrow::Output(CYOutput &out, CYFlags flags) const { + out << '(' << parameters_ << ')' << ' ' << "=>" << ' ' << code_; +} + void CYFinally::Output(CYOutput &out) const { out << ' ' << "finally" << ' ' << code_; } @@ -393,23 +347,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,8 +389,6 @@ void CYFunction::Output(CYOutput &out, CYFlags flags) const { if (protect) out << '('; out << "function"; - if (out.options_.verbose_) - out.out_ << ':' << static_cast(this); if (name_ != NULL) out << ' ' << *name_; out << '(' << parameters_ << ')'; @@ -450,7 +406,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_; } @@ -479,7 +435,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); } @@ -518,11 +474,15 @@ 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 CYLetStatement::Output(CYOutput &out, CYFlags flags) const { + out << "let" << ' ' << '(' << *declarations_ << ')'; + code_->Single(out, CYRight(flags)); } -void CYNew::Output(CYOutput &out, CYFlags flags) const { +namespace cy { +namespace Syntax { + +void New::Output(CYOutput &out, CYFlags flags) const { out << "new" << ' '; CYFlags jacks(CYNoCall | CYCenter(flags)); constructor_->Output(out, Precedence(), jacks); @@ -530,6 +490,8 @@ void CYNew::Output(CYOutput &out, CYFlags flags) const { out << '(' << *arguments_ << ')'; } +} } + void CYNull::Output(CYOutput &out, CYFlags flags) const { CYWord::Output(out); } @@ -583,7 +545,7 @@ void CYProperty::Output(CYOutput &out) const { out << '\t'; name_->PropertyName(out); out << ':' << ' '; - value_->Output(out, CYPA, CYNoFlags); + value_->Output(out, CYAssign::Precedence_, CYNoFlags); if (next_ != NULL) out << ',' << '\n' << *next_; else @@ -601,11 +563,22 @@ void CYReturn::Output(CYOutput &out, CYFlags flags) const { out << ';'; } +void CYRubyBlock::Output(CYOutput &out, CYFlags flags) const { + call_->Output(out, CYLeft(flags)); + out << ' '; + proc_->Output(out, CYRight(flags)); +} + +void CYRubyProc::Output(CYOutput &out, CYFlags flags) const { + // XXX: this is not outputting the parameters + out << code_; +} + void CYStatement::Multiple(CYOutput &out, CYFlags flags) const { bool first(true); - for (const CYStatement *next(this); next != NULL; next = next->next_) { + CYForEach (next, this) { bool last(next->next_ == NULL); - CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYCenter(flags) : CYRight(flags)); + CYFlags jacks(first ? last ? flags : CYLeft(flags) : last ? CYRight(flags) : CYCenter(flags)); first = false; out << '\t'; next->Output(out, jacks); @@ -614,6 +587,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_;