Fix multi-line template strings, removing ?expand.

[cycript.git] / Syntax.hpp

diff --git a/Syntax.hpp b/Syntax.hpp
index f34c4120e8c7b8f8c3f4f4940bca8b29d69bb2e6..a3dad90021400de93df1b69430a257eee6ffbf70 100644 (file)
--- a/Syntax.hpp
+++ b/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 {{{ */
 */
 
 /* GNU Affero General Public License, Version 3 {{{ */


@@ -33,6 +33,25 @@
 #include "Location.hpp"
 #include "Options.hpp"
 #include "Pooling.hpp"
 #include "Location.hpp"
 #include "Options.hpp"
 #include "Pooling.hpp"

+#include "String.hpp"
+
+double CYCastDouble(const char *value, size_t size);
+double CYCastDouble(const char *value);
+double CYCastDouble(CYUTF8String value);
+
+void CYNumerify(std::ostringstream &str, double value);
+
+enum CYStringifyMode {
+    CYStringifyModeLegacy,
+    CYStringifyModeCycript,
+    CYStringifyModeNative,
+};
+
+void CYStringify(std::ostringstream &str, const char *data, size_t size, CYStringifyMode mode);
+
+// XXX: this really should not be here ... :/
+void *CYPoolFile(CYPool &pool, const char *path, size_t *psize);
+CYUTF8String CYPoolFileUTF8String(CYPool &pool, const char *path);

 
 struct CYContext;
 
 
 struct CYContext;
 


@@ -108,6 +127,8 @@ struct CYOutput {
 
 struct CYExpression;
 struct CYAssignment;
 
 struct CYExpression;
 struct CYAssignment;

+struct CYIdentifier;
+struct CYNumber;

 
 struct CYPropertyName {
     virtual bool Computed() const {
 
 struct CYPropertyName {
     virtual bool Computed() const {


@@ -118,6 +139,14 @@ struct CYPropertyName {
         return false;
     }
 
         return false;
     }
 

+    virtual CYIdentifier *Identifier() {
+        return NULL;
+    }
+
+    virtual CYNumber *Number(CYContext &context) {
+        return NULL;
+    }
+

     virtual CYExpression *PropertyName(CYContext &context) = 0;
     virtual void PropertyName(CYOutput &out) const = 0;
 };
     virtual CYExpression *PropertyName(CYContext &context) = 0;
     virtual void PropertyName(CYOutput &out) const = 0;
 };


@@ -138,6 +167,7 @@ enum CYFlags {
     CYNoRightHand =  (1 << 5),
     CYNoDangle =     (1 << 6),
     CYNoInteger =    (1 << 7),
     CYNoRightHand =  (1 << 5),
     CYNoDangle =     (1 << 6),
     CYNoInteger =    (1 << 7),

+    CYNoColon =      (1 << 8),

     CYNoBFC =        (CYNoBrace | CYNoFunction | CYNoClass),
 };
 
     CYNoBFC =        (CYNoBrace | CYNoFunction | CYNoClass),
 };
 


@@ -258,6 +288,10 @@ struct CYIdentifier :
     {
     }
 
     {
     }
 

+    CYIdentifier *Identifier() override {
+        return this;
+    }
+

     virtual const char *Word() const;
     CYIdentifier *Replace(CYContext &context, CYIdentifierKind);
 };
     virtual const char *Word() const;
     CYIdentifier *Replace(CYContext &context, CYIdentifierKind);
 };


@@ -522,6 +556,10 @@ struct CYTarget :
         return false;
     }
 
         return false;
     }
 

+    virtual bool IsNew() const {
+        return false;
+    }
+

     virtual CYStatement *Initialize(CYContext &context, CYExpression *value);
 
     virtual CYTarget *Replace(CYContext &context) = 0;
     virtual CYStatement *Initialize(CYContext &context, CYExpression *value);
 
     virtual CYTarget *Replace(CYContext &context) = 0;


@@ -763,6 +801,7 @@ struct CYString :
         return value_;
     }
 
         return value_;
     }
 

+    virtual CYIdentifier *Identifier() const;

     virtual const char *Word() const;
 
     virtual CYNumber *Number(CYContext &context);
     virtual const char *Word() const;
 
     virtual CYNumber *Number(CYContext &context);


@@ -807,6 +846,8 @@ struct CYTemplate :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

+    virtual CYString *String(CYContext &context);
+

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


@@ -950,6 +991,22 @@ struct CYVariable :
     virtual CYFunctionParameter *Parameter() const;
 };
 
     virtual CYFunctionParameter *Parameter() const;
 };
 

