X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/690cf1a8442f51ef6d03d9a0a4fb4ee2e9bb714d..17e71f88011c8c04350d38e999ac9047152e7325:/ObjectiveC/Syntax.hpp
diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 343cb37..f47d935 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,67 +1,67 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2013 Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016 Jay Freeman (saurik)
*/
-/* GNU General Public License, Version 3 {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
/*
- * 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
+ * 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Cycript. If not, see .
+ * 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 .
**/
/* }}} */
#ifndef CYCRIPT_OBJECTIVEC_SYNTAX_HPP
#define CYCRIPT_OBJECTIVEC_SYNTAX_HPP
-#include "Parser.hpp"
+#include "../Syntax.hpp"
-struct CYObjCBlock :
- CYExpression
+struct CYInstanceLiteral :
+ CYTarget
{
- CYTypeModifier *type_;
- CYTypedParameter *parameters_;
- CYStatement *statements_;
+ CYNumber *number_;
- CYObjCBlock(CYTypeModifier *type, CYTypedParameter *parameters, CYStatement *statements) :
- type_(type),
- parameters_(parameters),
- statements_(statements)
+ CYInstanceLiteral(CYNumber *number) :
+ number_(number)
{
}
CYPrecedence(1)
- virtual CYExpression *Replace(CYContext &context);
+ virtual CYTarget *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYEncodedType :
- CYExpression
+struct CYObjCBlock :
+ CYTarget
{
- CYTypeModifier *type_;
+ CYTypedIdentifier *typed_;
+ CYTypedParameter *parameters_;
+ CYStatement *code_;
- CYEncodedType(CYTypeModifier *type) :
- type_(type)
+ CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *code) :
+ typed_(typed),
+ parameters_(parameters),
+ code_(code)
{
}
CYPrecedence(1)
- virtual CYExpression *Replace(CYContext &context);
+ virtual CYTarget *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYBox :
- CYExpression
+ CYTarget
{
CYExpression *value_;
@@ -72,7 +72,53 @@ struct CYBox :
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
+{
+ CYExpression *key_;
+ CYExpression *value_;
+
+ CYObjCKeyValue(CYExpression *key, CYExpression *value, CYObjCKeyValue *next) :
+ CYNext(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;
};
@@ -97,29 +143,27 @@ struct CYSelectorPart :
struct CYSelector :
CYLiteral
{
- CYSelectorPart *name_;
+ CYSelectorPart *parts_;
- CYSelector(CYSelectorPart *name) :
- name_(name)
+ CYSelector(CYSelectorPart *parts) :
+ parts_(parts)
{
}
CYPrecedence(1)
- virtual CYExpression *Replace(CYContext &context);
+ virtual CYTarget *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
-struct CYField :
- CYNext
+struct CYImplementationField :
+ CYNext
{
- CYExpression *type_;
- CYIdentifier *name_;
+ CYTypedIdentifier *typed_;
- CYField(CYExpression *type, CYIdentifier *name, CYField *next = NULL) :
- CYNext(next),
- type_(type),
- name_(name)
+ CYImplementationField(CYTypedIdentifier *typed, CYImplementationField *next = NULL) :
+ CYNext(next),
+ typed_(typed)
{
}
@@ -130,14 +174,13 @@ struct CYField :
struct CYMessageParameter :
CYNext
{
- CYWord *tag_;
- CYExpression *type_;
- CYIdentifier *name_;
+ CYWord *name_;
+ CYTypedIdentifier *type_;
- CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
- tag_(tag),
- type_(type),
- name_(name)
+ CYMessageParameter(CYWord *name, CYTypedIdentifier *type, CYMessageParameter *next = NULL) :
+ CYNext(next),
+ name_(name),
+ type_(type)
{
}
@@ -151,20 +194,20 @@ struct CYMessage :
CYNext
{
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 *parameters, CYStatement *code) :
instance_(instance),
type_(type),
- parameters_(parameter),
- code_(statements)
+ parameters_(parameters),
+ code_(code)
{
}
CYStatement *Replace(CYContext &context, bool replace) const;
- void Output(CYOutput &out, bool replace) const;
+ void Output(CYOutput &out) const;
CYExpression *TypeSignature(CYContext &context) const;
};
@@ -185,59 +228,25 @@ struct CYProtocol :
void Output(CYOutput &out) const;
};
-struct CYImport :
+struct CYImplementation :
CYStatement
{
- virtual CYStatement *Replace(CYContext &context);
- virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYClass {
- CYClassName *name_;
- CYExpression *super_;
+ CYIdentifier *name_;
+ CYExpression *extends_;
CYProtocol *protocols_;
- CYField *fields_;
+ CYImplementationField *fields_;
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),
- super_(super),
+ extends_(extends),
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;
@@ -246,21 +255,23 @@ struct CYClassStatement :
struct CYCategory :
CYStatement
{
- CYClassName *name_;
+ CYIdentifier *name_;
CYMessage *messages_;
- CYCategory(CYClassName *name, CYMessage *messages) :
+ CYCategory(CYIdentifier *name, CYMessage *messages) :
name_(name),
messages_(messages)
{
}
+ CYCompact(None)
+
virtual CYStatement *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
struct CYSend :
- CYExpression
+ CYTarget
{
CYArgument *arguments_;
@@ -285,7 +296,7 @@ struct CYSendDirect :
{
}
- virtual CYExpression *Replace(CYContext &context);
+ virtual CYTarget *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};
@@ -297,7 +308,7 @@ struct CYSendSuper :
{
}
- virtual CYExpression *Replace(CYContext &context);
+ virtual CYTarget *Replace(CYContext &context);
virtual void Output(CYOutput &out, CYFlags flags) const;
};