The objc_registerClassPair hack is not even there.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index a5e826de70c899a1843dca6f775fac7f3ff423dc..618a25e87659e9bf7e574eb228449e9b2ac99b13 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

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

 /*
 /*

- * 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.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * 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.
+ * 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 General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -24,6 +24,42 @@
 
 #include "Parser.hpp"
 
 
 #include "Parser.hpp"
 

+struct CYObjCBlock :
+    CYExpression
+{
+    CYTypedIdentifier *typed_;
+    CYTypedParameter *parameters_;
+    CYStatement *statements_;
+
+    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+        typed_(typed),
+        parameters_(parameters),
+        statements_(statements)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYBox :
+    CYExpression
+{
+    CYExpression *value_;
+
+    CYBox(CYExpression *value) :
+        value_(value)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYSelectorPart :
     CYNext<CYSelectorPart>,
     CYThing
 struct CYSelectorPart :
     CYNext<CYSelectorPart>,
     CYThing


@@ -61,6 +97,16 @@ struct CYSelector :
 struct CYField :
     CYNext<CYField>
 {
 struct CYField :
     CYNext<CYField>
 {

+    CYExpression *type_;
+    CYIdentifier *name_;
+
+    CYField(CYExpression *type, CYIdentifier *name, CYField *next = NULL) :
+        CYNext<CYField>(next),
+        type_(type),
+        name_(name)
+    {
+    }
+

     CYStatement *Replace(CYContext &context) const;
     void Output(CYOutput &out) const;
 };
     CYStatement *Replace(CYContext &context) const;
     void Output(CYOutput &out) const;
 };


@@ -82,6 +128,7 @@ struct CYMessageParameter :
     CYFunctionParameter *Parameters(CYContext &context) const;
     CYSelector *Selector(CYContext &context) const;
     CYSelectorPart *SelectorPart(CYContext &context) const;
     CYFunctionParameter *Parameters(CYContext &context) const;
     CYSelector *Selector(CYContext &context) const;
     CYSelectorPart *SelectorPart(CYContext &context) const;

+    CYExpression *TypeSignature(CYContext &context) const;

 };
 
 struct CYMessage :
 };
 
 struct CYMessage :


@@ -102,6 +149,8 @@ struct CYMessage :
 
     CYStatement *Replace(CYContext &context, bool replace) const;
     void Output(CYOutput &out, bool replace) const;
 
     CYStatement *Replace(CYContext &context, bool replace) const;
     void Output(CYOutput &out, bool replace) const;

+
+    CYExpression *TypeSignature(CYContext &context) const;

 };
 
 struct CYProtocol :
 };
 
 struct CYProtocol :