+struct CYSymbol :
+    CYTarget
+{
+    const char *name_;
+
+    CYSymbol(const char *name) :
+        name_(name)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYPrefix :
     CYExpression
 {
 struct CYPrefix :
     CYExpression
 {


@@ -1077,21 +1134,26 @@ struct CYClause :
 };
 
 struct CYElement :
 };
 
 struct CYElement :

+    CYNext<CYElement>,

     CYThing
 {
     CYThing
 {

+    CYElement(CYElement *next) :
+        CYNext<CYElement>(next)
+    {
+    }
+

     virtual bool Elision() const = 0;
 
     virtual void Replace(CYContext &context) = 0;
 };
 
 struct CYElementValue :
     virtual bool Elision() const = 0;
 
     virtual void Replace(CYContext &context) = 0;
 };
 
 struct CYElementValue :

-    CYNext<CYElement>,

     CYElement
 {
     CYExpression *value_;
 
     CYElementValue(CYExpression *value, CYElement *next = NULL) :
     CYElement
 {
     CYExpression *value_;
 
     CYElementValue(CYExpression *value, CYElement *next = NULL) :

-        CYNext<CYElement>(next),
+        CYElement(next),

         value_(value)
     {
     }
         value_(value)
     {
     }


@@ -1109,7 +1171,8 @@ struct CYElementSpread :
 {
     CYExpression *value_;
 
 {
     CYExpression *value_;
 

-    CYElementSpread(CYExpression *value) :
+    CYElementSpread(CYExpression *value, CYElement *next = NULL) :
+        CYElement(next),

         value_(value)
     {
     }
         value_(value)
     {
     }


@@ -1381,6 +1444,8 @@ struct CYObject :
     {
     }
 
     {
     }
 

+    CYTarget *Replace(CYContext &context, CYTarget *seed);
+

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


@@ -1430,6 +1495,34 @@ struct CYIndirectMember :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYResolveMember :
+    CYMember
+{
+    CYResolveMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYSubscriptMember :
+    CYMember
+{
+    CYSubscriptMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 namespace cy {
 namespace Syntax {
 
 namespace cy {
 namespace Syntax {
 


@@ -1449,6 +1542,9 @@ struct New :
         return arguments_ == NULL ? 2 : 1;
     }
 
         return arguments_ == NULL ? 2 : 1;
     }
 

+    virtual bool IsNew() const {
+        return true;
+    }

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


@@ -1502,26 +1598,55 @@ struct CYEval :
 
 struct CYRubyProc;
 
 
 struct CYRubyProc;
 

-struct CYRubyBlock :
+struct CYBraced :

     CYTarget
 {
     CYTarget
 {

-    CYExpression *call_;
-    CYRubyProc *proc_;
+    CYTarget *lhs_;

 
 

-    CYRubyBlock(CYExpression *call, CYRubyProc *proc) :
-        call_(call),
-        proc_(proc)
+    CYBraced(CYTarget *lhs = NULL) :
+        lhs_(lhs)

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

+    void SetLeft(CYTarget *lhs) {
+        lhs_ = lhs;
+    }
+};
+
+struct CYRubyBlock :
+    CYBraced
+{
+    CYRubyProc *proc_;
+
+    CYRubyBlock(CYTarget *lhs, CYRubyProc *proc) :
+        CYBraced(lhs),
+        proc_(proc)
+    {
+    }
+

     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);
 };
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);
 };
 

+struct CYExtend :
+    CYBraced
+{
+    CYObject object_;
+
+    CYExtend(CYTarget *lhs, CYProperty *properties = NULL) :
+        CYBraced(lhs),
+        object_(properties)
+    {
+    }
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYIf :
     CYStatement
 {
 struct CYIf :
     CYStatement
 {


@@ -1951,23 +2076,33 @@ struct CYTypeError :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeVoid :
+enum CYTypeSigning {
+    CYTypeNeutral,
+    CYTypeSigned,
+    CYTypeUnsigned,
+};
+
+struct CYTypeCharacter :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeVoid() {
+    CYTypeSigning signing_;
+
+    CYTypeCharacter(CYTypeSigning signing) :
+        signing_(signing)
+    {

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

-struct CYTypeReference :
+struct CYTypeInt128 :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYIdentifier *name_;
+    CYTypeSigning signing_;

 
 

-    CYTypeReference(CYIdentifier *name) :
-        name_(name)
+    CYTypeInt128(CYTypeSigning signing) :
+        signing_(signing)

     {
     }
 
     {
     }
 


@@ -1975,60 +2110,74 @@ struct CYTypeReference :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeVariable :
+struct CYTypeIntegral :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYIdentifier *name_;
+    CYTypeSigning signing_;
+    int length_;

 
 

-    CYTypeVariable(CYIdentifier *name) :
-        name_(name)
+    CYTypeIntegral(CYTypeSigning signing, int length = 1) :
+        signing_(signing),
+        length_(length)

     {
     }
 
     {
     }
 

-    CYTypeVariable(const char *name) :
-        name_(new($pool) CYIdentifier(name))
-    {
+    CYTypeIntegral *Long() {
+        if (length_ != 1 && length_ != 2)
+            return NULL;
+        ++length_;
+        return this;

     }
 
     }
 

-    virtual CYTarget *Replace(CYContext &context);
-    virtual void Output(CYOutput &out) const;
-};
+    CYTypeIntegral *Short() {
+        if (length_ != 1)
+            return NULL;
+        --length_;
+        return this;
+    }

 
 

-struct CYTypeUnsigned :
-    CYTypeSpecifier
-{
-    CYTypeSpecifier *specifier_;
+    CYTypeIntegral *Signed() {
+        if (signing_ != CYTypeNeutral)
+            return NULL;
+        signing_ = CYTypeSigned;
+        return this;
+    }

 
 

-    CYTypeUnsigned(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
-    {
+    CYTypeIntegral *Unsigned() {
+        if (signing_ != CYTypeNeutral)
+            return NULL;
+        signing_ = CYTypeUnsigned;
+        return this;

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

-struct CYTypeSigned :
+struct CYTypeVoid :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeSpecifier *specifier_;
-
-    CYTypeSigned(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
-    {
+    CYTypeVoid() {

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

-struct CYTypeLong :
+enum CYTypeReferenceKind {
+    CYTypeReferenceStruct,
+    CYTypeReferenceEnum,
+};
+
+struct CYTypeReference :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeSpecifier *specifier_;
+    CYTypeReferenceKind kind_;
+    CYIdentifier *name_;

 
 

-    CYTypeLong(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
+    CYTypeReference(CYTypeReferenceKind kind, CYIdentifier *name) :
+        kind_(kind),
+        name_(name)

     {
     }
 
     {
     }
 


@@ -2036,13 +2185,18 @@ struct CYTypeLong :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTypeShort :
+struct CYTypeVariable :

     CYTypeSpecifier
 {
     CYTypeSpecifier
 {

-    CYTypeSpecifier *specifier_;
+    CYIdentifier *name_;
+
+    CYTypeVariable(CYIdentifier *name) :
+        name_(name)
+    {
+    }

 
 

-    CYTypeShort(CYTypeSpecifier *specifier) :
-        specifier_(specifier)
+    CYTypeVariable(const char *name) :
+        name_(new($pool) CYIdentifier(name))

     {
     }
 
     {
     }
 


@@ -2065,8 +2219,8 @@ struct CYTypeModifier :
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type) = 0;
     CYTarget *Replace(CYContext &context, CYTarget *type);
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type) = 0;
     CYTarget *Replace(CYContext &context, CYTarget *type);
 

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const = 0;
-    void Output(CYOutput &out, int precedence, CYIdentifier *identifier) const;
+    virtual void Output(CYOutput &out, CYPropertyName *name) const = 0;
+    void Output(CYOutput &out, int precedence, CYPropertyName *name, bool space) const;

 
     virtual CYTypeFunctionWith *Function() { return NULL; }
 };
 
     virtual CYTypeFunctionWith *Function() { return NULL; }
 };


@@ -2085,7 +2239,7 @@ struct CYTypeArrayOf :
     CYPrecedence(1)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     CYPrecedence(1)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+    void Output(CYOutput &out, CYPropertyName *name) const override;

 };
 
 struct CYTypeConstant :
 };
 
 struct CYTypeConstant :


@@ -2099,7 +2253,7 @@ struct CYTypeConstant :
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+    void Output(CYOutput &out, CYPropertyName *name) const override;

 };
 
 struct CYTypePointerTo :
 };
 
 struct CYTypePointerTo :


@@ -2113,7 +2267,7 @@ struct CYTypePointerTo :
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+    void Output(CYOutput &out, CYPropertyName *name) const override;

 };
 
 struct CYTypeVolatile :
 };
 
 struct CYTypeVolatile :


@@ -2127,50 +2281,63 @@ struct CYTypeVolatile :
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+    void Output(CYOutput &out, CYPropertyName *name) const override;

 };
 
 };
 

-struct CYTypedIdentifier :
-    CYNext<CYTypedIdentifier>,
+struct CYType :

     CYThing
 {
     CYThing
 {

-    CYLocation location_;
-    CYIdentifier *identifier_;

     CYTypeSpecifier *specifier_;
     CYTypeModifier *modifier_;
 
     CYTypeSpecifier *specifier_;
     CYTypeModifier *modifier_;
 

-    CYTypedIdentifier(const CYLocation &location, CYIdentifier *identifier = NULL) :
-        location_(location),
-        identifier_(identifier),
-        specifier_(NULL),
-        modifier_(NULL)
-    {
-    }
-
-    CYTypedIdentifier(CYTypeSpecifier *specifier, CYTypeModifier *modifier = NULL) :
-        identifier_(NULL),
+    CYType(CYTypeSpecifier *specifier = NULL, CYTypeModifier *modifier = NULL) :

         specifier_(specifier),
         modifier_(modifier)
     {
     }
 
         specifier_(specifier),
         modifier_(modifier)
     {
     }
 

-    inline CYTypedIdentifier *Modify(CYTypeModifier *modifier) {
+    inline CYType *Modify(CYTypeModifier *modifier) {

         CYSetLast(modifier_) = modifier;
         return this;
     }
 
         CYSetLast(modifier_) = modifier;
         return this;
     }
 

+    void Output(CYOutput &out, CYPropertyName *name) const;
+

     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 
     CYTypeFunctionWith *Function();
 };
 
     virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 
     CYTypeFunctionWith *Function();
 };
 

+struct CYTypedLocation :
+    CYType
+{
+    CYLocation location_;
+
+    CYTypedLocation(const CYLocation &location) :
+        location_(location)
+    {
+    }
+};
+
+struct CYTypedName :
+    CYTypedLocation
+{
+    CYPropertyName *name_;
+
+    CYTypedName(const CYLocation &location, CYPropertyName *name = NULL) :
+        CYTypedLocation(location),
+        name_(name)
+    {
+    }
+};
+

 struct CYEncodedType :
     CYTarget
 {
 struct CYEncodedType :
     CYTarget
 {

-    CYTypedIdentifier *typed_;
+    CYType *typed_;

 
 

-    CYEncodedType(CYTypedIdentifier *typed) :
+    CYEncodedType(CYType *typed) :

         typed_(typed)
     {
     }
         typed_(typed)
     {
     }


@@ -2185,11 +2352,13 @@ struct CYTypedParameter :
     CYNext<CYTypedParameter>,
     CYThing
 {
     CYNext<CYTypedParameter>,
     CYThing
 {

-    CYTypedIdentifier *typed_;
+    CYType *type_;
+    CYIdentifier *name_;

 
 

-    CYTypedParameter(CYTypedIdentifier *typed, CYTypedParameter *next) :
+    CYTypedParameter(CYType *type, CYIdentifier *name, CYTypedParameter *next = NULL) :

         CYNext<CYTypedParameter>(next),
         CYNext<CYTypedParameter>(next),

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

     {
     }
 
     {
     }
 


@@ -2200,14 +2369,25 @@ struct CYTypedParameter :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

+struct CYTypedFormal {
+    bool variadic_;
+    CYTypedParameter *parameters_;
+
+    CYTypedFormal(bool variadic) :
+        variadic_(variadic),
+        parameters_(NULL)
+    {
+    }
+};
+

 struct CYLambda :
     CYTarget
 {
 struct CYLambda :
     CYTarget
 {

-    CYTypedIdentifier *typed_;
+    CYType *typed_;

     CYTypedParameter *parameters_;
     CYStatement *code_;
 
     CYTypedParameter *parameters_;
     CYStatement *code_;
 

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

         typed_(typed),
         parameters_(parameters),
         code_(code)
         typed_(typed),
         parameters_(parameters),
         code_(code)


@@ -2285,15 +2465,37 @@ struct CYImportDeclaration :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYExternal :
+struct CYExternalExpression :
+    CYTarget
+{
+    CYString *abi_;
+    CYType *type_;
+    CYPropertyName *name_;
+
+    CYExternalExpression(CYString *abi, CYType *type, CYPropertyName *name) :
+        abi_(abi),
+        type_(type),
+        name_(name)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYExternalDefinition :

     CYStatement
 {
     CYString *abi_;
     CYStatement
 {
     CYString *abi_;

-    CYTypedIdentifier *typed_;
+    CYType *type_;
+    CYIdentifier *name_;

 
 

-    CYExternal(CYString *abi, CYTypedIdentifier *typed) :
+    CYExternalDefinition(CYString *abi, CYType *type, CYIdentifier *name) :

         abi_(abi),
         abi_(abi),

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

     {
     }
 
     {
     }
 


@@ -2306,9 +2508,9 @@ struct CYExternal :
 struct CYTypeExpression :
     CYTarget
 {
 struct CYTypeExpression :
     CYTarget
 {

-    CYTypedIdentifier *typed_;
+    CYType *typed_;

 
 

-    CYTypeExpression(CYTypedIdentifier *typed) :
+    CYTypeExpression(CYType *typed) :

         typed_(typed)
     {
     }
         typed_(typed)
     {
     }


@@ -2322,10 +2524,12 @@ struct CYTypeExpression :
 struct CYTypeDefinition :
     CYStatement
 {
 struct CYTypeDefinition :
     CYStatement
 {

-    CYTypedIdentifier *typed_;
+    CYType *type_;
+    CYIdentifier *name_;

 
 

-    CYTypeDefinition(CYTypedIdentifier *typed) :
-        typed_(typed)
+    CYTypeDefinition(CYType *type, CYIdentifier *name) :
+        type_(type),
+        name_(name)

     {
     }
 
     {
     }
 


@@ -2349,16 +2553,18 @@ struct CYTypeBlockWith :
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     CYPrecedence(0)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+    void Output(CYOutput &out, CYPropertyName *name) const override;

 };
 
 struct CYTypeFunctionWith :
     CYTypeModifier
 {
 };
 
 struct CYTypeFunctionWith :
     CYTypeModifier
 {

+    bool variadic_;

     CYTypedParameter *parameters_;
 
     CYTypedParameter *parameters_;
 

-    CYTypeFunctionWith(CYTypedParameter *parameters, CYTypeModifier *next = NULL) :
+    CYTypeFunctionWith(bool variadic, CYTypedParameter *parameters, CYTypeModifier *next = NULL) :

         CYTypeModifier(next),
         CYTypeModifier(next),

+        variadic_(variadic),

         parameters_(parameters)
     {
     }
         parameters_(parameters)
     {
     }


@@ -2366,7 +2572,7 @@ struct CYTypeFunctionWith :
     CYPrecedence(1)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     CYPrecedence(1)
 
     virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

-    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+    void Output(CYOutput &out, CYPropertyName *name) const override;

 
     virtual CYTypeFunctionWith *Function() { return this; }
 };
 
     virtual CYTypeFunctionWith *Function() { return this; }
 };


@@ -2374,11 +2580,13 @@ struct CYTypeFunctionWith :
 struct CYTypeStructField :
     CYNext<CYTypeStructField>
 {
 struct CYTypeStructField :
     CYNext<CYTypeStructField>
 {

-    CYTypedIdentifier *typed_;
+    CYType *type_;
+    CYPropertyName *name_;

 
 

-    CYTypeStructField(CYTypedIdentifier *typed, CYTypeStructField *next = NULL) :
+    CYTypeStructField(CYType *type, CYPropertyName *name, CYTypeStructField *next = NULL) :

         CYNext<CYTypeStructField>(next),
         CYNext<CYTypeStructField>(next),

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

     {
     }
 };
     {
     }
 };


@@ -2431,6 +2639,38 @@ struct CYStructDefinition :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYEnumConstant :
+    CYNext<CYEnumConstant>
+{
+    CYIdentifier *name_;
+    CYNumber *value_;
+
+    CYEnumConstant(CYIdentifier *name, CYNumber *value, CYEnumConstant *next = NULL) :
+        CYNext<CYEnumConstant>(next),
+        name_(name),
+        value_(value)
+    {
+    }
+};
+
+struct CYTypeEnum :
+    CYTypeSpecifier
+{
+    CYIdentifier *name_;
+    CYTypeSpecifier *specifier_;
+    CYEnumConstant *constants_;
+
+    CYTypeEnum(CYIdentifier *name, CYTypeSpecifier *specifier, CYEnumConstant *constants) :
+        name_(name),
+        specifier_(specifier),
+        constants_(constants)
+    {
+    }
+
+    virtual CYTarget *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+

 namespace cy {
 namespace Syntax {
 
 namespace cy {
 namespace Syntax {