Found the garbage collection bug from hell (classes apparently really need /something...

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 95c282a00d4fa46d3d52c5a6035600375f4e6e3d..86b7d17a70494cd4624afe3d18a1ee902fea88af 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,4 +1,4 @@
-/* Cycript - Remove Execution Server and Disassembler
+/* Cycript - Remote Execution Server and Disassembler

  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 
  * Copyright (C) 2009  Jay Freeman (saurik)
 */
 


@@ -40,10 +40,16 @@
 #ifndef CYPARSER_HPP
 #define CYPARSER_HPP
 
 #ifndef CYPARSER_HPP
 #define CYPARSER_HPP
 

-#include <cstdlib>
+// XXX: wtf is this here?!
+#define CYPA 16
+
+#include <iostream>
+

 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>
 

+#include <cstdlib>
+

 #include "location.hh"
 #include "Pooling.hpp"
 
 #include "location.hh"
 #include "Pooling.hpp"
 


@@ -78,6 +84,7 @@ struct CYOutput {
     enum {
         NoMode,
         NoLetter,
     enum {
         NoMode,
         NoLetter,

+        NoPlus,

         NoHyphen,
         Terminated
     } mode_;
         NoHyphen,
         Terminated
     } mode_;


@@ -91,6 +98,7 @@ struct CYOutput {
     }
 
     void Check(char value);
     }
 
     void Check(char value);

+    void Terminate();

 
     CYOutput &operator <<(char rhs);
     CYOutput &operator <<(const char *rhs);
 
     CYOutput &operator <<(char rhs);
     CYOutput &operator <<(const char *rhs);


@@ -105,16 +113,92 @@ struct CYOutput {
         rhs.Output(*this);
         return *this;
     }
         rhs.Output(*this);
         return *this;
     }

-
-    void Indent();
-    void Space();

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

+struct CYExpression;
+
+enum CYNeeded {
+    CYNever     = -1,
+    CYSometimes =  0,
+    CYAlways    =  1,
+};
+
+enum CYFlags {
+    CYNoFlags =      0,
+    CYNoBrace =      (1 << 0),
+    CYNoFunction =   (1 << 1),
+    CYNoIn =         (1 << 2),
+    CYNoCall =       (1 << 3),
+    CYNoRightHand =  (1 << 4),
+    CYNoDangle =     (1 << 5),
+    CYNoBF =         (CYNoBrace | CYNoFunction),
+};
+
+struct CYContext {
+    apr_pool_t *pool_;
+
+    CYContext(apr_pool_t *pool) :
+        pool_(pool)
+    {
+    }
+
+    template <typename Type_>
+    void Replace(Type_ *&value) {
+        if (value != NULL)
+            while (Type_ *replace = value->Replace(*this))
+                value = replace;
+    }
+};
+
+struct CYStatement :
+    CYNext<CYStatement>
+{
+    void Single(CYOutput &out, CYFlags flags) const;
+    void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+
+    CYStatement *ReplaceAll(CYContext &context);
+
+    virtual CYStatement *Replace(CYContext &context) = 0;
+
+  private:
+    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
+};
+
+struct CYStatements {
+    CYStatement *first_;
+    CYStatement *last_;
+
+    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 {
 struct CYClassName {

+    virtual CYExpression *ClassName(CYContext &context, bool object) = 0;

     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
 
     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
 


@@ -136,6 +220,7 @@ struct CYWord :
 
     virtual void Output(CYOutput &out) const;
 
 
     virtual void Output(CYOutput &out) const;
 

+    virtual CYExpression *ClassName(CYContext &context, bool object);

     virtual void ClassName(CYOutput &out, bool object) const;
     virtual void PropertyName(CYOutput &out) const;
 };
     virtual void ClassName(CYOutput &out, bool object) const;
     virtual void PropertyName(CYOutput &out) const;
 };


@@ -154,61 +239,39 @@ struct CYIdentifier :
 };
 
 struct CYLabel :
 };
 
 struct CYLabel :

