Use explicit typed value for CYCatch error return.

[cycript.git] / ObjectiveC / Output.mm

diff --git a/ObjectiveC/Output.mm b/ObjectiveC/Output.mm
index 39d406694b1e85a88747a993a2e3b1c7e69f58bc..a2d765cbebc03164eacb03175fe22f46246b6388 100644 (file)
--- a/ObjectiveC/Output.mm
+++ b/ObjectiveC/Output.mm
@@ -1,46 +1,28 @@
-/* Cycript - Remote Execution Server and Disassembler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */

 /*
 /*

- *        Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * Cycript is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU Lesser General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.

  *
  *

- * 1. Redistributions of source code must retain the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- *    above copyright notice, this list of conditions
- *    and the following disclaimer in the documentation
- *    and/or other materials provided with the
- *    distribution.
- * 3. The name of the author may not be used to endorse
- *    or promote products derived from this software
- *    without specific prior written permission.
+ * Cycript is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
+ * License for more details.

  *
  *

- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 #include "Replace.hpp"
 #include "ObjectiveC/Syntax.hpp"
 
 /* }}} */
 
 #include "Replace.hpp"
 #include "ObjectiveC/Syntax.hpp"
 

-#include <objc/runtime.h>
+#include <Foundation/Foundation.h>

 #include <sstream>
 
 void CYCategory::Output(CYOutput &out, CYFlags flags) const {
 #include <sstream>
 
 void CYCategory::Output(CYOutput &out, CYFlags flags) const {


@@ -70,11 +52,16 @@ void CYClass::Output(CYOutput &out, CYFlags flags) const {
         fields_->Output(out);
     if (messages_ != NULL)
         messages_->Output(out, false);
         fields_->Output(out);
     if (messages_ != NULL)
         messages_->Output(out, false);

+    if (protocols_ != NULL) {
+        out << '<';
+        out << *protocols_;
+        out << '>';
+    }

     out << "objc_registerClassPair($cyc);";
     out << "return $cyc;";
     out << "}(";
     if (super_ != NULL)
     out << "objc_registerClassPair($cyc);";
     out << "return $cyc;";
     out << "}(";
     if (super_ != NULL)

-        super_->Output(out, CYPA, CYNoFlags);
+        super_->Output(out, CYAssign::Precedence_, CYNoFlags);

     else
         out << "null";
     out << "))";
     else
         out << "null";
     out << "))";


@@ -88,13 +75,23 @@ void CYClassStatement::Output(CYOutput &out, CYFlags flags) const {
     CYClass::Output(out, flags);
 }
 
     CYClass::Output(out, flags);
 }
 

+void CYEncodedType::Output(CYOutput &out, CYFlags flags) const {
+    out << "@encode(";
+    // XXX: this is seriously wrong
+    out << ")";
+}
+

 void CYField::Output(CYOutput &out) const {
 }
 
 void CYField::Output(CYOutput &out) const {
 }
 

+void CYImport::Output(CYOutput &out, CYFlags flags) const {
+    out << "@import";
+}
+

 void CYMessage::Output(CYOutput &out, bool replace) const {
     out << (instance_ ? '-' : '+');
 
 void CYMessage::Output(CYOutput &out, bool replace) const {
     out << (instance_ ? '-' : '+');
 

-    for (CYMessageParameter *parameter(parameters_); parameter != NULL; parameter = parameter->next_)
+    CYForEach (parameter, parameters_)

         if (parameter->tag_ != NULL) {
             out << ' ' << *parameter->tag_;
             if (parameter->name_ != NULL)
         if (parameter->tag_ != NULL) {
             out << ' ' << *parameter->tag_;
             if (parameter->name_ != NULL)


@@ -104,6 +101,25 @@ void CYMessage::Output(CYOutput &out, bool replace) const {
     out << code_;
 }
 
     out << code_;
 }
 

+void CYBox::Output(CYOutput &out, CYFlags flags) const {
+    out << '@';
+    value_->Output(out, Precedence(), CYRight(flags));
+}
+
+void CYObjCBlock::Output(CYOutput &out, CYFlags flags) const {
+    // XXX: this is seriously wrong
+    out << "^(";
+    out << ")";
+    out << "{";
+    out << "}";
+}
+
+void CYProtocol::Output(CYOutput &out) const {
+    name_->Output(out, CYAssign::Precedence_, CYNoFlags);
+    if (next_ != NULL)
+        out << ',' << ' ' << *next_;
+}
+

 void CYSelector::Output(CYOutput &out, CYFlags flags) const {
     out << "@selector" << '(' << name_ << ')';
 }
 void CYSelector::Output(CYOutput &out, CYFlags flags) const {
     out << "@selector" << '(' << name_ << ')';
 }


@@ -116,7 +132,7 @@ void CYSelectorPart::Output(CYOutput &out) const {
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {
 }
 
 void CYSend::Output(CYOutput &out, CYFlags flags) const {

-    for (CYArgument *argument(arguments_); argument != NULL; argument = argument->next_)
+    CYForEach (argument, arguments_)

         if (argument->name_ != NULL) {
             out << ' ' << *argument->name_;
             if (argument->value_ != NULL)
         if (argument->name_ != NULL) {
             out << ' ' << *argument->name_;
             if (argument->value_ != NULL)


@@ -126,7 +142,7 @@ void CYSend::Output(CYOutput &out, CYFlags flags) const {
 
 void CYSendDirect::Output(CYOutput &out, CYFlags flags) const {
     out << '[';
 
 void CYSendDirect::Output(CYOutput &out, CYFlags flags) const {
     out << '[';

-    self_->Output(out, CYPA, CYNoFlags);
+    self_->Output(out, CYAssign::Precedence_, CYNoFlags);

     CYSend::Output(out, flags);
     out << ']';
 }
     CYSend::Output(out, flags);
     out << ']';
 }