Fix support for multiple "block lambda" arguments.

[cycript.git] / ObjectiveC / Output.cpp

diff --git a/ObjectiveC/Output.cpp b/ObjectiveC/Output.cpp
index ee41e48c89221a616a5e8572821971c0340b4b6e..360a54e16c6fa2fa1627d745f49f9eca226a42d7 100644 (file)
--- a/ObjectiveC/Output.cpp
+++ b/ObjectiveC/Output.cpp
@@ -19,10 +19,11 @@
 **/
 /* }}} */
 
+#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){";
@@ -36,15 +37,12 @@ void CYCategory::Output(CYOutput &out, CYFlags flags) const {
     out << ';';
 }
 
-void CYClass::Output(CYOutput &out, CYFlags flags) const {
+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,";
-    if (name_ != NULL)
-        name_->ClassName(out, false);
-    else
-        out << "$cyq(\"CY$\")";
+    name_->ClassName(out, false);
     out << ",0);";
     out << "$cym=object_getClass($cyc);";
     if (fields_ != NULL)
@@ -66,14 +64,6 @@ void CYClass::Output(CYOutput &out, CYFlags flags) const {
     out << "))";
 }
 
-void CYClassExpression::Output(CYOutput &out, CYFlags flags) const {
-    CYClass::Output(out, flags);
-}
-
-void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
-    CYClass::Output(out, flags);
-}
-
 void CYClassField::Output(CYOutput &out) const {
 }