Fix parse of yield keywords without an expression.

[cycript.git] / Syntax.hpp

diff --git a/Syntax.hpp b/Syntax.hpp
index 3d248d6c58e20905919ef95ff83d7f8b83b335a5..c091cec90e174f6e2f69338a41def6d542574639 100644 (file)
--- a/Syntax.hpp
+++ b/Syntax.hpp
@@ -28,8 +28,6 @@
 #include <streambuf>
 #include <string>
 #include <vector>
 #include <streambuf>
 #include <string>
 #include <vector>

-#include <map>
-#include <set>

 
 #include "List.hpp"
 #include "Location.hpp"
 
 #include "List.hpp"
 #include "Location.hpp"


@@ -78,15 +76,15 @@ struct CYOutput {
         _assert(out_.sputc(value) != EOF);
         recent_ = indent_;
         if (value == '\n')
         _assert(out_.sputc(value) != EOF);
         recent_ = indent_;
         if (value == '\n')

-            position_.lines(1);
+            position_.Lines(1);

         else
         else

-            position_.columns(1);
+            position_.Columns(1);

     }
 
     _finline void operator ()(const char *data, std::streamsize size) {
         _assert(out_.sputn(data, size) == size);
         recent_ = indent_;
     }
 
     _finline void operator ()(const char *data, std::streamsize size) {
         _assert(out_.sputn(data, size) == size);
         recent_ = indent_;

-        position_.columns(size);
+        position_.Columns(size);

     }
 
     _finline void operator ()(const char *data) {
     }
 
     _finline void operator ()(const char *data) {


@@ -108,13 +106,22 @@ struct CYOutput {
     }
 };
 
     }
 };
 

+struct CYExpression;
+struct CYAssignment;
+

 struct CYPropertyName {
 struct CYPropertyName {

+    virtual bool Computed() const {
+        return false;
+    }
+
+    virtual bool Constructor() const {
+        return false;
+    }
+
+    virtual CYExpression *PropertyName(CYContext &context) = 0;

     virtual void PropertyName(CYOutput &out) const = 0;
 };
 
     virtual void PropertyName(CYOutput &out) const = 0;
 };
 

-struct CYExpression;
-struct CYAssignment;
-

 enum CYNeeded {
     CYNever     = -1,
     CYSometimes =  0,
 enum CYNeeded {
     CYNever     = -1,
     CYSometimes =  0,


@@ -125,12 +132,13 @@ enum CYFlags {
     CYNoFlags =      0,
     CYNoBrace =      (1 << 0),
     CYNoFunction =   (1 << 1),
     CYNoFlags =      0,
     CYNoBrace =      (1 << 0),
     CYNoFunction =   (1 << 1),

-    CYNoIn =         (1 << 2),
-    CYNoCall =       (1 << 3),
-    CYNoRightHand =  (1 << 4),
-    CYNoDangle =     (1 << 5),
-    CYNoInteger =    (1 << 6),
-    CYNoBF =         (CYNoBrace | CYNoFunction),
+    CYNoClass =      (1 << 2),
+    CYNoIn =         (1 << 3),
+    CYNoCall =       (1 << 4),
+    CYNoRightHand =  (1 << 5),
+    CYNoDangle =     (1 << 6),
+    CYNoInteger =    (1 << 7),
+    CYNoBFC =        (CYNoBrace | CYNoFunction | CYNoClass),

 };
 
 _finline CYFlags operator ~(CYFlags rhs) {
 };
 
 _finline CYFlags operator ~(CYFlags rhs) {


@@ -154,7 +162,7 @@ _finline CYFlags CYLeft(CYFlags flags) {
 }
 
 _finline CYFlags CYRight(CYFlags flags) {
 }
 
 _finline CYFlags CYRight(CYFlags flags) {

-    return flags & ~CYNoBF;
+    return flags & ~CYNoBFC;

 }
 
 _finline CYFlags CYCenter(CYFlags flags) {
 }
 
 _finline CYFlags CYCenter(CYFlags flags) {


@@ -189,44 +197,18 @@ struct CYStatement :
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
 };
 

-struct CYStatements {
-    CYStatement *first_;
-    CYStatement *last_;
+typedef CYList<CYStatement> CYStatements;

 
 

-    CYStatements() :
-        first_(NULL),
-        last_(NULL)
-    {
-    }
-
-    operator CYStatement *() const {
-        return first_;
-    }
-
-    CYStatements &operator ->*(CYStatement *next) {
-        if (next != NULL)
-            if (first_ == NULL) {
-                first_ = next;
-                last_ = next;
-            } else for (;; last_ = last_->next_)
-                if (last_->next_ == NULL) {
-                    last_->next_ = next;
-                    last_ = next;
-                    break;
-                }
-        return *this;
-    }
-};
-
-struct CYClassName {
-    virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
-    virtual void ClassName(CYOutput &out, bool object) const = 0;
+struct CYForInitializer :
+    CYStatement
+{
+    virtual CYForInitializer *Replace(CYContext &context) = 0;
+    virtual void Output(CYOutput &out, CYFlags flags) const = 0;

 };
 
 struct CYWord :
     CYThing,
 };
 
 struct CYWord :
     CYThing,

-    CYPropertyName,
-    CYClassName
+    CYPropertyName

 {
     const char *word_;
 
 {
     const char *word_;
 


@@ -235,15 +217,14 @@ struct CYWord :
     {
     }
 
     {
     }
 

-    void Set(const char *value) {
-        word_ = value;
+    virtual bool Constructor() const {
+        return strcmp(word_, "constructor") == 0;

     }
 
     virtual const char *Word() const;
     virtual void Output(CYOutput &out) const;
 
     }
 
     virtual const char *Word() const;
     virtual void Output(CYOutput &out) const;
 

-    virtual CYExpression *ClassName(CYContext &context, bool object);
-    virtual void ClassName(CYOutput &out, bool object) const;
+    virtual CYExpression *PropertyName(CYContext &context);

     virtual void PropertyName(CYOutput &out) const;
 };
 
     virtual void PropertyName(CYOutput &out) const;
 };
 


@@ -252,24 +233,33 @@ _finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) {
     return lhs << rhs.Word();
 }
 
     return lhs << rhs.Word();
 }
 

+enum CYIdentifierKind {
+    CYIdentifierArgument,
+    CYIdentifierCatch,
+    CYIdentifierGlobal,
+    CYIdentifierLexical,
+    CYIdentifierMagic,
+    CYIdentifierOther,
+    CYIdentifierVariable,
+};
+

 struct CYIdentifier :
     CYNext<CYIdentifier>,
     CYWord
 {
 struct CYIdentifier :
     CYNext<CYIdentifier>,
     CYWord
 {

-    CYIdentifier *replace_;
+    CYLocation location_;

     size_t offset_;
     size_t usage_;
 
     CYIdentifier(const char *word) :
         CYWord(word),
     size_t offset_;
     size_t usage_;
 
     CYIdentifier(const char *word) :
         CYWord(word),

-        replace_(NULL),

         offset_(0),
         usage_(0)
     {
     }
 
     virtual const char *Word() const;
         offset_(0),
         usage_(0)
     {
     }
 
     virtual const char *Word() const;

-    CYIdentifier *Replace(CYContext &context);
+    CYIdentifier *Replace(CYContext &context, CYIdentifierKind);

 };
 
 struct CYLabel :
 };
 
 struct CYLabel :


@@ -306,38 +296,43 @@ struct CYIdentifierValueLess :
     }
 };
 
     }
 };
 

-enum CYIdentifierFlags {
-    CYIdentifierArgument,
-    CYIdentifierVariable,
-    CYIdentifierOther,
-    CYIdentifierMagic,
-    CYIdentifierCatch,
-};
-
-typedef std::set<const char *, CYCStringLess> CYCStringSet;
-typedef std::set<CYIdentifier *, CYIdentifierValueLess> CYIdentifierValueSet;
-typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap;
-
-struct CYIdentifierUsage {
+struct CYIdentifierFlags :
+    CYNext<CYIdentifierFlags>
+{

     CYIdentifier *identifier_;
     CYIdentifier *identifier_;

-    size_t usage_;
-};
+    CYIdentifierKind kind_;
+    unsigned count_;
+    unsigned offset_;

 
 

-typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector;
+    CYIdentifierFlags(CYIdentifier *identifier, CYIdentifierKind kind, CYIdentifierFlags *next = NULL) :
+        CYNext<CYIdentifierFlags>(next),
+        identifier_(identifier),
+        kind_(kind),
+        count_(0),
+        offset_(0)
+    {
+    }
+};

 
 struct CYScope {
     bool transparent_;
     CYScope *parent_;
 
 struct CYScope {
     bool transparent_;
     CYScope *parent_;

+    bool damaged_;
+    CYIdentifierFlags *shadow_;

 
 

-    CYIdentifierAddressFlagsMap internal_;
-    CYIdentifierValueSet identifiers_;
+    CYIdentifierFlags *internal_;

 
     CYScope(bool transparent, CYContext &context);
 
 
     CYScope(bool transparent, CYContext &context);
 

-    void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags);
-    virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier);
-    void Merge(CYContext &context, CYIdentifier *identifier);
+    CYIdentifierFlags *Lookup(CYContext &context, const char *word);
+    CYIdentifierFlags *Lookup(CYContext &context, CYIdentifier *identifier);
+
+    CYIdentifierFlags *Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierKind kind);
+    void Merge(CYContext &context, const CYIdentifierFlags *flags);
+

     void Close(CYContext &context, CYStatement *&statements);
     void Close(CYContext &context, CYStatement *&statements);

+    void Close(CYContext &context);
+    void Damage();

 };
 
 struct CYScript :
 };
 
 struct CYScript :


@@ -362,17 +357,19 @@ struct CYContext {
 
     CYScope *scope_;
     CYThisScope *this_;
 
     CYScope *scope_;
     CYThisScope *this_;

-
-    CYIdentifierUsageVector rename_;
+    CYIdentifier *super_;

 
     CYNonLocal *nonlocal_;
     CYNonLocal *nextlocal_;
     unsigned unique_;
 
 
     CYNonLocal *nonlocal_;
     CYNonLocal *nextlocal_;
     unsigned unique_;
 

+    std::vector<CYIdentifier *> replace_;
+

     CYContext(CYOptions &options) :
         options_(options),
         scope_(NULL),
         this_(NULL),
     CYContext(CYOptions &options) :
         options_(options),
         scope_(NULL),
         this_(NULL),

+        super_(NULL),

         nonlocal_(NULL),
         nextlocal_(NULL),
         unique_(0)
         nonlocal_(NULL),
         nextlocal_(NULL),
         unique_(0)


@@ -462,18 +459,13 @@ struct CYBlock :
     virtual CYStatement *Return();
 };
 
     virtual CYStatement *Return();
 };
 

-struct CYForInitializer {
-    virtual CYExpression *Replace(CYContext &context) = 0;
-    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
-};
+struct CYTarget;
+struct CYVar;

 
 struct CYForInInitializer {
 
 struct CYForInInitializer {

-    virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
-    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value) = 0;
-
-    virtual CYExpression *Replace(CYContext &context) = 0;
-    virtual CYAssignment *Assignment(CYContext &context) = 0;
+    virtual CYStatement *Initialize(CYContext &context, CYExpression *value) = 0;

 
 

+    virtual CYTarget *Replace(CYContext &context) = 0;

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


@@ -483,9 +475,6 @@ struct CYNumber;
 struct CYString;
 
 struct CYExpression :
 struct CYString;
 
 struct CYExpression :

-    CYForInitializer,
-    CYForInInitializer,
-    CYClassName,

     CYThing
 {
     virtual int Precedence() const = 0;
     CYThing
 {
     virtual int Precedence() const = 0;


@@ -494,20 +483,17 @@ struct CYExpression :
         return true;
     }
 
         return true;
     }
 

-    virtual void ForIn(CYOutput &out, CYFlags flags) const;
-    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);
+    virtual bool Eval() const {
+        return false;
+    }

 
 

-    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
+    virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);

 
     virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
     void Output(CYOutput &out, int precedence, CYFlags flags) const;
 
 
     virtual void Output(CYOutput &out) const;
     virtual void Output(CYOutput &out, CYFlags flags) const = 0;
     void Output(CYOutput &out, int precedence, CYFlags flags) const;
 

-    virtual CYExpression *ClassName(CYContext &context, bool object);
-    virtual void ClassName(CYOutput &out, bool object) const;
-

     virtual CYExpression *Replace(CYContext &context) = 0;
     virtual CYExpression *Replace(CYContext &context) = 0;

-    virtual CYAssignment *Assignment(CYContext &context);

 
     virtual CYExpression *Primitive(CYContext &context) {
         return NULL;
 
     virtual CYExpression *Primitive(CYContext &context) {
         return NULL;


@@ -528,6 +514,20 @@ struct CYExpression :
     }
 };
 
     }
 };
 

+struct CYTarget :
+    CYExpression,
+    CYForInInitializer
+{
+    virtual bool RightHand() const {
+        return false;
+    }
+
+    virtual CYStatement *Initialize(CYContext &context, CYExpression *value);
+
+    virtual CYTarget *Replace(CYContext &context) = 0;
+    using CYExpression::Output;
+};
+

 #define CYAlphabetic(value) \
     virtual bool Alphabetic() const { \
         return value; \
 #define CYAlphabetic(value) \
     virtual bool Alphabetic() const { \
         return value; \


@@ -539,11 +539,6 @@ struct CYExpression :
         return Precedence_; \
     }
 
         return Precedence_; \
     }
 

-#define CYRightHand(value) \
-    virtual bool RightHand() const { \
-        return value; \
-    }
-

 struct CYCompound :
     CYExpression
 {
 struct CYCompound :
     CYExpression
 {


@@ -567,7 +562,7 @@ struct CYCompound :
 };
 
 struct CYParenthetical :
 };
 
 struct CYParenthetical :

-    CYExpression
+    CYTarget

 {
     CYExpression *expression_;
 
 {
     CYExpression *expression_;
 


@@ -578,7 +573,7 @@ struct CYParenthetical :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

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

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


@@ -588,9 +583,9 @@ struct CYFunctionParameter :
     CYNext<CYFunctionParameter>,
     CYThing
 {
     CYNext<CYFunctionParameter>,
     CYThing
 {

-    CYForInInitializer *initialiser_;
+    CYDeclaration *initialiser_;

 
 

-    CYFunctionParameter(CYForInInitializer *initialiser, CYFunctionParameter *next = NULL) :
+    CYFunctionParameter(CYDeclaration *initialiser, CYFunctionParameter *next = NULL) :

         CYNext<CYFunctionParameter>(next),
         initialiser_(initialiser)
     {
         CYNext<CYFunctionParameter>(next),
         initialiser_(initialiser)
     {


@@ -614,8 +609,6 @@ struct CYComprehension :
         return this;
     }
 
         return this;
     }
 

-    virtual const char *Name() const = 0;
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
     CYFunctionParameter *Parameters(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
     CYFunctionParameter *Parameters(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;


@@ -625,20 +618,16 @@ struct CYComprehension :
 struct CYForInComprehension :
     CYComprehension
 {
 struct CYForInComprehension :
     CYComprehension
 {

-    CYIdentifier *name_;
+    CYDeclaration *declaration_;

     CYExpression *set_;
 
     CYExpression *set_;
 

-    CYForInComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+    CYForInComprehension(CYDeclaration *declaration, CYExpression *set, CYComprehension *next = NULL) :

         CYComprehension(next),
         CYComprehension(next),

-        name_(name),
+        declaration_(declaration),

         set_(set)
     {
     }
 
         set_(set)
     {
     }
 

-    virtual const char *Name() const {
-        return name_->Word();
-    }
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual void Output(CYOutput &out) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual void Output(CYOutput &out) const;


@@ -647,20 +636,16 @@ struct CYForInComprehension :
 struct CYForOfComprehension :
     CYComprehension
 {
 struct CYForOfComprehension :
     CYComprehension
 {

-    CYIdentifier *name_;
+    CYDeclaration *declaration_;

     CYExpression *set_;
 
     CYExpression *set_;
 

-    CYForOfComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+    CYForOfComprehension(CYDeclaration *declaration, CYExpression *set, CYComprehension *next = NULL) :

         CYComprehension(next),
         CYComprehension(next),

-        name_(name),
+        declaration_(declaration),

         set_(set)
     {
     }
 
         set_(set)
     {
     }
 

-    virtual const char *Name() const {
-        return name_->Word();
-    }
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual void Output(CYOutput &out) const;
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual void Output(CYOutput &out) const;


@@ -677,17 +662,13 @@ struct CYIfComprehension :
     {
     }
 
     {
     }
 

-    virtual const char *Name() const {
-        return NULL;
-    }
-

     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual void Output(CYOutput &out) const;
 };
 
 struct CYArrayComprehension :
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
     virtual void Output(CYOutput &out) const;
 };
 
 struct CYArrayComprehension :

-    CYExpression
+    CYTarget

 {
     CYExpression *expression_;
     CYComprehension *comprehensions_;
 {
     CYExpression *expression_;
     CYComprehension *comprehensions_;


@@ -700,15 +681,16 @@ struct CYArrayComprehension :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

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

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

-    CYExpression
+    CYTarget

 {
 {

+    CYLocation location_;
+

     CYPrecedence(0)
     CYPrecedence(0)

-    CYRightHand(false)

 
     virtual CYExpression *Primitive(CYContext &context) {
         return this;
 
     virtual CYExpression *Primitive(CYContext &context) {
         return this;


@@ -718,14 +700,13 @@ struct CYLiteral :
 struct CYTrivial :
     CYLiteral
 {
 struct CYTrivial :
     CYLiteral
 {

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

 };
 
 struct CYMagic :
 };
 
 struct CYMagic :

-    CYExpression
+    CYTarget

 {
     CYPrecedence(0)
 {
     CYPrecedence(0)

-    CYRightHand(false)

 };
 
 struct CYRange {
 };
 
 struct CYRange {


@@ -794,6 +775,8 @@ struct CYString :
 
     CYString *Concat(CYContext &out, CYString *rhs) const;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     CYString *Concat(CYContext &out, CYString *rhs) const;
     virtual void Output(CYOutput &out, CYFlags flags) const;

+
+    virtual CYExpression *PropertyName(CYContext &context);

     virtual void PropertyName(CYOutput &out) const;
 };
 
     virtual void PropertyName(CYOutput &out) const;
 };
 


@@ -816,7 +799,7 @@ struct CYSpan :
 };
 
 struct CYTemplate :
 };
 
 struct CYTemplate :

-    CYExpression
+    CYTarget

 {
     CYString *string_;
     CYSpan *spans_;
 {
     CYString *string_;
     CYSpan *spans_;


@@ -828,9 +811,8 @@ struct CYTemplate :
     }
 
     CYPrecedence(0)
     }
 
     CYPrecedence(0)

-    CYRightHand(false)

 
 

-    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;
 };
 


@@ -853,6 +835,26 @@ struct CYNumber :
     virtual CYString *String(CYContext &context);
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
     virtual CYString *String(CYContext &context);
 
     virtual void Output(CYOutput &out, CYFlags flags) const;

+
+    virtual CYExpression *PropertyName(CYContext &context);
+    virtual void PropertyName(CYOutput &out) const;
+};
+
+struct CYComputed :
+    CYPropertyName
+{
+    CYExpression *expression_;
+
+    CYComputed(CYExpression *expression) :
+        expression_(expression)
+    {
+    }
+
+    virtual bool Computed() const {
+        return true;
+    }
+
+    virtual CYExpression *PropertyName(CYContext &context);

     virtual void PropertyName(CYOutput &out) const;
 };
 
     virtual void PropertyName(CYOutput &out) const;
 };
 


@@ -887,7 +889,7 @@ struct CYNull :
 struct CYThis :
     CYMagic
 {
 struct CYThis :
     CYMagic
 {

-    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;
 };
 


@@ -921,7 +923,7 @@ struct CYTrue :
 };
 
 struct CYVariable :
 };
 
 struct CYVariable :

-    CYExpression
+    CYTarget

 {
     CYIdentifier *name_;
 
 {
     CYIdentifier *name_;
 


@@ -936,9 +938,12 @@ struct CYVariable :
     }
 
     CYPrecedence(0)
     }
 
     CYPrecedence(0)

-    CYRightHand(false)

 
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual bool Eval() const {
+        return strcmp(name_->Word(), "eval") == 0;
+    }
+
+    virtual CYTarget *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYFunctionParameter *Parameter() const;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYFunctionParameter *Parameter() const;


@@ -1007,17 +1012,17 @@ struct CYPostfix :
 struct CYAssignment :
     CYExpression
 {
 struct CYAssignment :
     CYExpression
 {

-    CYExpression *lhs_;
+    CYTarget *lhs_;

     CYExpression *rhs_;
 
     CYExpression *rhs_;
 

-    CYAssignment(CYExpression *lhs, CYExpression *rhs) :
+    CYAssignment(CYTarget *lhs, CYExpression *rhs) :

         lhs_(lhs),
         rhs_(rhs)
     {
     }
 
         lhs_(lhs),
         rhs_(rhs)
     {
     }
 

-    void SetLeft(CYExpression *lhs) {
-        lhs_ = lhs;
+    void SetRight(CYExpression *rhs) {
+        rhs_ = rhs;

     }
 
     virtual const char *Operator() const = 0;
     }
 
     virtual const char *Operator() const = 0;


@@ -1126,48 +1131,57 @@ struct CYArray :
     {
     }
 
     {
     }
 

-    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 CYProperty :
-    CYNext<CYProperty>,
-    CYThing
-{
-    CYPropertyName *name_;
-    CYExpression *value_;
+struct CYDeclaration {
+    CYIdentifier *identifier_;
+    CYExpression *initialiser_;

 
 

-    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) :
-        CYNext<CYProperty>(next),
-        name_(name),
-        value_(value)
+    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :
+        identifier_(identifier),
+        initialiser_(initialiser)

     {
     }
 
     {
     }
 

-    void Replace(CYContext &context);
-    virtual void Output(CYOutput &out) const;
+    CYTarget *Target(CYContext &context);
+
+    virtual CYAssignment *Replace(CYContext &context, CYIdentifierKind kind);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYDeclaration :
+struct CYForLexical :

     CYForInInitializer
 {
     CYForInInitializer
 {

-    CYIdentifier *identifier_;
-    CYExpression *initialiser_;
+    bool constant_;
+    CYDeclaration *declaration_;

 
 

-    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :
-        identifier_(identifier),
-        initialiser_(initialiser)
+    CYForLexical(bool constant, CYDeclaration *declaration) :
+        constant_(constant),
+        declaration_(declaration)

     {
     }
 
     {
     }
 

-    virtual void ForIn(CYOutput &out, CYFlags flags) const;
-    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);
+    virtual CYStatement *Initialize(CYContext &context, CYExpression *value);

 
 

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

 
 

-    virtual CYAssignment *Assignment(CYContext &context);
-    CYVariable *Variable(CYContext &context);
+struct CYForVariable :
+    CYForInInitializer
+{
+    CYDeclaration *declaration_;

 
 

+    CYForVariable(CYDeclaration *declaration) :
+        declaration_(declaration)
+    {
+    }
+
+    virtual CYStatement *Initialize(CYContext &context, CYExpression *value);
+
+    virtual CYTarget *Replace(CYContext &context);

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


@@ -1183,10 +1197,8 @@ struct CYDeclarations :
     {
     }
 
     {
     }
 

-    void Replace(CYContext &context);
+    CYExpression *Replace(CYContext &context, CYIdentifierKind kind);

 
 

-    CYExpression *Expression(CYContext &context);
-    CYProperty *Property(CYContext &context);

     CYArgument *Argument(CYContext &context);
     CYFunctionParameter *Parameter(CYContext &context);
 
     CYArgument *Argument(CYContext &context);
     CYFunctionParameter *Parameter(CYContext &context);
 


@@ -1194,52 +1206,84 @@ struct CYDeclarations :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYForDeclarations :
+struct CYVar :

     CYForInitializer
 {
     CYDeclarations *declarations_;
 
     CYForInitializer
 {
     CYDeclarations *declarations_;
 

-    CYForDeclarations(CYDeclarations *declarations) :
+    CYVar(CYDeclarations *declarations) :

         declarations_(declarations)
     {
     }
 
         declarations_(declarations)
     {
     }
 

-    virtual CYExpression *Replace(CYContext &context);
+    CYCompact(None)
+
+    virtual CYForInitializer *Replace(CYContext &context);

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

-struct CYVar :
-    CYStatement
+struct CYLet :
+    CYForInitializer

 {
 {

+    bool constant_;

     CYDeclarations *declarations_;
 
     CYDeclarations *declarations_;
 

-    CYVar(CYDeclarations *declarations) :
+    CYLet(bool constant, CYDeclarations *declarations) :
+        constant_(constant),

         declarations_(declarations)
     {
     }
 
     CYCompact(None)
 
         declarations_(declarations)
     {
     }
 
     CYCompact(None)
 

-    virtual CYStatement *Replace(CYContext &context);
+    virtual CYForInitializer *Replace(CYContext &context);

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

-struct CYLetStatement :
-    CYStatement
+struct CYBuilder {
+    CYList<CYDeclarations> declarations_;
+    CYList<CYStatement> statements_;
+
+    operator bool() const {
+        return statements_ != NULL;
+    }
+};
+
+struct CYProperty :
+    CYNext<CYProperty>,
+    CYThing

 {
 {

-    CYDeclarations *declarations_;
-    CYStatement *code_;
+    CYPropertyName *name_;

 
 

-    CYLetStatement(CYDeclarations *declarations, CYStatement *code) :
-        declarations_(declarations),
-        code_(code)
+    CYProperty(CYPropertyName *name, CYProperty *next = NULL) :
+        CYNext<CYProperty>(next),
+        name_(name)

     {
     }
 
     {
     }
 

-    CYCompact(Long)
+    CYProperty *ReplaceAll(CYContext &context, CYBuilder &builder, CYExpression *self, bool update);
+    void Replace(CYContext &context, CYBuilder &builder, CYExpression *self, bool protect);

 
 

-    virtual CYStatement *Replace(CYContext &context);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual void Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect) = 0;
+
+    virtual void Replace(CYContext &context) = 0;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYPropertyValue :
+    CYProperty
+{
+    CYExpression *value_;
+
+    CYPropertyValue(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) :
+        CYProperty(name, next),
+        value_(value)
+    {
+    }
+
+    virtual void Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect);
+    virtual void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYFor :
 };
 
 struct CYFor :


@@ -1284,6 +1328,26 @@ struct CYForIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYForInitialized :
+    CYStatement
+{
+    CYDeclaration *declaration_;
+    CYExpression *set_;
+    CYStatement *code_;
+
+    CYForInitialized(CYDeclaration *declaration, CYExpression *set, CYStatement *code) :
+        declaration_(declaration),
+        set_(set),
+        code_(code)
+    {
+    }
+
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYForOf :
     CYStatement
 {
 struct CYForOf :
     CYStatement
 {


@@ -1314,12 +1378,12 @@ struct CYObject :
     {
     }
 
     {
     }
 

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

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

-    CYExpression
+    CYTarget

 {
     CYExpression *object_;
     CYExpression *property_;
 {
     CYExpression *object_;
     CYExpression *property_;


@@ -1344,9 +1408,8 @@ struct CYDirectMember :
     }
 
     CYPrecedence(1)
     }
 
     CYPrecedence(1)

-    CYRightHand(false)

 
 

-    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;
 };
 


@@ -1359,9 +1422,8 @@ struct CYIndirectMember :
     }
 
     CYPrecedence(1)
     }
 
     CYPrecedence(1)

-    CYRightHand(false)

 
 

-    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;
 };
 


@@ -1369,12 +1431,12 @@ namespace cy {
 namespace Syntax {
 
 struct New :
 namespace Syntax {
 
 struct New :

-    CYExpression
+    CYTarget

 {
     CYExpression *constructor_;
     CYArgument *arguments_;
 
 {
     CYExpression *constructor_;
     CYArgument *arguments_;
 

-    New(CYExpression *constructor, CYArgument *arguments) :
+    New(CYExpression *constructor, CYArgument *arguments = NULL) :

         constructor_(constructor),
         arguments_(arguments)
     {
         constructor_(constructor),
         arguments_(arguments)
     {


@@ -1384,41 +1446,61 @@ struct New :
         return arguments_ == NULL ? 2 : 1;
     }
 
         return arguments_ == NULL ? 2 : 1;
     }
 

-    CYRightHand(false)

 
 

-    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;
 

-    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
+    virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);

 };
 
 } }
 
 };
 
 } }
 

-struct CYCall :
-    CYExpression
+struct CYApply :
+    CYTarget

 {
 {

-    CYExpression *function_;

     CYArgument *arguments_;
 
     CYArgument *arguments_;
 

-    CYCall(CYExpression *function, CYArgument *arguments = NULL) :
-        function_(function),
+    CYApply(CYArgument *arguments = NULL) :

         arguments_(arguments)
     {
     }
 
     CYPrecedence(1)
         arguments_(arguments)
     {
     }
 
     CYPrecedence(1)

-    CYRightHand(false)

 
 

-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);
+};
+
+struct CYCall :
+    CYApply
+{
+    CYExpression *function_;
+
+    CYCall(CYExpression *function, CYArgument *arguments = NULL) :
+        CYApply(arguments),
+        function_(function)
+    {
+    }
+

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

+    virtual CYTarget *Replace(CYContext &context);
+};
+
+struct CYEval :
+    CYApply
+{
+    CYEval(CYArgument *arguments) :
+        CYApply(arguments)
+    {
+    }

 
 

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

 };
 
 struct CYRubyProc;
 
 struct CYRubyBlock :
 };
 
 struct CYRubyProc;
 
 struct CYRubyBlock :

-    CYExpression
+    CYTarget

 {
     CYExpression *call_;
     CYRubyProc *proc_;
 {
     CYExpression *call_;
     CYRubyProc *proc_;


@@ -1430,10 +1512,11 @@ struct CYRubyBlock :
     }
 
     CYPrecedence(1)
     }
 
     CYPrecedence(1)

-    CYRightHand(false)

 
 

-    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;

+
+    virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);

 };
 
 struct CYIf :
 };
 
 struct CYIf :


@@ -1494,95 +1577,238 @@ struct CYWhile :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-// XXX: this should be split up into CYAnonymousFunction and CYNamedFunction (subclass)

 struct CYFunction {
 struct CYFunction {

-    CYIdentifier *name_;

     CYFunctionParameter *parameters_;
     CYStatement *code_;
 
     CYNonLocal *nonlocal_;
     bool implicit_;
     CYThisScope this_;
     CYFunctionParameter *parameters_;
     CYStatement *code_;
 
     CYNonLocal *nonlocal_;
     bool implicit_;
     CYThisScope this_;

+    CYIdentifier *super_;

 
 

-    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
-        name_(name),
+    CYFunction(CYFunctionParameter *parameters, CYStatement *code) :

         parameters_(parameters),
         code_(code),
         nonlocal_(NULL),
         parameters_(parameters),
         code_(code),
         nonlocal_(NULL),

-        implicit_(false)
+        implicit_(false),
+        super_(NULL)

     {
     }
 
     {
     }
 

-    void Inject(CYContext &context);
-    virtual void Replace_(CYContext &context, bool outer);
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    void Replace(CYContext &context);
+    void Output(CYOutput &out) const;

 };
 
 };
 

-// XXX: this should be split up into CYAnonymousFunctionExpression and CYNamedFunctionExpression

 struct CYFunctionExpression :
     CYFunction,
 struct CYFunctionExpression :
     CYFunction,

-    CYExpression
+    CYTarget

 {
 {

+    CYIdentifier *name_;
+

     CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
     CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :

-        CYFunction(name, parameters, code)
+        CYFunction(parameters, code),
+        name_(name)

     {
     }
 
     CYPrecedence(0)
     {
     }
 
     CYPrecedence(0)

-    CYRightHand(false)

 
 

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

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

-// XXX: this should derive from CYAnonymousFunction

 struct CYFatArrow :
     CYFunction,
     CYExpression
 {
     CYFatArrow(CYFunctionParameter *parameters, CYStatement *code) :
 struct CYFatArrow :
     CYFunction,
     CYExpression
 {
     CYFatArrow(CYFunctionParameter *parameters, CYStatement *code) :

-        CYFunction(NULL, parameters, code)
+        CYFunction(parameters, code)

     {
     }
 
     CYPrecedence(0)
     {
     }
 
     CYPrecedence(0)

-    CYRightHand(false)

 
 

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

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

-// XXX: this should derive from CYAnonymousFunctionExpression

 struct CYRubyProc :
 struct CYRubyProc :

-    CYFunctionExpression
+    CYFunction,
+    CYTarget

 {
     CYRubyProc(CYFunctionParameter *parameters, CYStatement *code) :
 {
     CYRubyProc(CYFunctionParameter *parameters, CYStatement *code) :

-        CYFunctionExpression(NULL, parameters, code)
+        CYFunction(parameters, code)

     {
     }
 
     {
     }
 

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

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

-// XXX: this should derive from CYNamedFunction

 struct CYFunctionStatement :
     CYFunction,
     CYStatement
 {
 struct CYFunctionStatement :
     CYFunction,
     CYStatement
 {

+    CYIdentifier *name_;
+

     CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
     CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :

-        CYFunction(name, parameters, code)
+        CYFunction(parameters, code),
+        name_(name)

     {
     }
 
     CYCompact(None)
 
     {
     }
 
     CYCompact(None)
 

-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;

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

-struct CYExpress :
+struct CYPropertyMethod;
+
+struct CYMethod :
+    CYFunction,
+    CYProperty
+{
+    CYMethod(CYPropertyName *name, CYFunctionParameter *parameters, CYStatement *code, CYProperty *next = NULL) :
+        CYFunction(parameters, code),
+        CYProperty(name, next)
+    {
+    }
+
+    virtual CYFunctionExpression *Constructor();
+
+    using CYProperty::Replace;
+    virtual void Replace(CYContext &context);
+};
+
+struct CYPropertyGetter :
+    CYMethod
+{
+    CYPropertyGetter(CYPropertyName *name, CYStatement *code, CYProperty *next = NULL) :
+        CYMethod(name, NULL, code, next)
+    {
+    }
+
+    virtual void Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYPropertySetter :
+    CYMethod
+{
+    CYPropertySetter(CYPropertyName *name, CYFunctionParameter *parameters, CYStatement *code, CYProperty *next = NULL) :
+        CYMethod(name, parameters, code, next)
+    {
+    }
+
+    virtual void Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYPropertyMethod :
+    CYMethod
+{
+    CYPropertyMethod(CYPropertyName *name, CYFunctionParameter *parameters, CYStatement *code, CYProperty *next = NULL) :
+        CYMethod(name, parameters, code, next)
+    {
+    }
+
+    virtual CYFunctionExpression *Constructor();
+
+    virtual void Replace(CYContext &context, CYBuilder &builder, CYExpression *self, CYExpression *name, bool protect);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYClassTail :
+    CYThing
+{
+    CYExpression *extends_;
+
+    CYFunctionExpression *constructor_;
+    CYList<CYProperty> instance_;
+    CYList<CYProperty> static_;
+
+    CYClassTail(CYExpression *extends) :
+        extends_(extends),
+        constructor_(NULL)
+    {
+    }
+
+    void Output(CYOutput &out) const;
+};
+
+struct CYClassExpression :
+    CYTarget
+{
+    CYIdentifier *name_;
+    CYClassTail *tail_;
+
+    CYClassExpression(CYIdentifier *name, CYClassTail *tail) :
+        name_(name),
+        tail_(tail)
+    {
+    }
+
+    CYPrecedence(0)
+
+    CYTarget *Replace(CYContext &context) override;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYClassStatement :

     CYStatement
     CYStatement

+{
+    CYIdentifier *name_;
+    CYClassTail *tail_;
+
+    CYClassStatement(CYIdentifier *name, CYClassTail *tail) :
+        name_(name),
+        tail_(tail)
+    {
+    }
+
+    CYCompact(Long)
+
+    CYStatement *Replace(CYContext &context) override;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYSuperCall :
+    CYTarget
+{
+    CYArgument *arguments_;
+
+    CYSuperCall(CYArgument *arguments) :
+        arguments_(arguments)
+    {
+    }
+
+    CYPrecedence(2)
+
+    CYTarget *Replace(CYContext &context) override;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYSuperAccess :
+    CYTarget
+{
+    CYExpression *property_;
+
+    CYSuperAccess(CYExpression *property) :
+        property_(property)
+    {
+    }
+
+    CYPrecedence(1)
+
+    CYTarget *Replace(CYContext &context) override;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYExpress :
+    CYForInitializer

 {
     CYExpression *expression_;
 
 {
     CYExpression *expression_;
 


@@ -1595,7 +1821,7 @@ struct CYExpress :
 
     CYCompact(None)
 
 
     CYCompact(None)
 

-    virtual CYStatement *Replace(CYContext &context);
+    CYForInitializer *Replace(CYContext &context) override;

     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYStatement *Return();
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYStatement *Return();


@@ -1613,7 +1839,7 @@ struct CYContinue :
 
     CYCompact(Short)
 
 
     CYCompact(Short)
 

-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;

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


@@ -1629,7 +1855,7 @@ struct CYBreak :
 
     CYCompact(Short)
 
 
     CYCompact(Short)
 

-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;

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


@@ -1645,7 +1871,7 @@ struct CYReturn :
 
     CYCompact(None)
 
 
     CYCompact(None)
 

-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;

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


@@ -1661,7 +1887,7 @@ struct CYYieldGenerator :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

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

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


@@ -1682,11 +1908,11 @@ struct CYYieldValue :
 };
 
 struct CYEmpty :
 };
 
 struct CYEmpty :

-    CYStatement
+    CYForInitializer

 {
     CYCompact(Short)
 
 {
     CYCompact(Short)
 

-    virtual CYStatement *Replace(CYContext &context);
+    virtual CYForInitializer *Replace(CYContext &context);

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


@@ -1707,7 +1933,7 @@ struct CYFinally :
 struct CYTypeSpecifier :
     CYThing
 {
 struct CYTypeSpecifier :
     CYThing
 {

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

 };
 
 struct CYTypeError :
 };
 
 struct CYTypeError :


@@ -1716,7 +1942,7 @@ struct CYTypeError :
     CYTypeError() {
     }
 
     CYTypeError() {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1726,7 +1952,7 @@ struct CYTypeVoid :
     CYTypeVoid() {
     }
 
     CYTypeVoid() {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1745,7 +1971,7 @@ struct CYTypeVariable :
     {
     }
 
     {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1759,7 +1985,7 @@ struct CYTypeUnsigned :
     {
     }
 
     {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1773,7 +1999,7 @@ struct CYTypeSigned :
     {
     }
 
     {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1787,7 +2013,7 @@ struct CYTypeLong :
     {
     }
 
     {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1801,7 +2027,7 @@ struct CYTypeShort :
     {
     }
 
     {
     }
 

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

     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 


@@ -1817,8 +2043,8 @@ struct CYTypeModifier :
 
     virtual int Precedence() const = 0;
 
 
     virtual int Precedence() const = 0;
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type) = 0;
-    CYExpression *Replace(CYContext &context, CYExpression *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, CYIdentifier *identifier) const = 0;
     void Output(CYOutput &out, int precedence, CYIdentifier *identifier) const;


@@ -1839,7 +2065,7 @@ struct CYTypeArrayOf :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 


@@ -1853,7 +2079,7 @@ struct CYTypeConstant :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 


@@ -1867,7 +2093,7 @@ struct CYTypePointerTo :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 


@@ -1881,7 +2107,7 @@ struct CYTypeVolatile :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 


@@ -1914,14 +2140,14 @@ struct CYTypedIdentifier :
         return this;
     }
 
         return this;
     }
 

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

     virtual void Output(CYOutput &out) const;
 
     CYTypeFunctionWith *Function();
 };
 
 struct CYEncodedType :
     virtual void Output(CYOutput &out) const;
 
     CYTypeFunctionWith *Function();
 };
 
 struct CYEncodedType :

-    CYExpression
+    CYTarget

 {
     CYTypedIdentifier *typed_;
 
 {
     CYTypedIdentifier *typed_;
 


@@ -1932,7 +2158,7 @@ struct CYEncodedType :
 
     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;
 };
 


@@ -1956,7 +2182,7 @@ struct CYTypedParameter :
 };
 
 struct CYLambda :
 };
 
 struct CYLambda :

-    CYExpression
+    CYTarget

 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;
 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;


@@ -1971,7 +2197,7 @@ struct CYLambda :
 
     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;
 };
 


@@ -2054,7 +2280,7 @@ struct CYTypeBlockWith :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 


@@ -2071,7 +2297,7 @@ struct CYTypeFunctionWith :
 
     CYPrecedence(1)
 
 
     CYPrecedence(1)
 

-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);

     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 
     virtual CYTypeFunctionWith *Function() { return this; }
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 
     virtual CYTypeFunctionWith *Function() { return this; }


@@ -2221,20 +2447,20 @@ struct CYAddressOf :
 };
 
 struct CYIndirect :
 };
 
 struct CYIndirect :

-    CYPrefix
+    CYTarget

 {
 {

+    CYExpression *rhs_;
+

     CYIndirect(CYExpression *rhs) :
     CYIndirect(CYExpression *rhs) :

-        CYPrefix(rhs)
+        rhs_(rhs)

     {
     }
 
     {
     }
 

-    virtual const char *Operator() const {
-        return "*";
-    }
-
-    CYAlphabetic(false)
+    // XXX: this should be checked
+    CYPrecedence(2)

 
 

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

 };
 
 #define CYReplace \
 };
 
 #define CYReplace \


@@ -2291,7 +2517,7 @@ struct CYIndirect :
     struct CY ## name ## Assign : \
         CYAssignment \
     { args \
     struct CY ## name ## Assign : \
         CYAssignment \
     { args \

-        CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
+        CY ## name ## Assign(CYTarget *lhs, CYExpression *rhs) : \

             CYAssignment(lhs, rhs) \
         { \
         } \
             CYAssignment(lhs, rhs) \
         { \
         } \