-    CYNext<CYLabel>
+    CYStatement

 {
     CYIdentifier *name_;
 {
     CYIdentifier *name_;

+    CYStatement *statement_;

 
 

-    CYLabel(CYIdentifier *name, CYLabel *next) :
-        CYNext<CYLabel>(next),
-        name_(name)
+    CYLabel(CYIdentifier *name, CYStatement *statement) :
+        name_(name),
+        statement_(statement)

     {
     }
     {
     }

-};
-
-enum CYNeeded {
-    CYNever     = -1,
-    CYSometimes =  0,
-    CYAlways    =  1,
-};

 
 

-enum CYFlags {
-    CYNoFlags =      0,
-    CYNoBrace =      (1 << 0),
-    CYNoFunction =   (1 << 1),
-    CYNoIn =         (1 << 2),
-    CYNoCall =       (1 << 3),
-    CYNoRightHand =  (1 << 4),
-    CYNoDangle =     (1 << 5),
-    CYNoBF =         (CYNoBrace | CYNoFunction),
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYStatement :
-    CYNext<CYStatement>
+struct CYProgram :
+    CYThing

 {
 {

-    CYLabel *labels_;
+    CYStatement *statements_;

 
 

-    CYStatement() :
-        labels_(NULL)
+    CYProgram(CYStatement *statements) :
+        statements_(statements)

     {
     }
 
     {
     }
 

-    void AddLabel(CYIdentifier *identifier) {
-        labels_ = new CYLabel(identifier, labels_);
-    }
+    virtual void Replace(CYContext &context);

 
 

-    virtual bool IsBlock() const {
-        return next_ != NULL;
-    }
-
-    virtual void Single(CYOutput &out, CYFlags flags) const;
-    virtual void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
-
-  private:
-    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYBlock :
 };
 
 struct CYBlock :

-    CYStatement
+    CYStatement,
+    CYThing

 {
     CYStatement *statements_;
 
 {
     CYStatement *statements_;
 


@@ -217,10 +280,13 @@ struct CYBlock :
     {
     }
 
     {
     }
 

-    virtual bool IsBlock() const {
-        return true;
+    operator CYStatement *() const {
+        return statements_;

     }
 
     }
 

+    virtual CYStatement *Replace(CYContext &context);
+
+    virtual void Output(CYOutput &out) const;

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


@@ -258,7 +324,7 @@ class CYDriver {
 
     typedef std::vector<Error> Errors;
 
 
     typedef std::vector<Error> Errors;
 

-    CYStatement *program_;
+    CYProgram *program_;

     Errors errors_;
 
   private:
     Errors errors_;
 
   private:


@@ -281,9 +347,12 @@ struct CYForInitialiser {
 struct CYForInInitialiser {
     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
     virtual const char *ForEachIn() const = 0;
 struct CYForInInitialiser {
     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
     virtual const char *ForEachIn() const = 0;

-    virtual void ForEachIn(CYOutput &out) const = 0;
+    virtual CYExpression *ForEachIn(CYContext &out) = 0;

 };
 
 };
 

+struct CYNumber;
+struct CYString;
+

 struct CYExpression :
     CYNext<CYExpression>,
     CYForInitialiser,
 struct CYExpression :
     CYNext<CYExpression>,
     CYForInitialiser,


@@ -301,14 +370,31 @@ struct CYExpression :
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;

-    virtual void ForEachIn(CYOutput &out) const;
+    virtual CYExpression *ForEachIn(CYContext &out);

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

+    virtual CYExpression *ClassName(CYContext &context, bool object);

     virtual void ClassName(CYOutput &out, bool object) const;
 
     virtual void ClassName(CYOutput &out, bool object) const;
 

+    CYExpression *ReplaceAll(CYContext &context);
+
+    virtual CYExpression *Replace(CYContext &context) = 0;
+
+    virtual CYExpression *Primitive(CYContext &context) {
+        return this;
+    }
+
+    virtual CYNumber *Number(CYContext &context) {
+        return NULL;
+    }
+
+    virtual CYString *String(CYContext &context) {
+        return NULL;
+    }
+

     virtual const char *Word() const {
         return NULL;
     }
     virtual const char *Word() const {
         return NULL;
     }


@@ -349,20 +435,35 @@ struct CYCompound :
 
     CYPrecedence(17)
 
 
     CYPrecedence(17)
 

+    virtual CYExpression *Replace(CYContext &context);

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

+struct CYFunctionParameter :
+    CYNext<CYFunctionParameter>,
+    CYThing
+{
+    CYIdentifier *name_;
+
+    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next = NULL) :
+        CYNext<CYFunctionParameter>(next),
+        name_(name)
+    {
+    }
+
+    virtual void Output(CYOutput &out) const;
+};
+

 struct CYComprehension :
     CYNext<CYComprehension>,
     CYThing
 {
 struct CYComprehension :
     CYNext<CYComprehension>,
     CYThing
 {

-    void Output(CYOutput &out) const;

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

-    virtual void Begin_(CYOutput &out) const = 0;
-
-    virtual void End_(CYOutput &out) const {
-    }
+    virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
+    CYFunctionParameter *Parameters(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const = 0;

 };
 
 struct CYForInComprehension :
 };
 
 struct CYForInComprehension :


@@ -381,7 +482,9 @@ struct CYForInComprehension :
         return name_->Value();
     }
 
         return name_->Value();
     }
 

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

 };
 
 struct CYForEachInComprehension :
 };
 
 struct CYForEachInComprehension :


@@ -400,8 +503,9 @@ struct CYForEachInComprehension :
         return name_->Value();
     }
 
         return name_->Value();
     }
 

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

 };
 
 struct CYIfComprehension :
 };
 
 struct CYIfComprehension :


