Avoid ECMAScript6 conflicts with RubyBlock syntax.

[cycript.git] / ObjectiveC / Output.cpp

diff --git a/ObjectiveC/Output.cpp b/ObjectiveC/Output.cpp
index 05e8ff84badd030a0e8459f4083c12e8625313e1..9d0caa052c210681a4bed647fa2b0186a294e1dc 100644 (file)
--- a/ObjectiveC/Output.cpp
+++ b/ObjectiveC/Output.cpp
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -36,15 +36,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,15 +63,7 @@ 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 CYField::Output(CYOutput &out) const {
+void CYClassField::Output(CYOutput &out) const {
 }
 
 void CYInstanceLiteral::Output(CYOutput &out, CYFlags flags) const {
@@ -88,8 +77,8 @@ void CYMessage::Output(CYOutput &out, bool replace) const {
     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_;
         }
 
     out << code_;