X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/574d47203e63ac4a85f0d609098118d19e6bbf09..97bec96b43b66ab78af95d2b6c6c24f0d0a8006a:/ObjectiveC/Syntax.hpp?ds=sidebyside

diff --git a/ObjectiveC/Syntax.hpp b/ObjectiveC/Syntax.hpp
index 8969357..d185f0d 100644
--- a/ObjectiveC/Syntax.hpp
+++ b/ObjectiveC/Syntax.hpp
@@ -1,5 +1,5 @@
-/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2015  Jay Freeman (saurik)
+/* Cycript - The Truly Universal Scripting Language
+ * Copyright (C) 2009-2016  Jay Freeman (saurik)
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */
@@ -43,11 +43,11 @@ struct CYInstanceLiteral :
 struct CYObjCBlock :
     CYTarget
 {
-    CYTypedIdentifier *typed_;
+    CYType *typed_;
     CYTypedParameter *parameters_;
     CYStatement *code_;
 
-    CYObjCBlock(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *code) :
+    CYObjCBlock(CYType *typed, CYTypedParameter *parameters, CYStatement *code) :
         typed_(typed),
         parameters_(parameters),
         code_(code)
@@ -159,11 +159,13 @@ struct CYSelector :
 struct CYImplementationField :
     CYNext<CYImplementationField>
 {
-    CYTypedIdentifier *typed_;
+    CYType *type_;
+    CYPropertyName *name_;
 
-    CYImplementationField(CYTypedIdentifier *typed, CYImplementationField *next = NULL) :
+    CYImplementationField(CYType *type, CYPropertyName *name, CYImplementationField *next = NULL) :
         CYNext<CYImplementationField>(next),
-        typed_(typed)
+        type_(type),
+        name_(name)
     {
     }
 
@@ -175,12 +177,14 @@ struct CYMessageParameter :
     CYNext<CYMessageParameter>
 {
     CYWord *name_;
-    CYTypedIdentifier *type_;
+    CYType *type_;
+    CYIdentifier *identifier_;
 
-    CYMessageParameter(CYWord *name, CYTypedIdentifier *type, CYMessageParameter *next = NULL) :
+    CYMessageParameter(CYWord *name, CYType *type = NULL, CYIdentifier *identifier = NULL, CYMessageParameter *next = NULL) :
         CYNext<CYMessageParameter>(next),
         name_(name),
-        type_(type)
+        type_(type),
+        identifier_(identifier)
     {
     }
 
@@ -194,11 +198,11 @@ struct CYMessage :
     CYNext<CYMessage>
 {
     bool instance_;
-    CYTypedIdentifier *type_;
+    CYType *type_;
     CYMessageParameter *parameters_;
     CYBlock code_;
 
-    CYMessage(bool instance, CYTypedIdentifier *type, CYMessageParameter *parameters, CYStatement *code) :
+    CYMessage(bool instance, CYType *type, CYMessageParameter *parameters, CYStatement *code) :
         instance_(instance),
         type_(type),
         parameters_(parameters),