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 caddafca634d92c116b111db3c00a5b9fa12fd36..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"
 


@@ -67,33 +73,133 @@ struct CYNext {
 };
 
 struct CYThing {
 };
 
 struct CYThing {

-    virtual void Output(std::ostream &out) const = 0;
-};
+    virtual void Output(struct CYOutput &out) const = 0;
+};
+
+struct CYOutput {
+    std::ostream &out_;
+    bool pretty_;
+    unsigned indent_;
+
+    enum {
+        NoMode,
+        NoLetter,
+        NoPlus,
+        NoHyphen,
+        Terminated
+    } mode_;
+
+    CYOutput(std::ostream &out) :
+        out_(out),
+        pretty_(false),
+        indent_(0),
+        mode_(NoMode)
+    {
+    }

 
 

-_finline std::ostream &operator <<(std::ostream &out, const CYThing &rhs) {
-    rhs.Output(out);
-    return out;
-}
+    void Check(char value);
+    void Terminate();

 
 

-struct CYSource :
-    CYNext<CYSource>
-{
-    virtual bool IsBlock() const {
-        return next_ != NULL;
+    CYOutput &operator <<(char rhs);
+    CYOutput &operator <<(const char *rhs);
+
+    _finline CYOutput &operator <<(const CYThing *rhs) {
+        if (rhs != NULL)
+            rhs->Output(*this);
+        return *this;

     }
 
     }
 

-    virtual void Show(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const = 0;
-    virtual void Output(std::ostream &out, bool block) const;
-    virtual void Output_(std::ostream &out) const;
+    _finline CYOutput &operator <<(const CYThing &rhs) {
+        rhs.Output(*this);
+        return *this;
+    }

 };
 
 struct CYPropertyName {
 };
 
 struct CYPropertyName {

-    virtual void PropertyName(std::ostream &out) const = 0;
+    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 void ClassName(std::ostream &out, bool object) const = 0;
+    virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
+    virtual void ClassName(CYOutput &out, bool object) const = 0;

 };
 
 struct CYWord :
 };
 
 struct CYWord :


@@ -112,12 +218,17 @@ struct CYWord :
         return word_;
     }
 
         return word_;
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;

 
 

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

 };
 
 };
 

+_finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) {
+    return lhs << rhs.Value();
+}
+

 struct CYIdentifier :
     CYWord
 {
 struct CYIdentifier :
     CYWord
 {


@@ -128,36 +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)

     {
     }
     {
     }

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

 };
 
 };
 

-struct CYStatement :
-    CYSource
+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 void Output_(std::ostream &out) const;
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYBlock :
 };
 
 struct CYBlock :

