-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Lesser 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 Lesser 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 Lesser 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 Lesser General Public License
+ * along with Cycript. If not, see <http://www.gnu.org/licenses/>.
+**/
/* }}} */
#include "cycript.hpp"
}
_finline CYFlags CYLeft(CYFlags flags) {
- return flags & ~CYNoDangle;
+ return flags & ~(CYNoDangle | CYNoInteger);
}
_finline CYFlags CYRight(CYFlags flags) {
for (unsigned i(0); i != indent_; ++i)
out_ << " ";
else goto done;
- else goto work;
-
+ else if (rhs == '\r') {
+ if (right_) {
+ out_ << '\n';
+ right_ = false;
+ } goto done;
+ } else goto work;
+
+ right_ = true;
mode_ = NoMode;
goto done;
work:
- if (mode_ == Terminated && rhs != '}')
+ if (mode_ == Terminated && rhs != '}') {
+ right_ = true;
out_ << ';';
+ }
if (rhs == ';') {
if (pretty_)
} else none:
mode_ = NoMode;
+ right_ = true;
out_ << rhs;
done:
return *this;
else
mode_ = NoMode;
+ right_ = true;
out_ << rhs;
return *this;
}
out << ':' << ' ';
}
if (value_ != NULL)
- value_->Output(out, CYPA, CYNoFlags);
+ value_->Output(out, CYAssign::Precedence_, CYNoFlags);
if (next_ != NULL) {
if (next_->name_ == NULL)
out << ',';
} }
+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_) {
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 {
}
const char *CYDeclaration::ForEachIn() const {
- return identifier_->Value();
+ return identifier_->Word();
}
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 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
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)
}
void CYExpression::ClassName(CYOutput &out, bool object) const {
- Output(out, CYPA, CYNoFlags);
+ Output(out, CYAssign::Precedence_, CYNoFlags);
}
const char *CYExpression::ForEachIn() const {
void CYForIn::Output(CYOutput &out, CYFlags flags) const {
out << "for" << ' ' << '(';
- initialiser_->ForIn(out, CYNoIn);
+ if (initialiser_ != NULL)
+ initialiser_->ForIn(out, CYNoIn);
out << "in" << *set_ << ')';
code_->Single(out, CYRight(flags));
}
out << ',' << ' ' << *next_;
}
+const char *CYIdentifier::Word() const {
+ return replace_ == NULL || replace_ == this ? CYWord::Word() : replace_->Word();
+}
+
void CYIf::Output(CYOutput &out, CYFlags flags) const {
bool protect(false);
if (false_ == NULL && (flags & CYNoDangle) != 0) {
out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_;
}
-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);
out << '(' << *arguments_ << ')';
}
+} }
+
void CYNull::Output(CYOutput &out, CYFlags flags) const {
CYWord::Output(out);
}
void CYNumber::Output(CYOutput &out, CYFlags flags) const {
std::ostringstream str;
CYNumerify(str, Value());
- out << str.str().c_str();
+ std::string value(str.str());
+ out << value.c_str();
+ // XXX: this should probably also handle hex conversions and exponents
+ if ((flags & CYNoInteger) != 0 && value.find('.') == std::string::npos)
+ out << '.';
}
void CYNumber::PropertyName(CYOutput &out) 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();
out << '\t';
name_->PropertyName(out);
out << ':' << ' ';
- value_->Output(out, CYPA, CYNoFlags);
+ value_->Output(out, CYAssign::Precedence_, CYNoFlags);
if (next_ != NULL)
out << ',' << '\n' << *next_;
else
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);
"let", "yield",
- "each",
-
NULL
};
void CYWord::ClassName(CYOutput &out, bool object) const {
if (object)
out << "objc_getClass(";
- out << '"' << Value() << '"';
+ out << '"' << Word() << '"';
if (object)
out << ')';
}
void CYWord::Output(CYOutput &out) const {
- out << Value();
+ out << Word();
+ if (out.options_.verbose_)
+ out.out_ << '@' << this;
}
void CYWord::PropertyName(CYOutput &out) const {
Output(out);
}
+
+const char *CYWord::Word() const {
+ return word_;
+}
projects / cycript.git / blobdiff