Improve CString/Pointer consistency, using CArray.

[cycript.git] / ObjectiveC / Output.cpp

diff --git a/ObjectiveC/Output.cpp b/ObjectiveC/Output.cpp
index 9d0caa052c210681a4bed647fa2b0186a294e1dc..a65e3863ee57f77e05ac79ef7c873f06a2d86214 100644 (file)
--- a/ObjectiveC/Output.cpp
+++ b/ObjectiveC/Output.cpp
@@ -19,51 +19,39 @@
 **/
 /* }}} */
 
+#include <sstream>
+
 #include "Replace.hpp"
-#include "ObjectiveC/Syntax.hpp"
 
-#include <sstream>
+#include "ObjectiveC/Syntax.hpp"
 
 void CYCategory::Output(CYOutput &out, CYFlags flags) const {
-    out << "(function($cys,$cyp,$cyc,$cyn,$cyt){";
-    out << "$cyp=object_getClass($cys);";
-    out << "$cyc=$cys;";
-    if (messages_ != NULL)
-        messages_->Output(out, true);
-    out << "})(";
-    name_->ClassName(out, true);
-    out << ')';
-    out << ';';
-}
+    out << "@implementation" << ' ' << *name_ << ' ' << '(' << ')' << '\n';
+    ++out.indent_;
 
-void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
-    // XXX: I don't necc. need the ()s
-    out << "(function($cys,$cyp,$cyc,$cyn,$cyt,$cym){";
-    out << "$cyp=object_getClass($cys);";
-    out << "$cyc=objc_allocateClassPair($cys,";
-    name_->ClassName(out, false);
-    out << ",0);";
-    out << "$cym=object_getClass($cyc);";
-    if (fields_ != NULL)
-        fields_->Output(out);
-    if (messages_ != NULL)
-        messages_->Output(out, false);
-    if (protocols_ != NULL) {
-        out << '<';
-        out << *protocols_;
-        out << '>';
+    CYForEach (message, messages_) {
+        message->Output(out);
+        out << '\n';
     }
-    out << "objc_registerClassPair($cyc);";
-    out << "return $cyc;";
-    out << "}(";
-    if (super_ != NULL)
-        super_->Output(out, CYAssign::Precedence_, CYNoFlags);
-    else
-        out << "null";
-    out << "))";
+
+    --out.indent_;
+    out << "@end";
 }
 
-void CYClassField::Output(CYOutput &out) const {
+void CYImplementation::Output(CYOutput &out, CYFlags flags) const {
+    out << "@implementation" << ' ' << *name_ << '\n';
+    ++out.indent_;
+
+    // XXX: implement
+
+    --out.indent_;
+    out << "@end";
+}
+
+void CYImplementationField::Output(CYOutput &out) const {
+    out << *typed_;
+    out.Terminate();
+    out << '\n';
 }
 
 void CYInstanceLiteral::Output(CYOutput &out, CYFlags flags) const {
@@ -71,12 +59,12 @@ void CYInstanceLiteral::Output(CYOutput &out, CYFlags flags) const {
     number_->Output(out, CYRight(flags));
 }
 
-void CYMessage::Output(CYOutput &out, bool replace) const {
+void CYMessage::Output(CYOutput &out) const {
     out << (instance_ ? '-' : '+');
 
     CYForEach (parameter, parameters_)
-        if (parameter->tag_ != NULL) {
-            out << ' ' << *parameter->tag_;
+        if (parameter->name_ != NULL) {
+            out << ' ' << *parameter->name_;
             if (parameter->type_ != NULL)
                 out << ':' << *parameter->type_->identifier_;
         }
@@ -90,11 +78,22 @@ void CYBox::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYObjCBlock::Output(CYOutput &out, CYFlags flags) const {
-    // XXX: this is seriously wrong
-    out << "^(";
-    out << ")";
-    out << "{";
-    out << "}";
+    out << '^' << ' ' << *typed_ << ' ' << '(';
+
+    bool comma(false);
+    CYForEach (parameter, parameters_) {
+        if (comma)
+            out << ',' << ' ';
+        else
+            comma = true;
+        out << *parameter->typed_;
+    }
+
+    out << ')' << ' ' << '{' << '\n';
+    ++out.indent_;
+    out << code_;
+    --out.indent_;
+    out << '\n' << '}';
 }
 
 void CYProtocol::Output(CYOutput &out) const {
@@ -104,7 +103,7 @@ void CYProtocol::Output(CYOutput &out) const {
 }
 
 void CYSelector::Output(CYOutput &out, CYFlags flags) const {
-    out << "@selector" << '(' << name_ << ')';
+    out << "@selector" << '(' << parts_ << ')';
 }
 
 void CYSelectorPart::Output(CYOutput &out) const {