Verify lexer tokens are always default reductions.

[cycript.git] / ObjectiveC / Output.cpp

diff --git a/ObjectiveC/Output.cpp b/ObjectiveC/Output.cpp
index ee41e48c89221a616a5e8572821971c0340b4b6e..76838d8815431189cd9922a5a80e80dd69986dbd 100644 (file)
--- a/ObjectiveC/Output.cpp
+++ b/ObjectiveC/Output.cpp
@@ -19,62 +19,36 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

+#include <sstream>
+

 #include "Replace.hpp"
 #include "Replace.hpp"

-#include "ObjectiveC/Syntax.hpp"

 
 

-#include <sstream>
+#include "ObjectiveC/Syntax.hpp"

 
 void CYCategory::Output(CYOutput &out, CYFlags flags) const {
 
 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 CYClass::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,";
-    if (name_ != NULL)
-        name_->ClassName(out, false);
-    else
-        out << "$cyq(\"CY$\")";
-    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 << "))";
-}

 
 

-void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
-    CYClass::Output(out, flags);
+    --out.indent_;
+    out << "@end";

 }
 
 }
 

-void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
-    CYClass::Output(out, flags);
+void CYImplementation::Output(CYOutput &out, CYFlags flags) const {
+    out << "@implementation" << ' ' << *name_ << '\n';
+    ++out.indent_;
+
+    // XXX: implement
+
+    --out.indent_;
+    out << "@end";

 }
 
 }
 

-void CYClassField::Output(CYOutput &out) const {
+void CYImplementationField::Output(CYOutput &out) const {

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


@@ -82,7 +56,7 @@ void CYInstanceLiteral::Output(CYOutput &out, CYFlags flags) const {
     number_->Output(out, CYRight(flags));
 }
 
     number_->Output(out, CYRight(flags));
 }
 

-void CYMessage::Output(CYOutput &out, bool replace) const {
+void CYMessage::Output(CYOutput &out) const {

     out << (instance_ ? '-' : '+');
 
     CYForEach (parameter, parameters_)
     out << (instance_ ? '-' : '+');
 
     CYForEach (parameter, parameters_)