@@ -418,7 +522,9 @@ struct CYIfComprehension :
         return NULL;
     }
 
         return NULL;
     }
 

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

 };
 
 struct CYArrayComprehension :
 };
 
 struct CYArrayComprehension :


@@ -435,6 +541,7 @@ struct CYArrayComprehension :
 
     CYPrecedence(0)
 
 
     CYPrecedence(0)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -445,6 +552,12 @@ struct CYLiteral :
     CYRightHand(false)
 };
 
     CYRightHand(false)
 };
 

+struct CYTrivial :
+    CYLiteral
+{
+    virtual CYExpression *Replace(CYContext &context);
+};
+

 struct CYMagic :
     CYExpression
 {
 struct CYMagic :
     CYExpression
 {


@@ -452,38 +565,6 @@ struct CYMagic :
     CYRightHand(false)
 };
 
     CYRightHand(false)
 };
 

-struct CYSelectorPart :
-    CYNext<CYSelectorPart>,
-    CYThing
-{
-    CYWord *name_;
-    bool value_;
-
-    CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) :
-        CYNext<CYSelectorPart>(next),
-        name_(name),
-        value_(value)
-    {
-    }
-
-    virtual void Output(CYOutput &out) const;
-};
-
-struct CYSelector :
-    CYLiteral
-{
-    CYSelectorPart *name_;
-
-    CYSelector(CYSelectorPart *name) :
-        name_(name)
-    {
-    }
-
-    CYPrecedence(1)
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-

 struct CYRange {
     uint64_t lo_;
     uint64_t hi_;
 struct CYRange {
     uint64_t lo_;
     uint64_t hi_;


@@ -509,20 +590,32 @@ extern CYRange WordStartRange_;
 extern CYRange WordEndRange_;
 
 struct CYString :
 extern CYRange WordEndRange_;
 
 struct CYString :

-    CYLiteral,
+    CYTrivial,

     CYPropertyName
 {
     const char *value_;
     size_t size_;
 
     CYPropertyName
 {
     const char *value_;
     size_t size_;
 

+    CYString() :
+        value_(NULL),
+        size_(0)
+    {
+    }
+
+    CYString(const char *value) :
+        value_(value),
+        size_(strlen(value))
+    {
+    }
+

     CYString(const char *value, size_t size) :
         value_(value),
         size_(size)
     {
     }
 
     CYString(const char *value, size_t size) :
         value_(value),
         size_(size)
     {
     }
 

-    CYString(const CYIdentifier *identifier) :
-        value_(identifier->Value()),
+    CYString(const CYWord *word) :
+        value_(word->Value()),

         size_(strlen(value_))
     {
     }
         size_(strlen(value_))
     {
     }


@@ -533,12 +626,16 @@ struct CYString :
 
     virtual const char *Word() const;
 
 
     virtual const char *Word() const;
 

+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+
+    virtual CYString *Concat(CYContext &out, CYString *rhs) const;

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

-    CYLiteral,
+    CYTrivial,

     CYPropertyName
 {
     double value_;
     CYPropertyName
 {
     double value_;


@@ -552,12 +649,15 @@ struct CYNumber :
         return value_;
     }
 
         return value_;
     }
 

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

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

-    CYLiteral
+    CYTrivial

 {
     const char *value_;
 
 {
     const char *value_;
 


@@ -575,13 +675,16 @@ struct CYRegEx :
 
 struct CYNull :
     CYWord,
 
 struct CYNull :
     CYWord,

-    CYLiteral
+    CYTrivial

 {
     CYNull() :
         CYWord("null")
     {
     }
 
 {
     CYNull() :
         CYWord("null")
     {
     }
 

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

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


@@ -594,11 +697,12 @@ struct CYThis :
     {
     }
 
     {
     }
 

+    virtual CYExpression *Replace(CYContext &context);

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

-    CYLiteral
+    CYTrivial

 {
     virtual bool Value() const = 0;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 {
     virtual bool Value() const = 0;
     virtual void Output(CYOutput &out, CYFlags flags) const;


@@ -616,6 +720,9 @@ struct CYFalse :
     virtual bool Value() const {
         return false;
     }
     virtual bool Value() const {
         return false;
     }

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

 };
 
 struct CYTrue :
 };
 
 struct CYTrue :


@@ -630,6 +737,9 @@ struct CYTrue :
     virtual bool Value() const {
         return true;
     }
     virtual bool Value() const {
         return true;
     }

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

 };
 
 struct CYVariable :
 };
 
 struct CYVariable :


@@ -645,6 +755,7 @@ struct CYVariable :
     CYPrecedence(0)
     CYRightHand(false)
 
     CYPrecedence(0)
     CYRightHand(false)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -661,6 +772,9 @@ struct CYPrefix :
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 

+    CYPrecedence(4)
+
+    virtual CYExpression *Replace(CYContext &context);

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


@@ -683,6 +797,7 @@ struct CYInfix :
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -698,6 +813,9 @@ struct CYPostfix :
 
     virtual const char *Operator() const = 0;
 
 
     virtual const char *Operator() const = 0;
 

+    CYPrecedence(3)
+
+    virtual CYExpression *Replace(CYContext &context);

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


@@ -719,6 +837,9 @@ struct CYAssignment :
 
     virtual const char *Operator() const = 0;
 
 
     virtual const char *Operator() const = 0;
 

+    CYPrecedence(16)
+
+    virtual CYExpression *Replace(CYContext &context);

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


@@ -729,6 +850,13 @@ struct CYArgument :
     CYWord *name_;
     CYExpression *value_;
 
     CYWord *name_;
     CYExpression *value_;
 

+    CYArgument(CYExpression *value, CYArgument *next = NULL) :
+        CYNext<CYArgument>(next),
+        name_(NULL),
+        value_(value)
+    {
+    }
+

     CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) :
         CYNext<CYArgument>(next),
         name_(name),
     CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) :
         CYNext<CYArgument>(next),
         name_(name),


@@ -736,6 +864,7 @@ struct CYArgument :
     {
     }
 
     {
     }
 

+    void Replace(CYContext &context);

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


@@ -753,14 +882,15 @@ struct CYClause :
     CYNext<CYClause>
 {
     CYExpression *case_;
     CYNext<CYClause>
 {
     CYExpression *case_;

-    CYStatement *code_;
+    CYStatement *statements_;

 
 

-    CYClause(CYExpression *_case, CYStatement *code) :
+    CYClause(CYExpression *_case, CYStatement *statements) :

         case_(_case),
         case_(_case),

-        code_(code)
+        statements_(statements)

     {
     }
 
     {
     }
 

+    void Replace(CYContext &context);

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


@@ -776,6 +906,7 @@ struct CYElement :
     {
     }
 
     {
     }
 

+    void Replace(CYContext &context);

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


@@ -784,11 +915,12 @@ struct CYArray :
 {
     CYElement *elements_;
 
 {
     CYElement *elements_;
 

-    CYArray(CYElement *elements) :
+    CYArray(CYElement *elements = NULL) :

         elements_(elements)
     {
     }
 
         elements_(elements)
     {
     }
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -807,7 +939,9 @@ struct CYDeclaration :
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
 
     virtual const char *ForEachIn() const;

-    virtual void ForEachIn(CYOutput &out) const;
+    virtual CYExpression *ForEachIn(CYContext &out);
+
+    void Replace(CYContext &context);

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


@@ -819,7 +953,7 @@ struct CYDeclarations :
 {
     CYDeclaration *declaration_;
 
 {
     CYDeclaration *declaration_;
 

-    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
+    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :

         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {
         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {


@@ -827,6 +961,8 @@ struct CYDeclarations :
 
     virtual void For(CYOutput &out) const;
 
 
     virtual void For(CYOutput &out) const;
 

+    void Replace(CYContext &context);
+

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


@@ -841,6 +977,7 @@ struct CYVar :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -848,130 +985,18 @@ struct CYLet :
     CYStatement
 {
     CYDeclarations *declarations_;
     CYStatement
 {
     CYDeclarations *declarations_;

-    CYStatement *statements_;
+    CYBlock code_;

 
     CYLet(CYDeclarations *declarations, CYStatement *statements) :
         declarations_(declarations),
 
     CYLet(CYDeclarations *declarations, CYStatement *statements) :
         declarations_(declarations),

-        statements_(statements)
-    {
-    }
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYField :
-    CYNext<CYField>
-{
-    virtual void Output(CYOutput &out) const;
-};
-
-struct CYMessageParameter :
-    CYNext<CYMessageParameter>
-{
-    CYWord *tag_;
-    CYExpression *type_;
-    CYIdentifier *name_;
-
-    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
-        tag_(tag),
-        type_(type),
-        name_(name)
-    {
-    }
-};
-
-struct CYMessage :
-    CYNext<CYMessage>
-{
-    bool instance_;
-    CYExpression *type_;
-    CYMessageParameter *parameter_;
-    CYStatement *body_;
-
-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *body) :
-        instance_(instance),
-        type_(type),
-        parameter_(parameter),
-        body_(body)
-    {
-    }
-
-    virtual void Output(CYOutput &out, bool replace) const;
-};
-
-struct CYClass {
-    CYClassName *name_;
-    CYExpression *super_;
-    CYField *fields_;
-    CYMessage *messages_;
-
-    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        name_(name),
-        super_(super),
-        fields_(fields),
-        messages_(messages)
+        code_(statements)

     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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

-struct CYClassExpression :
-    CYClass,
-    CYExpression
-{
-    CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
-    {
-    }
-
-    CYPrecedence(0)
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYClassStatement :
-    CYClass,
-    CYStatement
-{
-    CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
-    {
-    }
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYCategory :
-    CYStatement
-{
-    CYClassName *name_;
-    CYMessage *messages_;
-
-    CYCategory(CYClassName *name, CYMessage *messages) :
-        name_(name),
-        messages_(messages)
-    {
-    }
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYFunctionParameter :
-    CYNext<CYFunctionParameter>,
-    CYThing
-{
-    CYIdentifier *name_;
-
-    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) :
-        CYNext<CYFunctionParameter>(next),
-        name_(name)
-    {
-    }
-
-    virtual void Output(CYOutput &out) const;
-};
-

 struct CYFor :
     CYStatement
 {
 struct CYFor :
     CYStatement
 {


@@ -988,6 +1013,7 @@ struct CYFor :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1005,6 +1031,7 @@ struct CYForIn :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1022,6 +1049,7 @@ struct CYForEachIn :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1032,26 +1060,28 @@ struct CYProperty :
     CYPropertyName *name_;
     CYExpression *value_;
 
     CYPropertyName *name_;
     CYExpression *value_;
 

-    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) :
+    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) :

         CYNext<CYProperty>(next),
         name_(name),
         value_(value)
     {
     }
 
         CYNext<CYProperty>(next),
         name_(name),
         value_(value)
     {
     }
 

+    void Replace(CYContext &context);

     virtual void Output(CYOutput &out) const;
 };
 
 struct CYObject :
     CYLiteral
 {
     virtual void Output(CYOutput &out) const;
 };
 
 struct CYObject :
     CYLiteral
 {

-    CYProperty *property_;
+    CYProperty *properties_;

 
 

-    CYObject(CYProperty *property) :
-        property_(property)
+    CYObject(CYProperty *properties) :
+        properties_(properties)

     {
     }
 
     {
     }
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1059,34 +1089,18 @@ struct CYCatch :
     CYThing
 {
     CYIdentifier *name_;
     CYThing
 {
     CYIdentifier *name_;

-    CYStatement *code_;
+    CYBlock code_;

 
 

-    CYCatch(CYIdentifier *name, CYStatement *code) :
+    CYCatch(CYIdentifier *name, CYStatement *statements) :

         name_(name),
         name_(name),

-        code_(code)
+        code_(statements)

     {
     }
 
     {
     }
 

+    void Replace(CYContext &context);

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

-struct CYSend :
-    CYExpression
-{
-    CYExpression *self_;
-    CYArgument *arguments_;
-
-    CYSend(CYExpression *self, CYArgument *arguments) :
-        self_(self),
-        arguments_(arguments)
-    {
-    }
-
-    CYPrecedence(0)
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-

 struct CYMember :
     CYExpression
 {
 struct CYMember :
     CYExpression
 {


@@ -1102,6 +1116,8 @@ struct CYMember :
     void SetLeft(CYExpression *object) {
         object_ = object;
     }
     void SetLeft(CYExpression *object) {
         object_ = object;
     }

+
+    void Replace_(CYContext &context);

 };
 
 struct CYDirectMember :
 };
 
 struct CYDirectMember :


@@ -1115,6 +1131,7 @@ struct CYDirectMember :
     CYPrecedence(1)
     CYRightHand(false)
 
     CYPrecedence(1)
     CYRightHand(false)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1129,6 +1146,7 @@ struct CYIndirectMember :
     CYPrecedence(1)
     CYRightHand(false)
 
     CYPrecedence(1)
     CYRightHand(false)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1150,6 +1168,7 @@ struct CYNew :
 
     CYRightHand(false)
 
 
     CYRightHand(false)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1159,7 +1178,7 @@ struct CYCall :
     CYExpression *function_;
     CYArgument *arguments_;
 
     CYExpression *function_;
     CYArgument *arguments_;
 

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

         function_(function),
         arguments_(arguments)
     {
         function_(function),
         arguments_(arguments)
     {


@@ -1168,6 +1187,7 @@ struct CYCall :
     CYPrecedence(1)
     CYRightHand(false)
 
     CYPrecedence(1)
     CYRightHand(false)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1178,13 +1198,14 @@ struct CYIf :
     CYStatement *true_;
     CYStatement *false_;
 
     CYStatement *true_;
     CYStatement *false_;
 

-    CYIf(CYExpression *test, CYStatement *_true, CYStatement *_false) :
+    CYIf(CYExpression *test, CYStatement *_true, CYStatement *_false = NULL) :

         test_(test),
         true_(_true),
         false_(_false)
     {
     }
 
         test_(test),
         true_(_true),
         false_(_false)
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1200,6 +1221,7 @@ struct CYDoWhile :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1215,21 +1237,23 @@ struct CYWhile :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;

-    CYStatement *body_;
+    CYBlock code_;

 
 

-    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
+    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :

         name_(name),
         parameters_(parameters),
         name_(name),
         parameters_(parameters),

-        body_(body)
+        code_(statements)

     {
     }
 
     {
     }
 

+    virtual void Replace_(CYContext &context);

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


@@ -1237,14 +1261,15 @@ struct CYFunctionExpression :
     CYFunction,
     CYExpression
 {
     CYFunction,
     CYExpression
 {

-    CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
-        CYFunction(name, parameters, body)
+    CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunction(name, parameters, statements)

     {
     }
 
     CYPrecedence(0)
     CYRightHand(false)
 
     {
     }
 
     CYPrecedence(0)
     CYRightHand(false)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1252,11 +1277,12 @@ struct CYFunctionStatement :
     CYFunction,
     CYStatement
 {
     CYFunction,
     CYStatement
 {

-    CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
-        CYFunction(name, parameters, body)
+    CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunction(name, parameters, statements)

     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1270,6 +1296,7 @@ struct CYExpress :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1283,6 +1310,7 @@ struct CYContinue :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1296,6 +1324,7 @@ struct CYBreak :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1309,42 +1338,46 @@ struct CYReturn :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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

+    virtual CYStatement *Replace(CYContext &context);

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

-    CYStatement *code_;
+    CYBlock code_;

 
 

-    CYFinally(CYStatement *code) :
-        code_(code)
+    CYFinally(CYStatement *statements) :
+        code_(statements)

     {
     }
 
     {
     }
 

+    void Replace(CYContext &context);

     virtual void Output(CYOutput &out) const;
 };
 
 struct CYTry :
     CYStatement
 {
     virtual void Output(CYOutput &out) const;
 };
 
 struct CYTry :
     CYStatement
 {

-    CYStatement *code_;
+    CYBlock code_;

     CYCatch *catch_;
     CYFinally *finally_;
 
     CYCatch *catch_;
     CYFinally *finally_;
 

-    CYTry(CYStatement *code, CYCatch *_catch, CYFinally *finally) :
-        code_(code),
+    CYTry(CYStatement *statements, CYCatch *_catch, CYFinally *finally) :
+        code_(statements),

         catch_(_catch),
         finally_(finally)
     {
     }
 
         catch_(_catch),
         finally_(finally)
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1358,6 +1391,7 @@ struct CYThrow :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1373,6 +1407,7 @@ struct CYWith :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1388,6 +1423,7 @@ struct CYSwitch :
     {
     }
 
     {
     }
 

+    virtual CYStatement *Replace(CYContext &context);

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


@@ -1407,6 +1443,7 @@ struct CYCondition :
 
     CYPrecedence(15)
 
 
     CYPrecedence(15)
 

+    virtual CYExpression *Replace(CYContext &context);

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


@@ -1423,9 +1460,8 @@ struct CYAddressOf :
     }
 
     CYAlphabetic(false)
     }
 
     CYAlphabetic(false)

-    CYPrecedence(2)

 
 

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

 };
 
 struct CYIndirect :
 };
 
 struct CYIndirect :


@@ -1441,48 +1477,47 @@ struct CYIndirect :
     }
 
     CYAlphabetic(false)
     }
 
     CYAlphabetic(false)

-    CYPrecedence(1)

 
 

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

 };
 
 };
 

-#define CYPostfix_(op, name) \
+#define CYReplace \
+    virtual CYExpression *Replace(CYContext &context);
+
+#define CYPostfix_(op, name, args...) \

     struct CY ## name : \
         CYPostfix \
     struct CY ## name : \
         CYPostfix \

-    { \
+    { args \

         CY ## name(CYExpression *lhs) : \
             CYPostfix(lhs) \
         { \
         } \
         CY ## name(CYExpression *lhs) : \
             CYPostfix(lhs) \
         { \
         } \

-    \
-        CYPrecedence(3) \

     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 
     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 

-#define CYPrefix_(alphabetic, op, name) \
+#define CYPrefix_(alphabetic, op, name, args...) \

     struct CY ## name : \
         CYPrefix \
     struct CY ## name : \
         CYPrefix \

-    { \
+    { args \

         CY ## name(CYExpression *rhs) : \
             CYPrefix(rhs) \
         { \
         } \
     \
         CYAlphabetic(alphabetic) \
         CY ## name(CYExpression *rhs) : \
             CYPrefix(rhs) \
         { \
         } \
     \
         CYAlphabetic(alphabetic) \

-        CYPrecedence(4) \

     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 
     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 

-#define CYInfix_(alphabetic, precedence, op, name) \
+#define CYInfix_(alphabetic, precedence, op, name, args...) \

     struct CY ## name : \
         CYInfix \
     struct CY ## name : \
         CYInfix \

-    { \
+    { args \

         CY ## name(CYExpression *lhs, CYExpression *rhs) : \
             CYInfix(lhs, rhs) \
         { \
         CY ## name(CYExpression *lhs, CYExpression *rhs) : \
             CYInfix(lhs, rhs) \
         { \


@@ -1496,16 +1531,14 @@ struct CYIndirect :
         } \
     };
 
         } \
     };
 

-#define CYAssignment_(op, name) \
+#define CYAssignment_(op, name, args...) \

     struct CY ## name ## Assign : \
         CYAssignment \
     struct CY ## name ## Assign : \
         CYAssignment \

-    { \
+    { args \

         CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
             CYAssignment(lhs, rhs) \
         { \
         } \
         CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
             CYAssignment(lhs, rhs) \
         { \
         } \

-    \
-        CYPrecedence(16) \

     \
         virtual const char *Operator() const { \
             return op; \
     \
         virtual const char *Operator() const { \
             return op; \


@@ -1520,6 +1553,7 @@ CYPrefix_(true, "void", Void)
 CYPrefix_(true, "typeof", TypeOf)
 CYPrefix_(false, "++", PreIncrement)
 CYPrefix_(false, "--", PreDecrement)
 CYPrefix_(true, "typeof", TypeOf)
 CYPrefix_(false, "++", PreIncrement)
 CYPrefix_(false, "--", PreDecrement)

+CYPrefix_(false, "+", Affirm)

 CYPrefix_(false, "-", Negate)
 CYPrefix_(false, "~", BitwiseNot)
 CYPrefix_(false, "!", LogicalNot)
 CYPrefix_(false, "-", Negate)
 CYPrefix_(false, "~", BitwiseNot)
 CYPrefix_(false, "!", LogicalNot)


@@ -1527,7 +1561,7 @@ CYPrefix_(false, "!", LogicalNot)
 CYInfix_(false, 5, "*", Multiply)
 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)
 CYInfix_(false, 5, "*", Multiply)
 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)

-CYInfix_(false, 6, "+", Add)
+CYInfix_(false, 6, "+", Add, CYReplace)

 CYInfix_(false, 6, "-", Subtract)
 CYInfix_(false, 7, "<<", ShiftLeft)
 CYInfix_(false, 7, ">>", ShiftRightSigned)
 CYInfix_(false, 6, "-", Subtract)
 CYInfix_(false, 7, "<<", ShiftLeft)
 CYInfix_(false, 7, ">>", ShiftRightSigned)