Do not allow JavaMethod calls on non-Java objects.

[cycript.git] / ObjectiveC / Syntax.hpp

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 5702171318c91d80bcb645e1a001f0ff58705549..d185f0db492146f03b874b4e5176e88d9035a5b0 100644 (file)
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2014  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)

 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -22,10 +22,10 @@
 #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 :
 
 struct CYInstanceLiteral :

-    CYExpression
+    CYTarget

 {
     CYNumber *number_;
 
 {
     CYNumber *number_;
 


@@ -36,32 +36,32 @@ struct CYInstanceLiteral :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

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

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

-    CYExpression
+    CYTarget

 {
 {

-    CYTypedIdentifier *typed_;
+    CYType *typed_;

     CYTypedParameter *parameters_;
     CYTypedParameter *parameters_;

-    CYStatement *statements_;
+    CYStatement *code_;

 
 

-    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+    CYObjCBlock(CYType *typed, CYTypedParameter *parameters, CYStatement *code) :

         typed_(typed),
         parameters_(parameters),
         typed_(typed),
         parameters_(parameters),

-        statements_(statements)
+        code_(code)

     {
     }
 
     CYPrecedence(1)
 
     {
     }
 
     CYPrecedence(1)
 

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

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

-    CYExpression
+    CYTarget

 {
     CYExpression *value_;
 
 {
     CYExpression *value_;
 


@@ -72,7 +72,53 @@ struct CYBox :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYObjCArray :
+    CYTarget
+{
+    CYElement *elements_;
+
+    CYObjCArray(CYElement *elements = NULL) :
+        elements_(elements)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYObjCKeyValue :
+    CYNext<CYObjCKeyValue>
+{
+    CYExpression *key_;
+    CYExpression *value_;
+
+    CYObjCKeyValue(CYExpression *key, CYExpression *value, CYObjCKeyValue *next) :
+        CYNext<CYObjCKeyValue>(next),
+        key_(key),
+        value_(value)
+    {
+    }
+};
+
+struct CYObjCDictionary :
+    CYTarget
+{
+    CYObjCKeyValue *pairs_;
+
+    CYObjCDictionary(CYObjCKeyValue *pairs) :
+        pairs_(pairs)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYTarget *Replace(CYContext &context);

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


@@ -97,27 +143,29 @@ struct CYSelectorPart :
 struct CYSelector :
     CYLiteral
 {
 struct CYSelector :
     CYLiteral
 {

-    CYSelectorPart *name_;
+    CYSelectorPart *parts_;

 
 

-    CYSelector(CYSelectorPart *name) :
-        name_(name)
+    CYSelector(CYSelectorPart *parts) :
+        parts_(parts)

     {
     }
 
     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_;
+    CYType *type_;
+    CYPropertyName *name_;

 
 

-    CYField(CYTypedIdentifier *typed, CYField *next = NULL) :
-        CYNext<CYField>(next),
-        typed_(typed)
+    CYImplementationField(CYType *type, CYPropertyName *name, CYImplementationField *next = NULL) :
+        CYNext<CYImplementationField>(next),
+        type_(type),
+        name_(name)

     {
     }
 
     {
     }
 


@@ -128,14 +176,15 @@ struct CYField :
 struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {
 struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {

-    CYWord *tag_;
-    CYTypedIdentifier *type_;
-    CYIdentifier *name_;
+    CYWord *name_;
+    CYType *type_;
+    CYIdentifier *identifier_;

 
 

-    CYMessageParameter(CYWord *tag, CYTypedIdentifier *type, CYIdentifier *name) :
-        tag_(tag),
+    CYMessageParameter(CYWord *name, CYType *type = NULL, CYIdentifier *identifier = NULL, CYMessageParameter *next = NULL) :
+        CYNext<CYMessageParameter>(next),
+        name_(name),

         type_(type),
         type_(type),

-        name_(name)
+        identifier_(identifier)

     {
     }
 
     {
     }
 


@@ -149,20 +198,20 @@ struct CYMessage :
     CYNext<CYMessage>
 {
     bool instance_;
     CYNext<CYMessage>
 {
     bool instance_;

-    CYTypedIdentifier *type_;
+    CYType *type_;

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

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

         instance_(instance),
         type_(type),
         instance_(instance),
         type_(type),

-        parameters_(parameter),
-        code_(statements)
+        parameters_(parameters),
+        code_(code)

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

-    void Output(CYOutput &out, bool replace) const;
+    void Output(CYOutput &out) const;

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


@@ -183,52 +232,25 @@ struct CYProtocol :
     void Output(CYOutput &out) const;
 };
 
     void Output(CYOutput &out) const;
 };
 

-struct CYClass {
-    CYClassName *name_;
-    CYExpression *super_;
+struct CYImplementation :
+    CYStatement
+{
+    CYIdentifier *name_;
+    CYExpression *extends_;

     CYProtocol *protocols_;
     CYProtocol *protocols_;

-    CYField *fields_;
+    CYImplementationField *fields_;

     CYMessage *messages_;
 
     CYMessage *messages_;
 

-    CYClass(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
+    CYImplementation(CYIdentifier *name, CYExpression *extends, CYProtocol *protocols, CYImplementationField *fields, CYMessage *messages) :

         name_(name),
         name_(name),

-        super_(super),
+        extends_(extends),

         protocols_(protocols),
         fields_(fields),
         messages_(messages)
     {
     }
 
         protocols_(protocols),
         fields_(fields),
         messages_(messages)
     {
     }
 

-    virtual ~CYClass() {
-    }
-
-    CYExpression *Replace_(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYClassExpression :
-    CYClass,
-    CYExpression
-{
-    CYClassExpression(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, protocols, fields, messages)
-    {
-    }
-
-    CYPrecedence(0)
-
-    virtual CYExpression *Replace(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYClassStatement :
-    CYClass,
-    CYStatement
-{
-    CYClassStatement(CYClassName *name, CYExpression *super, CYProtocol *protocols, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, protocols, fields, 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;


@@ -237,21 +259,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_;
 


@@ -276,7 +300,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;
 };
 


@@ -288,7 +312,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;
 };