Manually unify CYLocal<CYPool>::key_ into Library.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 0caaad469544d96d81d18bf5ddb547a8ef9bba84..7578d7e8bddfefc8297d2ef0620cbd9e92461ddb 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2012  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/>.
 **/
 /* }}} */
@@ -24,31 +24,33 @@
 
 #include "Parser.hpp"
 
-struct CYEncodedPart :
-    CYNext<CYEncodedPart>
+struct CYInstanceLiteral :
+    CYExpression
 {
-    const char *name_;
-    CYArgument *arguments_;
+    CYNumber *number_;
 
-    CYEncodedPart(CYEncodedPart *next, const char *name, CYArgument *arguments = NULL) :
-        CYNext<CYEncodedPart>(next),
-        name_(name),
-        arguments_(arguments)
+    CYInstanceLiteral(CYNumber *number) :
+        number_(number)
     {
     }
 
-    CYExpression *Replace(CYContext &context, CYExpression *base);
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYEncodedType :
+struct CYObjCBlock :
     CYExpression
 {
-    CYExpression *base_;
-    CYEncodedPart *parts_;
-
-    CYEncodedType(CYExpression *base, CYEncodedPart *parts = NULL) :
-        base_(base),
-        parts_(parts)
+    CYTypedIdentifier *typed_;
+    CYTypedParameter *parameters_;
+    CYStatement *statements_;
+
+    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+        typed_(typed),
+        parameters_(parameters),
+        statements_(statements)
     {
     }
 
@@ -111,13 +113,11 @@ struct CYSelector :
 struct CYField :
     CYNext<CYField>
 {
-    CYExpression *type_;
-    CYIdentifier *name_;
+    CYTypedIdentifier *typed_;
 
-    CYField(CYExpression *type, CYIdentifier *name, CYField *next = NULL) :
+    CYField(CYTypedIdentifier *typed, CYField *next = NULL) :
         CYNext<CYField>(next),
-        type_(type),
-        name_(name)
+        typed_(typed)
     {
     }
 
@@ -183,13 +183,6 @@ struct CYProtocol :
     void Output(CYOutput &out) const;
 };
 
-struct CYImport :
-    CYStatement
-{
-    virtual CYStatement *Replace(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
 struct CYClass {
     CYClassName *name_;
     CYExpression *super_;