-    CYStatement
+    CYStatement,
+    CYThing

 {
     CYStatement *statements_;
 
 {
     CYStatement *statements_;
 


@@ -166,11 +280,14 @@ struct CYBlock :
     {
     }
 
     {
     }
 

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

     }
 
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 enum CYState {
 };
 
 enum CYState {


@@ -190,16 +307,24 @@ class CYDriver {
     size_t size_;
     FILE *file_;
 
     size_t size_;
     FILE *file_;
 

+    bool strict_;
+
+    enum Condition {
+        RegExStart,
+        RegExRest
+    };
+

     std::string filename_;
 
     struct Error {
     std::string filename_;
 
     struct Error {

+        bool warning_;

         cy::location location_;
         std::string message_;
     };
 
     typedef std::vector<Error> Errors;
 
         cy::location location_;
         std::string message_;
     };
 
     typedef std::vector<Error> Errors;
 

-    CYSource *source_;
+    CYProgram *program_;

     Errors errors_;
 
   private:
     Errors errors_;
 
   private:


@@ -209,45 +334,66 @@ class CYDriver {
   public:
     CYDriver(const std::string &filename);
     ~CYDriver();
   public:
     CYDriver(const std::string &filename);
     ~CYDriver();

-};

 
 

-struct CYPart {
-    virtual void Part(std::ostream &out) const = 0;
-};
+    void SetCondition(Condition condition);

 
 

-struct CYForInitialiser :
-    CYPart
-{
+    void Warning(const cy::location &location, const char *message);

 };
 
 };
 

-struct CYForInInitialiser :
-    CYPart
-{
+struct CYForInitialiser {
+    virtual void For(CYOutput &out) const = 0;

 };
 
 };
 

-enum CYFlags {
-    CYNoFlags =    0,
-    CYNoBrace =    (1 << 0),
-    CYNoFunction = (1 << 1),
-    CYNoLeader =   (1 << 2),
-    CYNoTrailer =  (1 << 3),
-    CYNoIn =       (1 << 4),
-    CYNoHyphen =   (1 << 5),
-    CYNoBF =       (CYNoBrace | CYNoFunction),
+struct CYForInInitialiser {
+    virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
+    virtual const char *ForEachIn() const = 0;
+    virtual CYExpression *ForEachIn(CYContext &out) = 0;

 };
 
 };
 

+struct CYNumber;
+struct CYString;
+

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

-    CYClassName
+    CYClassName,
+    CYThing

 {
     virtual unsigned Precedence() const = 0;
 {
     virtual unsigned Precedence() const = 0;

-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out, CYFlags flags) const = 0;
-    void Output(std::ostream &out, unsigned precedence, CYFlags flags) const;

 
 

-    virtual void ClassName(std::ostream &out, bool object) const;
+    virtual bool RightHand() const {
+        return true;
+    }
+
+    virtual void For(CYOutput &out) const;
+    virtual void ForIn(CYOutput &out, CYFlags flags) const;
+
+    virtual const char *ForEachIn() 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 CYExpression *ClassName(CYContext &context, bool object);
+    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;


@@ -264,6 +410,11 @@ struct CYExpression :
         return value; \
     }
 
         return value; \
     }
 

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

 struct CYCompound :
     CYExpression
 {
 struct CYCompound :
     CYExpression
 {


@@ -284,50 +435,134 @@ struct CYCompound :
 
     CYPrecedence(17)
 
 
     CYPrecedence(17)
 

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

 };
 
 };
 

-struct CYLiteral :
-    CYExpression
+struct CYFunctionParameter :
+    CYNext<CYFunctionParameter>,
+    CYThing

 {
 {

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

 };
 
 };
 

-struct CYMagic :
-    CYExpression
+struct CYComprehension :
+    CYNext<CYComprehension>,
+    CYThing

 {
 {

-    CYPrecedence(0)
+    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 void Output(CYOutput &out) const = 0;

 };
 
 };
 

-struct CYSelectorPart :
-    CYNext<CYSelectorPart>
+struct CYForInComprehension :
+    CYComprehension

 {
 {

-    CYWord *name_;
-    bool value_;
+    CYIdentifier *name_;
+    CYExpression *set_;

 
 

-    CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) :
-        CYNext<CYSelectorPart>(next),
+    CYForInComprehension(CYIdentifier *name, CYExpression *set) :

         name_(name),
         name_(name),

-        value_(value)
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Value();
+    }
+
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYForEachInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)

     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual const char *Name() const {
+        return name_->Value();
+    }
+
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;

 };
 
 };
 

-struct CYSelector :
-    CYLiteral
+struct CYIfComprehension :
+    CYComprehension

 {
 {

-    CYSelectorPart *name_;
+    CYExpression *test_;

 
 

-    CYSelector(CYSelectorPart *name) :
-        name_(name)
+    CYIfComprehension(CYExpression *test) :
+        test_(test)

     {
     }
 
     {
     }
 

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

 
 

-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYArrayComprehension :
+    CYExpression
+{
+    CYExpression *expression_;
+    CYComprehension *comprehensions_;
+
+    CYArrayComprehension(CYExpression *expression, CYComprehension *comprehensions) :
+        expression_(expression),
+        comprehensions_(comprehensions)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYLiteral :
+    CYExpression
+{
+    CYPrecedence(0)
+    CYRightHand(false)
+};
+
+struct CYTrivial :
+    CYLiteral
+{
+    virtual CYExpression *Replace(CYContext &context);
+};
+
+struct CYMagic :
+    CYExpression
+{
+    CYPrecedence(0)
+    CYRightHand(false)

 };
 
 struct CYRange {
 };
 
 struct CYRange {


@@ -355,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_))
     {
     }


@@ -377,25 +624,18 @@ struct CYString :
         return value_;
     }
 
         return value_;
     }
 

-    virtual const char *Word() const {
-        if (size_ == 0 || !WordStartRange_[value_[0]])
-            return NULL;
-        for (size_t i(1); i != size_; ++i)
-            if (!WordEndRange_[value_[i]])
-                return NULL;
-        return Value();
-    }
+    virtual const char *Word() const;

 
 

-    virtual void Output(std::ostream &out) const {
-        return Output(out, CYNoFlags);
-    }
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);

 
 

