Reboot variable renaming for lexical name scoping.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index f4101fb547783a585de01887b82bdf839ab87ff5..aa55a42bc16be489116f41c0abd58f7c58ad6797 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,46 +1,80 @@
-/* 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
 #define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 
 /* }}} */
 
 #ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 #define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
 

-#include "Parser.hpp"
+#include "../Syntax.hpp"
+
+struct CYInstanceLiteral :
+    CYTarget
+{
+    CYNumber *number_;
+
+    CYInstanceLiteral(CYNumber *number) :
+        number_(number)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYObjCBlock :
+    CYTarget
+{
+    CYTypedIdentifier *typed_;
+    CYTypedParameter *parameters_;
+    CYStatement *code_;
+
+    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *code) :
+        typed_(typed),
+        parameters_(parameters),
+        code_(code)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYBox :
+    CYTarget
+{
+    CYExpression *value_;
+
+    CYBox(CYExpression *value) :
+        value_(value)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};

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


@@ -72,13 +106,21 @@ struct CYSelector :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYField :
-    CYNext<CYField>
+struct CYImplementationField :
+    CYNext<CYImplementationField>

 {
 {

+    CYTypedIdentifier *typed_;
+
+    CYImplementationField(CYTypedIdentifier *typed, CYImplementationField *next = NULL) :
+        CYNext<CYImplementationField>(next),
+        typed_(typed)
+    {
+    }
+

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


@@ -87,86 +129,78 @@ struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {
     CYWord *tag_;
     CYNext<CYMessageParameter>
 {
     CYWord *tag_;

-    CYExpression *type_;
-    CYIdentifier *name_;
+    CYTypedIdentifier *type_;

 
 

-    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
+    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type) :

         tag_(tag),
         tag_(tag),

-        type_(type),
-        name_(name)
+        type_(type)

     {
     }
 
     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 :
     CYNext<CYMessage>
 {
     bool instance_;
 };
 
 struct CYMessage :
     CYNext<CYMessage>
 {
     bool instance_;

-    CYExpression *type_;
+    CYTypedIdentifier *type_;

     CYMessageParameter *parameters_;
     CYBlock code_;
 
     CYMessageParameter *parameters_;
     CYBlock code_;
 

-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *statements) :
+    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameter, CYStatement *code) :

         instance_(instance),
         type_(type),
         parameters_(parameter),
         instance_(instance),
         type_(type),
         parameters_(parameter),

-        code_(statements)
+        code_(code)

     {
     }
 
     CYStatement *Replace(CYContext &context, bool replace) const;
     {
     }
 
     CYStatement *Replace(CYContext &context, bool replace) const;

-    void Output(CYOutput &out, bool replace) const;
-};
-
-struct CYClass {
-    CYClassName *name_;
-    CYExpression *super_;
-    CYField *fields_;
-    CYMessage *messages_;
-
-    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        name_(name),
-        super_(super),
-        fields_(fields),
-        messages_(messages)
-    {
-    }
-
-    virtual ~CYClass() {
-    }
+    void Output(CYOutput &out) const;

 
 

-    CYExpression *Replace_(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    CYExpression *TypeSignature(CYContext &context) const;

 };
 
 };
 

-struct CYClassExpression :
-    CYClass,
-    CYExpression
+struct CYProtocol :
+    CYNext<CYProtocol>,
+    CYThing

 {
 {

-    CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYExpression *name_;
+
+    CYProtocol(CYExpression *name, CYProtocol *next = NULL) :
+        CYNext<CYProtocol>(next),
+        name_(name)

     {
     }
 
     {
     }
 

-    CYPrecedence(0)
-
-    virtual CYExpression *Replace(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    CYStatement *Replace(CYContext &context) const;
+    void Output(CYOutput &out) const;

 };
 
 };
 

-struct CYClassStatement :
-    CYClass,
+struct CYImplementation :

     CYStatement
 {
     CYStatement
 {

-    CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYIdentifier *name_;
+    CYExpression *super_;
+    CYProtocol *protocols_;
+    CYImplementationField *fields_;
+    CYMessage *messages_;
+
+    CYImplementation(CYIdentifier *name, CYExpression *super, CYProtocol *protocols, CYImplementationField *fields, CYMessage *messages) :
+        name_(name),
+        super_(super),
+        protocols_(protocols),
+        fields_(fields),
+        messages_(messages)

     {
     }
 
     {
     }
 

+    CYCompact(None)
+

     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };


@@ -174,21 +208,23 @@ struct CYClassStatement :
 struct CYCategory :
     CYStatement
 {
 struct CYCategory :
     CYStatement
 {

-    CYClassName *name_;
+    CYIdentifier *name_;

     CYMessage *messages_;
 
     CYMessage *messages_;
 

-    CYCategory(CYClassName *name, CYMessage *messages) :
+    CYCategory(CYIdentifier *name, CYMessage *messages) :

         name_(name),
         messages_(messages)
     {
     }
 
         name_(name),
         messages_(messages)
     {
     }
 

+    CYCompact(None)
+

     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYSend :
     virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYSend :

-    CYExpression
+    CYTarget

 {
     CYArgument *arguments_;
 
 {
     CYArgument *arguments_;
 


@@ -213,7 +249,7 @@ struct CYSendDirect :
     {
     }
 
     {
     }
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 


@@ -225,7 +261,7 @@ struct CYSendSuper :
     {
     }
 
     {
     }
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };