X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/1abe53bff9f3ea0bebf749a4b49271c4eff7ec12..8b77acf10ecd1824cfd522f090e2288acead7384:/Syntax.hpp

diff --git a/Syntax.hpp b/Syntax.hpp
index 82b1392..c091cec 100644
--- a/Syntax.hpp
+++ b/Syntax.hpp
@@ -28,8 +28,6 @@
 #include <streambuf>
 #include <string>
 #include <vector>
-#include <map>
-#include <set>
 
 #include "List.hpp"
 #include "Location.hpp"
@@ -78,15 +76,15 @@ struct CYOutput {
         _assert(out_.sputc(value) != EOF);
         recent_ = indent_;
         if (value == '\n')
-            position_.lines(1);
+            position_.Lines(1);
         else
-            position_.columns(1);
+            position_.Columns(1);
     }
 
     _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) {
@@ -108,13 +106,22 @@ struct CYOutput {
     }
 };
 
+struct CYExpression;
+struct CYAssignment;
+
 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;
 };
 
-struct CYExpression;
-struct CYAssignment;
-
 enum CYNeeded {
     CYNever     = -1,
     CYSometimes =  0,
@@ -125,12 +132,13 @@ enum CYFlags {
     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) {
@@ -154,7 +162,7 @@ _finline CYFlags CYLeft(CYFlags flags) {
 }
 
 _finline CYFlags CYRight(CYFlags flags) {
-    return flags & ~CYNoBF;
+    return flags & ~CYNoBFC;
 }
 
 _finline CYFlags CYCenter(CYFlags flags) {
@@ -189,44 +197,18 @@ struct CYStatement :
     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,
-    CYPropertyName,
-    CYClassName
+    CYPropertyName
 {
     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 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;
 };
 
@@ -252,24 +233,33 @@ _finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) {
     return lhs << rhs.Word();
 }
 
+enum CYIdentifierKind {
+    CYIdentifierArgument,
+    CYIdentifierCatch,
+    CYIdentifierGlobal,
+    CYIdentifierLexical,
+    CYIdentifierMagic,
+    CYIdentifierOther,
+    CYIdentifierVariable,
+};
+
 struct CYIdentifier :
     CYNext<CYIdentifier>,
     CYWord
 {
-    CYIdentifier *replace_;
+    CYLocation location_;
     size_t offset_;
     size_t usage_;
 
     CYIdentifier(const char *word) :
         CYWord(word),
-        replace_(NULL),
         offset_(0),
         usage_(0)
     {
     }
 
     virtual const char *Word() const;
-    CYIdentifier *Replace(CYContext &context);
+    CYIdentifier *Replace(CYContext &context, CYIdentifierKind);
 };
 
 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_;
-    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_;
+    bool damaged_;
+    CYIdentifierFlags *shadow_;
 
-    CYIdentifierAddressFlagsMap internal_;
-    CYIdentifierValueSet identifiers_;
+    CYIdentifierFlags *internal_;
 
     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);
+    void Damage();
 };
 
 struct CYScript :
@@ -362,17 +357,19 @@ struct CYContext {
 
     CYScope *scope_;
     CYThisScope *this_;
-
-    CYIdentifierUsageVector rename_;
+    CYIdentifier *super_;
 
     CYNonLocal *nonlocal_;
     CYNonLocal *nextlocal_;
     unsigned unique_;
 
+    std::vector<CYIdentifier *> replace_;
+
     CYContext(CYOptions &options) :
         options_(options),
         scope_(NULL),
         this_(NULL),
+        super_(NULL),
         nonlocal_(NULL),
         nextlocal_(NULL),
         unique_(0)
@@ -462,18 +459,13 @@ struct CYBlock :
     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 {
-    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;
 };
 
@@ -483,9 +475,6 @@ struct CYNumber;
 struct CYString;
 
 struct CYExpression :
-    CYForInitializer,
-    CYForInInitializer,
-    CYClassName,
     CYThing
 {
     virtual int Precedence() const = 0;
@@ -494,20 +483,17 @@ struct CYExpression :
         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 CYExpression *ClassName(CYContext &context, bool object);
-    virtual void ClassName(CYOutput &out, bool object) const;
-
     virtual CYExpression *Replace(CYContext &context) = 0;
-    virtual CYAssignment *Assignment(CYContext &context);
 
     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; \
@@ -539,11 +539,6 @@ struct CYExpression :
         return Precedence_; \
     }
 
-#define CYRightHand(value) \
-    virtual bool RightHand() const { \
-        return value; \
-    }
-
 struct CYCompound :
     CYExpression
 {
@@ -567,7 +562,7 @@ struct CYCompound :
 };
 
 struct CYParenthetical :
-    CYExpression
+    CYTarget
 {
     CYExpression *expression_;
 
@@ -578,7 +573,7 @@ struct CYParenthetical :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -588,9 +583,9 @@ struct CYFunctionParameter :
     CYNext<CYFunctionParameter>,
     CYThing
 {
-    CYForInInitializer *initialiser_;
+    CYDeclaration *initialiser_;
 
-    CYFunctionParameter(CYForInInitializer *initialiser, CYFunctionParameter *next = NULL) :
+    CYFunctionParameter(CYDeclaration *initialiser, CYFunctionParameter *next = NULL) :
         CYNext<CYFunctionParameter>(next),
         initialiser_(initialiser)
     {
@@ -673,7 +668,7 @@ struct CYIfComprehension :
 };
 
 struct CYArrayComprehension :
-    CYExpression
+    CYTarget
 {
     CYExpression *expression_;
     CYComprehension *comprehensions_;
@@ -686,15 +681,16 @@ struct CYArrayComprehension :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYLiteral :
-    CYExpression
+    CYTarget
 {
+    CYLocation location_;
+
     CYPrecedence(0)
-    CYRightHand(false)
 
     virtual CYExpression *Primitive(CYContext &context) {
         return this;
@@ -704,14 +700,13 @@ struct CYLiteral :
 struct CYTrivial :
     CYLiteral
 {
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
 };
 
 struct CYMagic :
-    CYExpression
+    CYTarget
 {
     CYPrecedence(0)
-    CYRightHand(false)
 };
 
 struct CYRange {
@@ -780,6 +775,8 @@ struct CYString :
 
     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;
 };
 
@@ -802,7 +799,7 @@ struct CYSpan :
 };
 
 struct CYTemplate :
-    CYExpression
+    CYTarget
 {
     CYString *string_;
     CYSpan *spans_;
@@ -814,9 +811,8 @@ struct CYTemplate :
     }
 
     CYPrecedence(0)
-    CYRightHand(false)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -839,6 +835,26 @@ struct CYNumber :
     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;
 };
 
@@ -873,7 +889,7 @@ struct CYNull :
 struct CYThis :
     CYMagic
 {
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -907,7 +923,7 @@ struct CYTrue :
 };
 
 struct CYVariable :
-    CYExpression
+    CYTarget
 {
     CYIdentifier *name_;
 
@@ -922,9 +938,12 @@ struct CYVariable :
     }
 
     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;
@@ -993,17 +1012,17 @@ struct CYPostfix :
 struct CYAssignment :
     CYExpression
 {
-    CYExpression *lhs_;
+    CYTarget *lhs_;
     CYExpression *rhs_;
 
-    CYAssignment(CYExpression *lhs, CYExpression *rhs) :
+    CYAssignment(CYTarget *lhs, CYExpression *rhs) :
         lhs_(lhs),
         rhs_(rhs)
     {
     }
 
-    void SetLeft(CYExpression *lhs) {
-        lhs_ = lhs;
+    void SetRight(CYExpression *rhs) {
+        rhs_ = rhs;
     }
 
     virtual const char *Operator() const = 0;
@@ -1112,48 +1131,57 @@ struct CYArray :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     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
 {
-    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;
+};
+
+struct CYForVariable :
+    CYForInInitializer
+{
+    CYDeclaration *declaration_;
+
+    CYForVariable(CYDeclaration *declaration) :
+        declaration_(declaration)
+    {
+    }
 
-    virtual CYAssignment *Assignment(CYContext &context);
-    CYVariable *Variable(CYContext &context);
+    virtual CYStatement *Initialize(CYContext &context, CYExpression *value);
 
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1169,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);
 
@@ -1180,52 +1206,84 @@ struct CYDeclarations :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYForDeclarations :
+struct CYVar :
     CYForInitializer
 {
     CYDeclarations *declarations_;
 
-    CYForDeclarations(CYDeclarations *declarations) :
+    CYVar(CYDeclarations *declarations) :
         declarations_(declarations)
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    CYCompact(None)
+
+    virtual CYForInitializer *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYVar :
-    CYStatement
+struct CYLet :
+    CYForInitializer
 {
+    bool constant_;
     CYDeclarations *declarations_;
 
-    CYVar(CYDeclarations *declarations) :
+    CYLet(bool constant, CYDeclarations *declarations) :
+        constant_(constant),
         declarations_(declarations)
     {
     }
 
     CYCompact(None)
 
-    virtual CYStatement *Replace(CYContext &context);
+    virtual CYForInitializer *Replace(CYContext &context);
     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 :
@@ -1270,6 +1328,26 @@ struct CYForIn :
     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
 {
@@ -1300,12 +1378,12 @@ struct CYObject :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYMember :
-    CYExpression
+    CYTarget
 {
     CYExpression *object_;
     CYExpression *property_;
@@ -1330,9 +1408,8 @@ struct CYDirectMember :
     }
 
     CYPrecedence(1)
-    CYRightHand(false)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1345,9 +1422,8 @@ struct CYIndirectMember :
     }
 
     CYPrecedence(1)
-    CYRightHand(false)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1355,12 +1431,12 @@ namespace cy {
 namespace Syntax {
 
 struct New :
-    CYExpression
+    CYTarget
 {
     CYExpression *constructor_;
     CYArgument *arguments_;
 
-    New(CYExpression *constructor, CYArgument *arguments) :
+    New(CYExpression *constructor, CYArgument *arguments = NULL) :
         constructor_(constructor),
         arguments_(arguments)
     {
@@ -1370,41 +1446,61 @@ struct New :
         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 CYExpression *AddArgument(CYContext &context, CYExpression *value);
+    virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);
 };
 
 } }
 
-struct CYCall :
-    CYExpression
+struct CYApply :
+    CYTarget
 {
-    CYExpression *function_;
     CYArgument *arguments_;
 
-    CYCall(CYExpression *function, CYArgument *arguments = NULL) :
-        function_(function),
+    CYApply(CYArgument *arguments = NULL) :
         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 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 :
-    CYExpression
+    CYTarget
 {
     CYExpression *call_;
     CYRubyProc *proc_;
@@ -1416,12 +1512,11 @@ struct CYRubyBlock :
     }
 
     CYPrecedence(1)
-    CYRightHand(false)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
-    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
+    virtual CYTarget *AddArgument(CYContext &context, CYExpression *value);
 };
 
 struct CYIf :
@@ -1483,41 +1578,42 @@ struct CYWhile :
 };
 
 struct CYFunction {
-    CYIdentifier *name_;
     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),
-        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;
 };
 
 struct CYFunctionExpression :
     CYFunction,
-    CYExpression
+    CYTarget
 {
+    CYIdentifier *name_;
+
     CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
-        CYFunction(name, parameters, code)
+        CYFunction(parameters, code),
+        name_(name)
     {
     }
 
     CYPrecedence(0)
-    CYRightHand(false)
 
-    virtual CYExpression *Replace(CYContext &context);
+    CYTarget *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1526,27 +1622,28 @@ struct CYFatArrow :
     CYExpression
 {
     CYFatArrow(CYFunctionParameter *parameters, CYStatement *code) :
-        CYFunction(NULL, parameters, code)
+        CYFunction(parameters, code)
     {
     }
 
     CYPrecedence(0)
-    CYRightHand(false)
 
-    virtual CYExpression *Replace(CYContext &context);
+    CYExpression *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYRubyProc :
     CYFunction,
-    CYExpression
+    CYTarget
 {
     CYRubyProc(CYFunctionParameter *parameters, CYStatement *code) :
-        CYFunction(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;
 };
 
@@ -1554,19 +1651,164 @@ struct CYFunctionStatement :
     CYFunction,
     CYStatement
 {
+    CYIdentifier *name_;
+
     CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
-        CYFunction(name, parameters, code)
+        CYFunction(parameters, code),
+        name_(name)
     {
     }
 
     CYCompact(None)
 
-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;
     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
+{
+    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_;
 
@@ -1579,7 +1821,7 @@ struct CYExpress :
 
     CYCompact(None)
 
-    virtual CYStatement *Replace(CYContext &context);
+    CYForInitializer *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYStatement *Return();
@@ -1597,7 +1839,7 @@ struct CYContinue :
 
     CYCompact(Short)
 
-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1613,7 +1855,7 @@ struct CYBreak :
 
     CYCompact(Short)
 
-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1629,7 +1871,7 @@ struct CYReturn :
 
     CYCompact(None)
 
-    virtual CYStatement *Replace(CYContext &context);
+    CYStatement *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1645,7 +1887,7 @@ struct CYYieldGenerator :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace(CYContext &context);
+    CYExpression *Replace(CYContext &context) override;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1666,11 +1908,11 @@ struct CYYieldValue :
 };
 
 struct CYEmpty :
-    CYStatement
+    CYForInitializer
 {
     CYCompact(Short)
 
-    virtual CYStatement *Replace(CYContext &context);
+    virtual CYForInitializer *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1691,7 +1933,7 @@ struct CYFinally :
 struct CYTypeSpecifier :
     CYThing
 {
-    virtual CYExpression *Replace(CYContext &context) = 0;
+    virtual CYTarget *Replace(CYContext &context) = 0;
 };
 
 struct CYTypeError :
@@ -1700,7 +1942,7 @@ struct CYTypeError :
     CYTypeError() {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1710,7 +1952,7 @@ struct CYTypeVoid :
     CYTypeVoid() {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1729,7 +1971,7 @@ struct CYTypeVariable :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1743,7 +1985,7 @@ struct CYTypeUnsigned :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1757,7 +1999,7 @@ struct CYTypeSigned :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1771,7 +2013,7 @@ struct CYTypeLong :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1785,7 +2027,7 @@ struct CYTypeShort :
     {
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
@@ -1801,8 +2043,8 @@ struct CYTypeModifier :
 
     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;
@@ -1823,7 +2065,7 @@ struct CYTypeArrayOf :
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
@@ -1837,7 +2079,7 @@ struct CYTypeConstant :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
@@ -1851,7 +2093,7 @@ struct CYTypePointerTo :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
@@ -1865,7 +2107,7 @@ struct CYTypeVolatile :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
@@ -1898,14 +2140,14 @@ struct CYTypedIdentifier :
         return this;
     }
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 
     CYTypeFunctionWith *Function();
 };
 
 struct CYEncodedType :
-    CYExpression
+    CYTarget
 {
     CYTypedIdentifier *typed_;
 
@@ -1916,7 +2158,7 @@ struct CYEncodedType :
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1940,7 +2182,7 @@ struct CYTypedParameter :
 };
 
 struct CYLambda :
-    CYExpression
+    CYTarget
 {
     CYTypedIdentifier *typed_;
     CYTypedParameter *parameters_;
@@ -1955,7 +2197,7 @@ struct CYLambda :
 
     CYPrecedence(1)
 
-    virtual CYExpression *Replace(CYContext &context);
+    virtual CYTarget *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -2038,7 +2280,7 @@ struct CYTypeBlockWith :
 
     CYPrecedence(0)
 
-    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual CYTarget *Replace_(CYContext &context, CYTarget *type);
     virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
@@ -2055,7 +2297,7 @@ struct CYTypeFunctionWith :
 
     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; }
@@ -2205,20 +2447,20 @@ struct CYAddressOf :
 };
 
 struct CYIndirect :
-    CYPrefix
+    CYTarget
 {
+    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 \
@@ -2275,7 +2517,7 @@ struct CYIndirect :
     struct CY ## name ## Assign : \
         CYAssignment \
     { args \
-        CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
+        CY ## name ## Assign(CYTarget *lhs, CYExpression *rhs) : \
             CYAssignment(lhs, rhs) \
         { \
         } \