X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/d35a3b07965ee394c89615d9648c45face9f7f07..bd17e6f377db6c9cc21c99bf58b7f4e3b618ea83:/Output.cpp

diff --git a/Output.cpp b/Output.cpp
index 27b07b0..5e0d6ef 100644
--- a/Output.cpp
+++ b/Output.cpp
@@ -3,10 +3,46 @@
 #include <iostream>
 #include <iomanip>
 
+_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 & ~CYNoTrailer;
+}
+
+_finline CYFlags CYCenter(CYFlags flags) {
+    return flags & CYNoIn;
+}
+
+_finline CYFlags CYRight(CYFlags flags) {
+    return flags & (CYNoIn | CYNoTrailer);
+}
+
+bool CYFalse::Value() const {
+    return false;
+}
+
+bool CYTrue::Value() const {
+    return true;
+}
+
 #define CYPA 16
 
-void CYAddressOf::Output(std::ostream &out) const {
-    rhs_->Output(out, 1);
+void CYAddressOf::Output(std::ostream &out, CYFlags flags) const {
+    rhs_->Output(out, 1, CYLeft(flags));
     out << ".$()";
 }
 
@@ -17,7 +53,7 @@ void CYArgument::Output(std::ostream &out) const {
             out << ":";
     }
     if (value_ != NULL)
-        value_->Output(out, false);
+        value_->Output(out, CYPA, CYNoFlags);
     if (next_ != NULL) {
         if (next_->name_ == NULL)
             out << ',';
@@ -27,21 +63,25 @@ void CYArgument::Output(std::ostream &out) const {
     }
 }
 
-void CYArray::Output(std::ostream &out) const {
+void CYArray::Output(std::ostream &out, CYFlags flags) const {
     out << '[';
     if (elements_ != NULL)
         elements_->Output(out);
     out << ']';
 }
 
-void CYAssignment::Output(std::ostream &out) const {
-    lhs_->Output(out, Precedence() - 1);
+void CYAssignment::Output(std::ostream &out, CYFlags flags) const {
+    lhs_->Output(out, Precedence() - 1, CYLeft(flags));
     out << Operator();
-    rhs_->Output(out, Precedence());
+    rhs_->Output(out, Precedence(), CYRight(flags));
 }
 
-void CYBoolean::Output(std::ostream &out) const {
+void CYBoolean::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     out << (Value() ? "true" : "false");
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';
 }
 
 void CYBreak::Output(std::ostream &out) const {
@@ -51,8 +91,8 @@ void CYBreak::Output(std::ostream &out) const {
     out << ';';
 }
 
-void CYCall::Output(std::ostream &out) const {
-    function_->Output(out, 2);
+void CYCall::Output(std::ostream &out, CYFlags flags) const {
+    function_->Output(out, Precedence(), CYLeft(flags));
     out << '(';
     if (arguments_ != NULL)
         arguments_->Output(out);
@@ -64,13 +104,30 @@ void CYCatch::Output(std::ostream &out) const {
     code_->Output(out, true);
 }
 
-void CYCondition::Output(std::ostream &out) const {
-    test_->Output(out, Precedence() - 1);
+void CYClass::Output(std::ostream &out) const {
+    out << "(function($cys,$cyc,$cym,$cyn,$cyt){";
+    out << "$cyc=objc_allocateClassPair($cys,\"" << *name_ << "\",0);";
+    out << "$cym=object_getClass($cyc);";
+    if (fields_ != NULL)
+        fields_->Output(out);
+    if (messages_ != NULL)
+        messages_->Output(out);
+    out << "objc_registerClassPair($cyc);";
+    out << "})(";
+    if (super_ != NULL)
+        super_->Output(out, CYPA, CYNoFlags);
+    else
+        out << "null";
+    out << ");";
+}
+
+void CYCondition::Output(std::ostream &out, CYFlags flags) const {
+    test_->Output(out, Precedence() - 1, CYLeft(flags));
     out << '?';
     if (true_ != NULL)
-        true_->Output(out, CYPA);
+        true_->Output(out, CYPA, CYNoFlags);
     out << ':';
-    false_->Output(out, CYPA);
+    false_->Output(out, CYPA, CYRight(flags));
 }
 
 void CYContinue::Output(std::ostream &out) const {
@@ -83,7 +140,7 @@ void CYContinue::Output(std::ostream &out) const {
 void CYClause::Output(std::ostream &out) const {
     if (case_ != NULL) {
         out << "case";
-        case_->Output(out);
+        case_->Output(out, CYNoFlags);
     } else
         out << "default";
     out << ':';
@@ -92,6 +149,7 @@ void CYClause::Output(std::ostream &out) const {
     out << *next_;
 }
 
+// XXX: deal with NoIn
 void CYDeclaration::Part(std::ostream &out) const {
     out << "var ";
     Output(out);
@@ -101,10 +159,11 @@ void CYDeclaration::Output(std::ostream &out) const {
     out << *identifier_;
     if (initialiser_ != NULL) {
         out << '=';
-        initialiser_->Output(out, CYPA);
+        initialiser_->Output(out, CYPA, CYNoFlags);
     }
 }
 
+// XXX: deal with NoIn
 void CYDeclarations::Part(std::ostream &out) const {
     out << "var ";
 
@@ -125,16 +184,17 @@ void CYDeclarations::Output(std::ostream &out) const {
 }
 
 void CYDoWhile::Output(std::ostream &out) const {
+    // XXX: extra space character!
     out << "do ";
     code_->Output(out, false);
     out << "while(";
-    test_->Output(out);
-    out << ';';
+    test_->Output(out, CYNoFlags);
+    out << ')';
 }
 
 void CYElement::Output(std::ostream &out) const {
     if (value_ != NULL)
-        value_->Output(out, CYPA);
+        value_->Output(out, CYPA, CYNoFlags);
     if (next_ != NULL || value_ == NULL)
         out << ',';
     if (next_ != NULL)
@@ -153,34 +213,42 @@ void CYEmpty::Output(std::ostream &out, bool block) const {
 }
 
 void CYExpress::Output(std::ostream &out) const {
-    expression_->Output(out);
+    expression_->Output(out, CYNoFunction | CYNoBrace);
     out << ';';
 }
 
 void CYExpression::Part(std::ostream &out) const {
-    // XXX: this should notice "in" expressions
     // XXX: this should handle LeftHandSideExpression
-    Output(out);
+    Output(out, CYNoIn);
 }
 
-void CYCompound::Output(std::ostream &out) const {
+void CYCompound::Output(std::ostream &out, CYFlags flags) const {
     if (CYExpression *expression = expressions_)
-        for (;;) {
-            expression->Output(out);
-            expression = expression->next_;
-            if (expression == NULL)
-                break;
-            out << ',';
-        }
-}
-
-void CYExpression::Output(std::ostream &out, unsigned precedence) const {
-    bool protect(precedence < Precedence());
-    if (protect)
+        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);
+}
+
+void CYExpression::Output(std::ostream &out, unsigned precedence, CYFlags flags) const {
+    if (precedence < Precedence()) {
         out << '(';
-    Output(out);
-    if (protect)
+        Output(out, CYNoFlags);
         out << ')';
+    } else
+        Output(out, flags);
+}
+
+void CYField::Output(std::ostream &out) const {
+    // XXX: implement!
 }
 
 void CYFor::Output(std::ostream &out) const {
@@ -189,10 +257,10 @@ void CYFor::Output(std::ostream &out) const {
         initialiser_->Part(out);
     out << ';';
     if (test_ != NULL)
-        test_->Output(out);
+        test_->Output(out, CYNoFlags);
     out << ';';
     if (increment_ != NULL)
-        increment_->Output(out);
+        increment_->Output(out, CYNoFlags);
     out << ')';
     code_->Output(out, false);
 }
@@ -200,19 +268,29 @@ void CYFor::Output(std::ostream &out) const {
 void CYForIn::Output(std::ostream &out) const {
     out << "for(";
     initialiser_->Part(out);
-    out << " in ";
-    set_->Output(out);
+    // XXX: deal with this space character!
+    out << ' ';
+    out << "in";
+    set_->Output(out, CYNoLeader);
     out << ')';
     code_->Output(out, false);
 }
 
 void CYFunction::Output(std::ostream &out) const {
-    CYLambda::Output(out);
+    CYLambda::Output(out, CYNoFlags);
+}
+
+void CYFunctionParameter::Output(std::ostream &out) const {
+    out << *name_;
+    if (next_ != NULL) {
+        out << ',';
+        out << *next_;
+    }
 }
 
 void CYIf::Output(std::ostream &out) const {
     out << "if(";
-    test_->Output(out);
+    test_->Output(out, CYNoFlags);
     out << ')';
     true_->Output(out, true);
     if (false_ != NULL) {
@@ -221,102 +299,135 @@ void CYIf::Output(std::ostream &out) const {
     }
 }
 
-void CYIndirect::Output(std::ostream &out) const {
-    rhs_->Output(out, 1);
+void CYIndirect::Output(std::ostream &out, CYFlags flags) const {
+    rhs_->Output(out, 1, CYLeft(flags));
     out << "[0]";
 }
 
-void CYInfix::Output(std::ostream &out) const {
-    lhs_->Output(out, Precedence());
-    out << Operator();
-    rhs_->Output(out, Precedence() - 1);
+void CYInfix::Output(std::ostream &out, CYFlags flags) const {
+    const char *name(Operator());
+    bool protect((flags & CYNoIn) != 0 && strcmp(name, "in"));
+    if (protect)
+        out << '(';
+    bool alphabetic(Alphabetic());
+    CYFlags left(protect ? CYNoFlags : CYLeft(flags));
+    if (alphabetic)
+        left |= CYNoTrailer;
+    lhs_->Output(out, Precedence(), left);
+    out << name;
+    CYFlags right(protect ? CYNoFlags : CYRight(flags));
+    if (alphabetic)
+        right |= CYNoLeader;
+    rhs_->Output(out, Precedence() - 1, right);
+    if (protect)
+        out << ')';
 }
 
-void CYLambda::Output(std::ostream &out) const {
+void CYLambda::Output(std::ostream &out, CYFlags flags) const {
+    bool protect((flags & CYNoFunction) != 0);
+    if (protect)
+        out << '(';
     out << "function";
     if (name_ != NULL)
         out << ' ' << *name_;
     out << '(';
     if (parameters_ != NULL)
         out << *parameters_;
-    out << ')';
-    body_->Output(out, true);
+    out << "){";
+    if (body_ != NULL)
+        body_->Show(out);
+    out << '}';
+    if (protect)
+        out << ')';
 }
 
-void CYMember::Output(std::ostream &out) const {
-    object_->Output(out, Precedence());
-    out << '[';
-    property_->Output(out);
-    out << ']';
+void CYMember::Output(std::ostream &out, CYFlags flags) const {
+    object_->Output(out, Precedence(), CYLeft(flags));
+    if (const char *word = property_->Word())
+        out << '.' << word;
+    else {
+        out << '[';
+        property_->Output(out, CYNoFlags);
+        out << ']';
+    }
 }
 
 void CYMessage::Output(std::ostream &out) const {
-    out << "objc_msgSend(";
-    self_->Output(out, CYPA);
-    out << ",\"";
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->name_ != NULL) {
-            out << *argument->name_;
-            if (argument->value_ != NULL)
+    out << "$cyn=new Selector(\"";
+    for (CYMessageParameter *parameter(parameter_); parameter != NULL; parameter = parameter->next_)
+        if (parameter->tag_ != NULL) {
+            out << *parameter->tag_;
+            if (parameter->name_ != NULL)
                 out << ':';
         }
-    out << "\"";
-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
-        if (argument->value_ != NULL) {
-            out << ",";
-            argument->value_->Output(out, CYPA);
-        }
-    out << ')';
-}
-
-void CYNew::Output(std::ostream &out) const {
+    out << "\");";
+    out << "$cyt=$cyn.type($cys," << (instance_ ? "true" : "false") << ");";
+    out << "class_addMethod($cy" << (instance_ ? 'c' : 'm') << ",$cyn,";
+    out << "new Functor(function(self,_cmd";
+    for (CYMessageParameter *parameter(parameter_); parameter != NULL; parameter = parameter->next_)
+        if (parameter->name_ != NULL)
+            out << ',' << *parameter->name_;
+    out << "){return function(){";
+    if (body_ != NULL)
+        body_->Show(out);
+    out << "}.call(self);},$cyt),$cyt);";
+}
+
+void CYNew::Output(std::ostream &out, CYFlags flags) const {
     out << "new";
-    // XXX: I don't /always/ need this character
-    out << ' ';
-    constructor_->Output(out, Precedence());
+    constructor_->Output(out, Precedence(), CYCenter(flags) | CYNoLeader);
     out << '(';
     if (arguments_ != NULL)
         arguments_->Output(out);
     out << ')';
 }
 
-void CYNull::Output(std::ostream &out) const {
+void CYNull::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     CYWord::Output(out);
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';
 }
 
-void CYNumber::Output(std::ostream &out) const {
+void CYNumber::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     // XXX: this is not a useful formatting
     out << Value();
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';
 }
 
-void CYObject::Output(std::ostream &out) const {
+void CYObject::Output(std::ostream &out, CYFlags flags) const {
+    bool protect((flags & CYNoBrace) != 0);
+    if (protect)
+        out << '(';
     out << '{';
     if (property_ != NULL)
         property_->Output(out);
     out << '}';
+    if (protect)
+        out << ')';
 }
 
-void CYParameter::Output(std::ostream &out) const {
-    out << *name_;
-    if (next_ != NULL) {
-        out << ',';
-        out << *next_;
-    }
-}
-
-void CYPostfix::Output(std::ostream &out) const {
-    lhs_->Output(out, Precedence());
+void CYPostfix::Output(std::ostream &out, CYFlags flags) const {
+    lhs_->Output(out, Precedence(), CYLeft(flags));
     out << Operator();
 }
 
-void CYPrefix::Output(std::ostream &out) const {
+void CYPrefix::Output(std::ostream &out, CYFlags flags) const {
+    bool alphabetic(Alphabetic());
     out << Operator();
-    rhs_->Output(out, Precedence());
+    CYFlags right(CYRight(flags));
+    if (alphabetic)
+        right |= CYNoLeader;
+    rhs_->Output(out, Precedence(), right);
 }
 
 void CYProperty::Output(std::ostream &out) const {
     out << *name_ << ':';
-    value_->Output(out, CYPA);
+    value_->Output(out, CYPA, CYNoFlags);
     if (next_ != NULL) {
         out << ',';
         next_->Output(out);
@@ -325,18 +436,16 @@ void CYProperty::Output(std::ostream &out) const {
 
 void CYReturn::Output(std::ostream &out) const {
     out << "return";
-    if (value_ != NULL) {
-        out << ' ';
-        value_->Output(out);
-    }
+    if (value_ != NULL)
+        value_->Output(out, CYNoLeader);
     out << ';';
 }
 
-void CYSelector::Output(std::ostream &out) const {
-    out << '"';
+void CYSelector::Output(std::ostream &out, CYFlags flags) const {
+    out << "new Selector(\"";
     if (name_ != NULL)
         name_->Output(out);
-    out << '"';
+    out << "\")";
 }
 
 void CYSelectorPart::Output(std::ostream &out) const {
@@ -348,9 +457,28 @@ void CYSelectorPart::Output(std::ostream &out) const {
         next_->Output(out);
 }
 
+void CYSend::Output(std::ostream &out, CYFlags flags) const {
+    out << "objc_msgSend(";
+    self_->Output(out, CYPA, CYNoFlags);
+    out << ",\"";
+    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
+        if (argument->name_ != NULL) {
+            out << *argument->name_;
+            if (argument->value_ != NULL)
+                out << ':';
+        }
+    out << "\"";
+    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
+        if (argument->value_ != NULL) {
+            out << ",";
+            argument->value_->Output(out, CYPA, CYNoFlags);
+        }
+    out << ')';
+}
+
 void CYSource::Show(std::ostream &out) const {
     for (const CYSource *next(this); next != NULL; next = next->next_)
-        next->Output(out, false);
+        next->Output(out);
 }
 
 void CYSource::Output(std::ostream &out, bool block) const {
@@ -363,7 +491,7 @@ void CYSource::Output(std::ostream &out, bool block) const {
     }
 }
 
-void CYString::Output(std::ostream &out) const {
+void CYString::Output(std::ostream &out, CYFlags flags) const {
     out << '\"';
     for (const char *value(value_), *end(value_ + size_); value != end; ++value)
         switch (*value) {
@@ -387,23 +515,25 @@ void CYString::Output(std::ostream &out) const {
 
 void CYSwitch::Output(std::ostream &out) const {
     out << "switch(";
-    value_->Output(out);
+    value_->Output(out, CYNoFlags);
     out << "){";
     if (clauses_ != NULL)
         out << *clauses_;
     out << '}';
 }
 
-void CYThis::Output(std::ostream &out) const {
+void CYThis::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     CYWord::Output(out);
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';
 }
 
 void CYThrow::Output(std::ostream &out) const {
     out << "throw";
-    if (value_ != NULL) {
-        out << ' ';
-        value_->Output(out);
-    }
+    if (value_ != NULL)
+        value_->Output(out, CYNoLeader);
     out << ';';
 }
 
@@ -418,20 +548,24 @@ void CYTry::Output(std::ostream &out) const {
     }
 }
 
-void CYVariable::Output(std::ostream &out) const {
+void CYVariable::Output(std::ostream &out, CYFlags flags) const {
+    if ((flags & CYNoLeader) != 0)
+        out << ' ';
     out << *name_;
+    if ((flags & CYNoTrailer) != 0)
+        out << ' ';
 }
 
 void CYWhile::Output(std::ostream &out) const {
     out << "while(";
-    test_->Output(out);
+    test_->Output(out, CYNoFlags);
     out << ')';
     code_->Output(out, false);
 }
 
 void CYWith::Output(std::ostream &out) const {
     out << "with(";
-    scope_->Output(out);
+    scope_->Output(out, CYNoFlags);
     out << ')';
     code_->Output(out, false);
 }