-    virtual void Output(std::ostream &out, CYFlags flags) const;
-    virtual void PropertyName(std::ostream &out) const;
+    virtual CYString *Concat(CYContext &out, CYString *rhs) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual void PropertyName(CYOutput &out) const;

 };
 
 struct CYNumber :
 };
 
 struct CYNumber :

-    CYLiteral,
+    CYTrivial,

     CYPropertyName
 {
     double value_;
     CYPropertyName
 {
     double value_;


@@ -409,24 +649,43 @@ struct CYNumber :
         return value_;
     }
 
         return value_;
     }
 

-    virtual void Output(std::ostream &out) const {
-        return Output(out, CYNoFlags);
+    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 :
+    CYTrivial
+{
+    const char *value_;
+
+    CYRegEx(const char *value) :
+        value_(value)
+    {
+    }
+
+    const char *Value() const {
+        return value_;

     }
 
     }
 

-    virtual void Output(std::ostream &out, CYFlags flags) const;
-    virtual void PropertyName(std::ostream &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYNull :
     CYWord,
 };
 
 struct CYNull :
     CYWord,

-    CYLiteral
+    CYTrivial

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

-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYThis :
 };
 
 struct CYThis :


@@ -438,14 +697,15 @@ struct CYThis :
     {
     }
 
     {
     }
 

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

 };
 
 struct CYBoolean :
 };
 
 struct CYBoolean :

-    CYLiteral
+    CYTrivial

 {
     virtual bool Value() const = 0;
 {
     virtual bool Value() const = 0;

-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYFalse :
 };
 
 struct CYFalse :


@@ -457,7 +717,12 @@ struct CYFalse :
     {
     }
 
     {
     }
 

-    virtual bool Value() const;
+    virtual bool Value() const {
+        return false;
+    }
+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);

 };
 
 struct CYTrue :
 };
 
 struct CYTrue :


@@ -469,7 +734,12 @@ struct CYTrue :
     {
     }
 
     {
     }
 

-    virtual bool Value() const;
+    virtual bool Value() const {
+        return true;
+    }
+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);

 };
 
 struct CYVariable :
 };
 
 struct CYVariable :


@@ -483,8 +753,10 @@ struct CYVariable :
     }
 
     CYPrecedence(0)
     }
 
     CYPrecedence(0)

+    CYRightHand(false)

 
 

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

 };
 
 struct CYPrefix :
 };
 
 struct CYPrefix :


@@ -500,7 +772,10 @@ struct CYPrefix :
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 

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

 };
 
 struct CYInfix :
 };
 
 struct CYInfix :


@@ -522,7 +797,8 @@ 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 void Output(std::ostream &out, CYFlags flags) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYPostfix :
 };
 
 struct CYPostfix :


@@ -537,7 +813,10 @@ struct CYPostfix :
 
     virtual const char *Operator() const = 0;
 
 
     virtual const char *Operator() const = 0;
 

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

 };
 
 struct CYAssignment :
 };
 
 struct CYAssignment :


@@ -558,15 +837,26 @@ struct CYAssignment :
 
     virtual const char *Operator() const = 0;
 
 
     virtual const char *Operator() const = 0;
 

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

 };
 
 struct CYArgument :
 };
 
 struct CYArgument :

-    CYNext<CYArgument>
+    CYNext<CYArgument>,
+    CYThing

 {
     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),


@@ -574,7 +864,8 @@ struct CYArgument :
     {
     }
 
     {
     }
 

-    void Output(std::ostream &out) const;
+    void Replace(CYContext &context);
+    void Output(CYOutput &out) const;

 };
 
 struct CYBlank :
 };
 
 struct CYBlank :


@@ -591,19 +882,21 @@ 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)

     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYElement :
 };
 
 struct CYElement :

-    CYNext<CYElement>
+    CYNext<CYElement>,
+    CYThing

 {
     CYExpression *value_;
 
 {
     CYExpression *value_;
 


@@ -613,7 +906,8 @@ struct CYElement :
     {
     }
 
     {
     }
 

-    void Output(std::ostream &out) const;
+    void Replace(CYContext &context);
+    void Output(CYOutput &out) const;

 };
 
 struct CYArray :
 };
 
 struct CYArray :


@@ -621,16 +915,16 @@ struct CYArray :
 {
     CYElement *elements_;
 
 {
     CYElement *elements_;
 

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

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

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

 };
 
 struct CYDeclaration :
 };
 
 struct CYDeclaration :

