Replace the svnversion mechanism with git describe.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 8b77e0ef4c763c749a0782b6848da3323fe8c06b..c97474451d17285acdcd36743577828de96a2453 100644 (file)
--- 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-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"
 /* }}} */
 
 #include "cycript.hpp"


@@ -42,34 +24,6 @@
 
 #include <sstream>
 
 
 #include <sstream>
 

-_finline CYFlags operator ~(CYFlags rhs) {
-    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
-}
-
-_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
-    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
-}
-
-_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
-    return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(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;
 void CYOutput::Terminate() {
     out_ << ';';
     mode_ = NoMode;


@@ -162,7 +116,7 @@ void CYArgument::Output(CYOutput &out) const {
             out << ':' << ' ';
     }
     if (value_ != NULL)
             out << ':' << ' ';
     }
     if (value_ != NULL)

-        value_->Output(out, CYPA, CYNoFlags);
+        value_->Output(out, CYAssign::Precedence_, CYNoFlags);

     if (next_ != NULL) {
         if (next_->name_ == NULL)
             out << ',';
     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)
     test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << ' ' << '?' << ' ';
     if (true_ != NULL)

-        true_->Output(out, CYPA, CYNoFlags);
+        true_->Output(out, CYAssign::Precedence_, CYNoFlags);

     out << ' ' << ':' << ' ';
     out << ' ' << ':' << ' ';

-    false_->Output(out, CYPA, CYRight(flags));
+    false_->Output(out, CYAssign::Precedence_, CYRight(flags));

 }
 
 void CYContinue::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYContinue::Output(CYOutput &out, CYFlags flags) const {


@@ -296,7 +250,7 @@ void CYDeclaration::Output(CYOutput &out, CYFlags flags) const {
     //out.out_ << ':' << identifier_->usage_ << '#' << identifier_->offset_;
     if (initialiser_ != NULL) {
         out << ' ' << '=' << ' ';
     //out.out_ << ':' << identifier_->usage_ << '#' << identifier_->offset_;
     if (initialiser_ != NULL) {
         out << ' ' << '=' << ' ';

-        initialiser_->Output(out, CYPA, CYRight(flags));
+        initialiser_->Output(out, CYAssign::Precedence_, CYRight(flags));

     }
 }
 
     }
 }
 


@@ -341,7 +295,7 @@ void CYDoWhile::Output(CYOutput &out, CYFlags flags) const {
 
 void CYElement::Output(CYOutput &out) const {
     if (value_ != NULL)
 
 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)
     if (next_ != NULL || value_ == NULL) {
         out << ',';
         if (next_ != NULL && next_->value_ != NULL)


@@ -361,7 +315,7 @@ void CYExpress::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYExpression::ClassName(CYOutput &out, bool object) const {
 }
 
 void CYExpression::ClassName(CYOutput &out, bool object) const {

-    Output(out, CYPA, CYNoFlags);
+    Output(out, CYAssign::Precedence_, CYNoFlags);

 }
 
 const char *CYExpression::ForEachIn() const {
 }
 
 const char *CYExpression::ForEachIn() const {


@@ -396,8 +350,12 @@ void CYFor::Output(CYOutput &out, CYFlags flags) const {
     if (initialiser_ != NULL)
         initialiser_->For(out);
     out.Terminate();
     if (initialiser_ != NULL)
         initialiser_->For(out);
     out.Terminate();

+    if (test_ != NULL)
+        out << ' ';

     out << test_;
     out.Terminate();
     out << test_;
     out.Terminate();

+    if (increment_ != NULL)
+        out << ' ';

     out << increment_;
     out << ')';
     code_->Single(out, CYRight(flags));
     out << increment_;
     out << ')';
     code_->Single(out, CYRight(flags));


@@ -478,7 +436,7 @@ void CYIf::Output(CYOutput &out, CYFlags flags) const {
     true_->Single(out, jacks);
 
     if (false_ != NULL) {
     true_->Single(out, jacks);
 
     if (false_ != NULL) {

-        out << "else";
+        out << '\t' << "else";

         false_->Single(out, right);
     }
 
         false_->Single(out, right);
     }
 


@@ -521,7 +479,10 @@ void CYLet::Output(CYOutput &out, CYFlags flags) const {
     out << "let" << ' ' << '(' << *declarations_ << ')' << ' ' << code_;
 }
 
     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 << "new" << ' ';
     CYFlags jacks(CYNoCall | CYCenter(flags));
     constructor_->Output(out, Precedence(), jacks);


@@ -529,6 +490,8 @@ void CYNew::Output(CYOutput &out, CYFlags flags) const {
         out << '(' << *arguments_ << ')';
 }
 
         out << '(' << *arguments_ << ')';
 }
 

+} }
+

 void CYNull::Output(CYOutput &out, CYFlags flags) const {
     CYWord::Output(out);
 }
 void CYNull::Output(CYOutput &out, CYFlags flags) const {
     CYWord::Output(out);
 }


@@ -561,7 +524,8 @@ void CYObject::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYOptionalFunctionParameter::Output(CYOutput &out) const {
 }
 
 void CYOptionalFunctionParameter::Output(CYOutput &out) const {

-    out << *name_ << '=' << *initializer_;
+    out << *name_ << '=';
+    initializer_->Output(out, CYAssign::Precedence_, CYNoFlags);

     if (next_ != NULL)
         out << ',' << ' ' << *next_;
 }
     if (next_ != NULL)
         out << ',' << ' ' << *next_;
 }


@@ -588,7 +552,7 @@ void CYProperty::Output(CYOutput &out) const {
     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';
     out << '\t';
     name_->PropertyName(out);
     out << ':' << ' ';

-    value_->Output(out, CYPA, CYNoFlags);
+    value_->Output(out, CYAssign::Precedence_, CYNoFlags);

     if (next_ != NULL)
         out << ',' << '\n' << *next_;
     else
     if (next_ != NULL)
         out << ',' << '\n' << *next_;
     else


@@ -606,11 +570,22 @@ void CYReturn::Output(CYOutput &out, CYFlags flags) const {
     out << ';';
 }
 
     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);
 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);
         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);
         first = false;
         out << '\t';
         next->Output(out, jacks);