Optimized the variable renamer to rename more variables to 'a'.

[cycript.git] / Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 04f893c9299d74671fb812a04a1975ed40ee2980..26dc81fb1d7e33252ab427c9d46c9b12c9a38944 100644 (file)
--- a/Output.cpp
+++ b/Output.cpp
@@ -89,12 +89,10 @@ CYOutput &CYOutput::operator <<(char rhs) {
         if (right_) {
             out_ << '\n';
             right_ = false;
         if (right_) {
             out_ << '\n';
             right_ = false;

-            goto mode;
-        }
+        } goto done;

     } else goto work;
 
     right_ = true;
     } else goto work;
 
     right_ = true;

-  mode:

     mode_ = NoMode;
     goto done;
 
     mode_ = NoMode;
     goto done;
 


@@ -236,7 +234,8 @@ void Catch::Output(CYOutput &out) const {
 
 void CYComment::Output(CYOutput &out, CYFlags flags) const {
     out << '\r';
 
 void CYComment::Output(CYOutput &out, CYFlags flags) const {
     out << '\r';

-    out << value_;
+    out.out_ << value_;
+    out.right_ = true;

     out << '\r';
 }
 
     out << '\r';
 }
 


@@ -284,7 +283,7 @@ void CYClause::Output(CYOutput &out) const {
 }
 
 const char *CYDeclaration::ForEachIn() const {
 }
 
 const char *CYDeclaration::ForEachIn() const {

-    return identifier_->Value();
+    return identifier_->Word();

 }
 
 void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {
 }
 
 void CYDeclaration::ForIn(CYOutput &out, CYFlags flags) const {


@@ -416,7 +415,8 @@ void CYForEachInComprehension::Output(CYOutput &out) const {
 
 void CYForIn::Output(CYOutput &out, CYFlags flags) const {
     out << "for" << ' ' << '(';
 
 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 << "in" << *set_ << ')';
     code_->Single(out, CYRight(flags));
 }


@@ -431,6 +431,8 @@ void CYFunction::Output(CYOutput &out, CYFlags flags) const {
     if (protect)
         out << '(';
     out << "function";
     if (protect)
         out << '(';
     out << "function";

+    if (out.options_.verbose_)
+        out.out_ << ':' << static_cast<const CYScope *>(this);

     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(' << parameters_ << ')';
     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(' << parameters_ << ')';


@@ -453,6 +455,10 @@ void CYFunctionParameter::Output(CYOutput &out) const {
         out << ',' << ' ' << *next_;
 }
 
         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) {
 void CYIf::Output(CYOutput &out, CYFlags flags) const {
     bool protect(false);
     if (false_ == NULL && (flags & CYNoDangle) != 0) {


@@ -649,8 +655,6 @@ static const char *Reserved_[] = {
 
     "let", "yield",
 
 
     "let", "yield",
 

-    "each",
-

     NULL
 };
 
     NULL
 };
 


@@ -716,15 +720,21 @@ void CYWith::Output(CYOutput &out, CYFlags flags) const {
 void CYWord::ClassName(CYOutput &out, bool object) const {
     if (object)
         out << "objc_getClass(";
 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 {
     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);
 }
 }
 
 void CYWord::PropertyName(CYOutput &out) const {
     Output(out);
 }

+
+const char *CYWord::Word() const {
+    return word_;
+}