-    CYThing,

     CYForInInitialiser
 {
     CYIdentifier *identifier_;
     CYForInInitialiser
 {
     CYIdentifier *identifier_;


@@ -642,118 +936,65 @@ struct CYDeclaration :
     {
     }
 
     {
     }
 

-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
-};
+    virtual void ForIn(CYOutput &out, CYFlags flags) const;

 
 

-struct CYDeclarations :
-    CYStatement,
-    CYForInitialiser
-{
-    CYDeclaration *declaration_;
-    CYDeclarations *next_;
+    virtual const char *ForEachIn() const;
+    virtual CYExpression *ForEachIn(CYContext &out);

 
 

-    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
-        declaration_(declaration),
-        next_(next)
-    {
-    }
+    void Replace(CYContext &context);

 
 

-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYField :
-    CYNext<CYField>
-{
-    virtual void Output(std::ostream &out) const;
-};
-
-struct CYMessageParameter :
-    CYNext<CYMessageParameter>
+struct CYDeclarations :
+    CYNext<CYDeclarations>,
+    CYForInitialiser,
+    CYThing

 {
 {

-    CYWord *tag_;
-    CYExpression *type_;
-    CYIdentifier *name_;
+    CYDeclaration *declaration_;

 
 

-    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
-        tag_(tag),
-        type_(type),
-        name_(name)
+    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :
+        CYNext<CYDeclarations>(next),
+        declaration_(declaration)

     {
     }
     {
     }

-};

 
 

-struct CYMessage :
-    CYNext<CYMessage>
-{
-    bool instance_;
-    CYExpression *type_;
-    CYMessageParameter *parameter_;
-    CYSource *body_;
+    virtual void For(CYOutput &out) const;

 
 

-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYSource *body) :
-        instance_(instance),
-        type_(type),
-        parameter_(parameter),
-        body_(body)
-    {
-    }
+    void Replace(CYContext &context);

 
 

-    virtual void Output(std::ostream &out, bool replace) const;
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYClass :
-    CYExpression,
+struct CYVar :

     CYStatement
 {
     CYStatement
 {

-    CYClassName *name_;
-    CYExpression *super_;
-    CYField *fields_;
-    CYMessage *messages_;
+    CYDeclarations *declarations_;

 
 

-    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        name_(name),
-        super_(super),
-        fields_(fields),
-        messages_(messages)
+    CYVar(CYDeclarations *declarations) :
+        declarations_(declarations)

     {
     }
 
     {
     }
 

-    CYPrecedence(0)
-
-    virtual void Output(std::ostream &out) const;
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYCategory :
+struct CYLet :

     CYStatement
 {
     CYStatement
 {

-    CYClassName *name_;
-    CYMessage *messages_;
+    CYDeclarations *declarations_;
+    CYBlock code_;

 
 

-    CYCategory(CYClassName *name, CYMessage *messages) :
-        name_(name),
-        messages_(messages)
+    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+        declarations_(declarations),
+        code_(statements)

     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
-};
-
-struct CYFunctionParameter :
-    CYNext<CYFunctionParameter>,
-    CYThing
-{
-    CYIdentifier *name_;
-
-    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) :
-        CYNext<CYFunctionParameter>(next),
-        name_(name)
-    {
-    }
-
-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYFor :
 };
 
 struct CYFor :


@@ -772,7 +1013,8 @@ struct CYFor :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYForIn :
 };
 
 struct CYForIn :


@@ -789,68 +1031,74 @@ struct CYForIn :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYForEachIn :
+    CYStatement
+{
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;
+    CYStatement *code_;
+
+    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),
+        code_(code)
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYProperty :
 };
 
 struct CYProperty :

-    CYNext<CYProperty>
+    CYNext<CYProperty>,
+    CYThing

 {
     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)
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYObject :
     CYLiteral
 {
 };
 
 struct CYObject :
     CYLiteral
 {

-    CYProperty *property_;
+    CYProperty *properties_;

 
 

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

     {
     }
 
     {
     }
 

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

 };
 
 struct CYCatch :
     CYThing
 {
     CYIdentifier *name_;
 };
 
 struct CYCatch :
     CYThing
 {
     CYIdentifier *name_;

-    CYStatement *code_;
+    CYBlock code_;

 
 

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

         name_(name),
         name_(name),

-        code_(code)
-    {
-    }
-
-    virtual void Output(std::ostream &out) const;
-};
-
-struct CYSend :
-    CYExpression
-{
-    CYExpression *self_;
-    CYArgument *arguments_;
-
-    CYSend(CYExpression *self, CYArgument *arguments) :
-        self_(self),
-        arguments_(arguments)
+        code_(statements)

     {
     }
 
     {
     }
 

-    CYPrecedence(0)
-
-    virtual void Output(std::ostream &out, CYFlags flags) const;
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYMember :
 };
 
 struct CYMember :


@@ -868,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 :


@@ -879,8 +1129,10 @@ struct CYDirectMember :
     }
 
     CYPrecedence(1)
     }
 
     CYPrecedence(1)

+    CYRightHand(false)

 
 

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

 };
 
 struct CYIndirectMember :
 };
 
 struct CYIndirectMember :


