X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/2385c806df15d62fc4ec2cac7913a975e3bafa13..c1d3e52e58e86c49f9d04e06ae8e0ece4b98250c:/ObjectiveC/Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index f4101fb..fe97782 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU Affero 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:
- *
- * 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.
- *
- * 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.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program 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 Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
 #ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
@@ -42,6 +24,58 @@
 
 #include "Parser.hpp"
 
+struct CYInstanceLiteral :
+    CYExpression
+{
+    CYNumber *number_;
+
+    CYInstanceLiteral(CYNumber *number) :
+        number_(number)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+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
@@ -79,6 +113,14 @@ struct CYSelector :
 struct CYField :
     CYNext<CYField>
 {
+    CYTypedIdentifier *typed_;
+
+    CYField(CYTypedIdentifier *typed, CYField *next = NULL) :
+        CYNext<CYField>(next),
+        typed_(typed)
+    {
+    }
+
     CYStatement *Replace(CYContext &context) const;
     void Output(CYOutput &out) const;
 };
@@ -87,10 +129,10 @@ struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {
     CYWord *tag_;
-    CYExpression *type_;
+    CYTypedIdentifier *type_;
     CYIdentifier *name_;
 
-    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
+    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type, CYIdentifier *name) :
         tag_(tag),
         type_(type),
         name_(name)
@@ -100,17 +142,18 @@ struct CYMessageParameter :
     CYFunctionParameter *Parameters(CYContext &context) const;
     CYSelector *Selector(CYContext &context) const;
     CYSelectorPart *SelectorPart(CYContext &context) const;
+    CYExpression *TypeSignature(CYContext &context) const;
 };
 
 struct CYMessage :
     CYNext<CYMessage>
 {
     bool instance_;
-    CYExpression *type_;
+    CYTypedIdentifier *type_;
     CYMessageParameter *parameters_;
     CYBlock code_;
 
-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *statements) :
+    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameter, CYStatement *statements) :
         instance_(instance),
         type_(type),
         parameters_(parameter),
@@ -120,17 +163,37 @@ struct CYMessage :
 
     CYStatement *Replace(CYContext &context, bool replace) const;
     void Output(CYOutput &out, bool replace) const;
+
+    CYExpression *TypeSignature(CYContext &context) const;
+};
+
+struct CYProtocol :
+    CYNext<CYProtocol>,
+    CYThing
+{
+    CYExpression *name_;
+
+    CYProtocol(CYExpression *name, CYProtocol *next = NULL) :
+        CYNext<CYProtocol>(next),
+        name_(name)
+    {
+    }
+
+    CYStatement *Replace(CYContext &context) const;
+    void Output(CYOutput &out) const;
 };
 
 struct CYClass {
     CYClassName *name_;
     CYExpression *super_;
+    CYProtocol *protocols_;
     CYField *fields_;
     CYMessage *messages_;
 
-    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
+    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
         name_(name),
         super_(super),
+        protocols_(protocols),
         fields_(fields),
         messages_(messages)
     {
@@ -147,8 +210,8 @@ struct CYClassExpression :
     CYClass,
     CYExpression
 {
-    CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYClassExpression(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+        CYClass(name, super, protocols, fields, messages)
     {
     }
 
@@ -162,8 +225,8 @@ struct CYClassStatement :
     CYClass,
     CYStatement
 {
-    CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+        CYClass(name, super, protocols, fields, messages)
     {
     }