@@ -892,8 +1144,10 @@ struct CYIndirectMember :
     }
 
     CYPrecedence(1)
     }
 
     CYPrecedence(1)

+    CYRightHand(false)

 
 

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

 };
 
 struct CYNew :
 };
 
 struct CYNew :


@@ -908,9 +1162,14 @@ struct CYNew :
     {
     }
 
     {
     }
 

-    CYPrecedence(1)
+    virtual unsigned Precedence() const {
+        return arguments_ == NULL ? 2 : 1;
+    }

 
 

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

 };
 
 struct CYCall :
 };
 
 struct CYCall :


@@ -919,15 +1178,17 @@ 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)
     {
     }
 

-    CYPrecedence(2)
+    CYPrecedence(1)
+    CYRightHand(false)

 
 

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

 };
 
 struct CYIf :
 };
 
 struct CYIf :


@@ -937,14 +1198,15 @@ 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 void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYDoWhile :
 };
 
 struct CYDoWhile :


@@ -959,7 +1221,8 @@ struct CYDoWhile :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYWhile :
 };
 
 struct CYWhile :


@@ -974,38 +1237,53 @@ struct CYWhile :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYLambda :
-    CYExpression
-{
+struct CYFunction {

     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;

-    CYSource *body_;
+    CYBlock code_;

 
 

-    CYLambda(CYIdentifier *name, CYFunctionParameter *parameters, CYSource *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;
+};
+
+struct CYFunctionExpression :
+    CYFunction,
+    CYExpression
+{
+    CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunction(name, parameters, statements)

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

+    CYRightHand(false)

 
 

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

 };
 
 };
 

-struct CYFunction :
-    CYLambda,
-    CYSource
+struct CYFunctionStatement :
+    CYFunction,
+    CYStatement

 {
 {

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

     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYExpress :
 };
 
 struct CYExpress :


@@ -1018,7 +1296,8 @@ struct CYExpress :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYContinue :
 };
 
 struct CYContinue :


@@ -1031,7 +1310,8 @@ struct CYContinue :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYBreak :
 };
 
 struct CYBreak :


@@ -1044,7 +1324,8 @@ struct CYBreak :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYReturn :
 };
 
 struct CYReturn :


@@ -1057,31 +1338,47 @@ struct CYReturn :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYEmpty :
     CYStatement
 {
 };
 
 struct CYEmpty :
     CYStatement
 {

-    virtual void Output(std::ostream &out) const;
-    virtual void Output(std::ostream &out, bool block) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYFinally :
+    CYThing
+{
+    CYBlock code_;
+
+    CYFinally(CYStatement *statements) :
+        code_(statements)
+    {
+    }
+
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYTry :
     CYStatement
 {
 };
 
 struct CYTry :
     CYStatement
 {

-    CYStatement *try_;
+    CYBlock code_;

     CYCatch *catch_;
     CYCatch *catch_;

-    CYStatement *finally_;
+    CYFinally *finally_;

 
 

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

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

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYThrow :
 };
 
 struct CYThrow :


@@ -1094,7 +1391,8 @@ struct CYThrow :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYWith :
 };
 
 struct CYWith :


@@ -1109,7 +1407,8 @@ struct CYWith :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYSwitch :
 };
 
 struct CYSwitch :


@@ -1124,7 +1423,8 @@ struct CYSwitch :
     {
     }
 
     {
     }
 

-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYCondition :
 };
 
 struct CYCondition :


@@ -1143,7 +1443,8 @@ struct CYCondition :
 
     CYPrecedence(15)
 
 
     CYPrecedence(15)
 

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

 };
 
 struct CYAddressOf :
 };
 
 struct CYAddressOf :


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

-    CYPrecedence(2)

 
 

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

 };
 
 struct CYIndirect :
 };
 
 struct CYIndirect :


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

-    CYPrecedence(1)

 
 

-    virtual void Output(std::ostream &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) \
         { \


@@ -1232,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; \


@@ -1256,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)


@@ -1263,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)