Check for APR and GNU make.

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 3fb903aa43cc3ddb3a8f4a2e988cb44d795bc7f9..f48e81bff435c3400645a8665117ad6714fb116b 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,40 +1,219 @@
+/* Cycript - Inlining/Optimizing JavaScript Compiler
+ * Copyright (C) 2009  Jay Freeman (saurik)
+*/
+
+/* Modified BSD License {{{ */
+/*
+ *        Redistribution and use in source and binary
+ * forms, with or without modification, are permitted
+ * provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the
+ *    above copyright notice, this list of conditions
+ *    and the following disclaimer in the documentation
+ *    and/or other materials provided with the
+ *    distribution.
+ * 3. The name of the author may not be used to endorse
+ *    or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
+ * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
+ * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
+ * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+*/
+/* }}} */
+

 #ifndef CYPARSER_HPP
 #define CYPARSER_HPP
 
 #ifndef CYPARSER_HPP
 #define CYPARSER_HPP
 

+// XXX: wtf is this here?!
+#define CYPA 16
+
+#include <iostream>
+
+#include <string>
+#include <vector>
+#include <map>
+#include <set>
+
+#include <cstdio>

 #include <cstdlib>
 
 #include <cstdlib>
 

-class CYParser {
-  public:
-    void *scanner_;
+#include "location.hh"
+#include "Pooling.hpp"
+#include "Options.hpp"

 
 

-  private:
-    void ScannerInit();
-    void ScannerDestroy();
+class CYContext;

 
 

-  public:
-    CYParser();
-    ~CYParser();
-};
+template <typename Type_>
+struct CYNext {
+    Type_ *next_;
+
+    CYNext() :
+        next_(NULL)
+    {
+    }

 
 

-struct CYSource {
-    CYSource *next_;
+    CYNext(Type_ *next) :
+        next_(next)
+    {
+    }

 
 

-    void SetNext(CYSource *next) {
+    void SetNext(Type_ *next) {

         next_ = next;
     }
 };
 
         next_ = next;
     }
 };
 

-struct CYName {
-    virtual const char *Name() const = 0;
+struct CYThing {
+    virtual ~CYThing() {
+    }
+
+    virtual void Output(struct CYOutput &out) const = 0;
+};
+
+struct CYOutput {
+    std::ostream &out_;
+    CYOptions &options_;
+    bool pretty_;
+    unsigned indent_;
+    bool right_;
+
+    enum {
+        NoMode,
+        NoLetter,
+        NoPlus,
+        NoHyphen,
+        Terminated
+    } mode_;
+
+    CYOutput(std::ostream &out, CYOptions &options) :
+        out_(out),
+        options_(options),
+        pretty_(false),
+        indent_(0),
+        right_(false),
+        mode_(NoMode)
+    {
+    }
+
+    void Check(char value);
+    void Terminate();
+
+    CYOutput &operator <<(char rhs);
+    CYOutput &operator <<(const char *rhs);
+
+    _finline CYOutput &operator <<(const CYThing *rhs) {
+        if (rhs != NULL)
+            rhs->Output(*this);
+        return *this;
+    }
+
+    _finline CYOutput &operator <<(const CYThing &rhs) {
+        rhs.Output(*this);
+        return *this;
+    }
+};
+
+struct CYPropertyName {
+    virtual void PropertyName(CYOutput &out) const = 0;
+
+    virtual ~CYPropertyName() {
+    }

 };
 
 };
 

-struct CYToken {
-    virtual const char *Text() 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),
+    CYNoInteger =    (1 << 6),
+    CYNoBF =         (CYNoBrace | CYNoFunction),
+};
+
+struct CYStatement :
+    CYNext<CYStatement>
+{
+    virtual ~CYStatement() {
+    }
+
+    void Single(CYOutput &out, CYFlags flags) const;
+    void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+
+    CYStatement *ReplaceAll(CYContext &context);
+    virtual CYStatement *Collapse(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 {
+    virtual ~CYClassName() {
+    }
+
+    virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
+    virtual void ClassName(CYOutput &out, bool object) const = 0;

 };
 
 struct CYWord :
 };
 
 struct CYWord :

-    virtual CYToken,
-    CYName
+    CYThing,
+    CYPropertyName,
+    CYClassName

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


@@ -43,126 +222,629 @@ struct CYWord :
     {
     }
 
     {
     }
 

-    virtual const char *Text() const {
-        return word_;
+    void Set(const char *value) {
+        word_ = value;

     }
 
     }
 

-    virtual const char *Name() const {
-        return Text();
-    }
+    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 void PropertyName(CYOutput &out) const;

 };
 
 };
 

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

 struct CYIdentifier :
 struct CYIdentifier :

+    CYNext<CYIdentifier>,

     CYWord
 {
     CYWord
 {

-    const char *word_;
+    CYIdentifier *replace_;
+    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);
+};
+
+struct CYComment :
+    CYStatement
+{
+    const char *value_;
+
+    CYComment(const char *value) :
+        value_(value)
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYLabel :
+    CYStatement
+{
+    CYIdentifier *name_;
+    CYStatement *statement_;
+
+    CYLabel(CYIdentifier *name, CYStatement *statement) :
+        name_(name),
+        statement_(statement)
+    {
+    }

 
 

-    virtual const char *Text() const {
-        return word_;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYCStringLess :
+    std::binary_function<const char *, const char *, bool>
+{
+    _finline bool operator ()(const char *lhs, const char *rhs) const {
+        return strcmp(lhs, rhs) < 0;
+    }
+};
+
+struct CYIdentifierValueLess :
+    std::binary_function<CYIdentifier *, CYIdentifier *, bool>
+{
+    _finline bool operator ()(CYIdentifier *lhs, CYIdentifier *rhs) const {
+        return CYCStringLess()(lhs->Word(), rhs->Word());

     }
 };
 
     }
 };
 

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

     CYIdentifier *identifier_;
     CYIdentifier *identifier_;

-    CYLabel *next_;
+    size_t usage_;
+};

 
 

-    CYLabel(CYIdentifier *identifier, CYLabel *next) :
-        identifier_(identifier),
-        next_(next)
+typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector;
+
+struct CYScope {
+    CYScope *parent_;
+
+    CYIdentifierAddressFlagsMap internal_;
+    CYIdentifierValueSet identifiers_;
+
+    CYScope() :
+        parent_(NULL)

     {
     }
     {
     }

+
+    virtual ~CYScope() {
+    }
+
+    void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags);
+    virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier);
+    void Merge(CYContext &context, CYIdentifier *identifier);
+    void Scope(CYContext &context, CYStatement *&statements);

 };
 
 };
 

-struct CYStatement :
-    CYSource
+struct CYProgram :
+    CYThing
+{
+    CYStatement *statements_;
+
+    CYProgram(CYStatement *statements) :
+        statements_(statements)
+    {
+    }
+
+    virtual void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYContext {
+    apr_pool_t *pool_;
+    CYOptions &options_;
+    CYScope *scope_;
+    CYIdentifierUsageVector rename_;
+
+    CYContext(apr_pool_t *pool, CYOptions &options) :
+        pool_(pool),
+        options_(options),
+        scope_(NULL)
+    {
+    }
+
+    virtual ~CYContext() {
+    }
+
+    template <typename Type_>
+    void Replace(Type_ *&value) {
+        for (;;) if (value == NULL)
+            break;
+        else {
+            Type_ *replace(value->Replace(*this));
+            if (replace != value)
+                value = replace;
+            else break;
+        }
+    }
+};
+
+struct CYBlock :
+    CYStatement,
+    CYThing

 {
 {

-    CYLabel *label_;
+    CYStatement *statements_;

 
 

-    void AddLabel(CYIdentifier *identifier) {
-        label_ = new CYLabel(identifier, label_);
+    CYBlock(CYStatement *statements) :
+        statements_(statements)
+    {
+    }
+
+    operator CYStatement *() const {
+        return statements_;

     }
     }

+
+    void AddPrev(CYStatement *statement) {
+        CYStatement *last(statement);
+        while (last->next_ != NULL)
+            last = last->next_;
+        last->SetNext(statements_);
+        statements_ = statement;
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+enum CYState {
+    CYClear,
+    CYRestricted,
+    CYNewLine
+};
+
+class CYDriver {
+  public:
+    CYPool pool_;
+
+    CYState state_;
+    void *scanner_;
+
+    const char *data_;
+    size_t size_;
+    FILE *file_;
+
+    bool strict_;
+
+    enum Condition {
+        RegExpCondition,
+        XMLContentCondition,
+        XMLTagCondition,
+    };
+
+    std::string filename_;
+
+    struct Error {
+        bool warning_;
+        cy::location location_;
+        std::string message_;
+    };
+
+    typedef std::vector<Error> Errors;
+
+    CYProgram *program_;
+    Errors errors_;
+
+  private:
+    void ScannerInit();
+    void ScannerDestroy();
+
+  public:
+    CYDriver(const std::string &filename);
+    ~CYDriver();
+
+    Condition GetCondition();
+    void SetCondition(Condition condition);
+
+    void PushCondition(Condition condition);
+    void PopCondition();
+
+    void Warning(const cy::location &location, const char *message);

 };
 
 struct CYForInitialiser {
 };
 
 struct CYForInitialiser {

+    virtual ~CYForInitialiser() {
+    }
+
+    virtual void For(CYOutput &out) const = 0;
+    virtual CYExpression *Replace(CYContext &context) = 0;

 };
 
 struct CYForInInitialiser {
 };
 
 struct CYForInInitialiser {

+    virtual ~CYForInInitialiser() {
+    }
+
+    virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
+    virtual const char *ForEachIn() const = 0;
+    virtual CYExpression *ForEachIn(CYContext &out) = 0;
+    virtual CYExpression *Replace(CYContext &context) = 0;

 };
 
 };
 

+struct CYNumber;
+struct CYString;
+

 struct CYExpression :
 struct CYExpression :

-    CYStatement,
+    CYNext<CYExpression>,

     CYForInitialiser,
     CYForInitialiser,

-    CYForInInitialiser
+    CYForInInitialiser,
+    CYClassName,
+    CYThing
+{
+    virtual unsigned Precedence() const = 0;
+
+    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;
+    }
+};
+
+#define CYAlphabetic(value) \
+    virtual bool Alphabetic() const { \
+        return value; \
+    }
+
+#define CYPrecedence(value) \
+    virtual unsigned Precedence() const { \
+        return value; \
+    }
+
+#define CYRightHand(value) \
+    virtual bool RightHand() const { \
+        return value; \
+    }
+
+struct CYCompound :
+    CYExpression
+{
+    CYExpression *expressions_;
+
+    CYCompound(CYExpression *expressions = NULL) :
+        expressions_(expressions)
+    {
+    }
+
+    void AddPrev(CYExpression *expression) {
+        CYExpression *last(expression);
+        while (last->next_ != NULL)
+            last = last->next_;
+        last->SetNext(expressions_);
+        expressions_ = expression;
+    }
+
+    CYPrecedence(17)
+
+    virtual CYExpression *Replace(CYContext &context);
+    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)
+    {
+    }
+
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYComprehension :
+    CYNext<CYComprehension>,
+    CYThing
+{
+    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 CYForInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Word();
+    }
+
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYForEachInComprehension :
+    CYComprehension
+{
+    CYIdentifier *name_;
+    CYExpression *set_;
+
+    CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+        name_(name),
+        set_(set)
+    {
+    }
+
+    virtual const char *Name() const {
+        return name_->Word();
+    }
+
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYIfComprehension :
+    CYComprehension

 {
 {

+    CYExpression *test_;
+
+    CYIfComprehension(CYExpression *test) :
+        test_(test)
+    {
+    }
+
+    virtual const char *Name() const {
+        return NULL;
+    }
+
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYArrayComprehension :
+    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
 {
 };
 
 struct CYLiteral :
     CYExpression
 {

+    CYPrecedence(0)
+    CYRightHand(false)
+};
+
+struct CYTrivial :
+    CYLiteral
+{
+    virtual CYExpression *Replace(CYContext &context);
+};
+
+struct CYMagic :
+    CYExpression
+{
+    CYPrecedence(0)
+    CYRightHand(false)
+};
+
+struct CYRange {
+    uint64_t lo_;
+    uint64_t hi_;
+
+    CYRange(uint64_t lo, uint64_t hi) :
+        lo_(lo), hi_(hi)
+    {
+    }
+
+    bool operator [](uint8_t value) const {
+        return !(value >> 7) && (value >> 6 ? hi_ : lo_) >> (value & 0x3f) & 0x1;
+    }
+
+    void operator()(uint8_t value) {
+        if (value >> 7)
+            return;
+        (value >> 6 ? hi_ : lo_) |= uint64_t(0x1) << (value & 0x3f);
+    }

 };
 
 };
 

+extern CYRange DigitRange_;
+extern CYRange WordStartRange_;
+extern CYRange WordEndRange_;
+

 struct CYString :
 struct CYString :

-    CYLiteral,
-    CYName
+    CYTrivial,
+    CYPropertyName

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

+    size_t size_;
+
+    CYString() :
+        value_(NULL),
+        size_(0)
+    {
+    }

 
     CYString(const char *value) :
 
     CYString(const char *value) :

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

     {
     }
 
     {
     }
 

-    CYString(const CYIdentifier *identifier) :
-        value_(identifier->Text())
+    CYString(const CYWord *word) :
+        value_(word->Word()),
+        size_(strlen(value_))

     {
     }
 
     {
     }
 

-    const char *String() const {
+    const char *Value() const {

         return value_;
     }
 
         return value_;
     }
 

-    virtual const char *Name() const {
-        return String();
-    }
+    virtual const char *Word() const;
+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+
+    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 :

-    virtual CYToken,
-    CYLiteral,
-    CYName
+    CYTrivial,
+    CYPropertyName
+{
+    double value_;
+
+    CYNumber(double value) :
+        value_(value)
+    {
+    }
+
+    double Value() const {
+        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 :
+    CYTrivial

 {
 {

-    double Number() const {
-        throw;
+    const char *value_;
+
+    CYRegEx(const char *value) :
+        value_(value)
+    {

     }
 
     }
 

-    virtual const char *Name() const {
-        throw;
+    const char *Value() const {
+        return value_;

     }
     }

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

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

 };
 
 struct CYThis :
     CYWord,
 };
 
 struct CYThis :
     CYWord,

-    CYExpression
+    CYMagic

 {
     CYThis() :
         CYWord("this")
     {
     }
 {
     CYThis() :
         CYWord("this")
     {
     }

+
+    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 void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYFalse :
 };
 
 struct CYFalse :


@@ -173,6 +855,13 @@ struct CYFalse :
         CYWord("false")
     {
     }
         CYWord("false")
     {
     }

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

 };
 
 struct CYTrue :
 };
 
 struct CYTrue :


@@ -183,6 +872,13 @@ struct CYTrue :
         CYWord("true")
     {
     }
         CYWord("true")
     {
     }

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

 };
 
 struct CYVariable :
 };
 
 struct CYVariable :


@@ -194,6 +890,12 @@ struct CYVariable :
         name_(name)
     {
     }
         name_(name)
     {
     }

+
+    CYPrecedence(0)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYPrefix :
 };
 
 struct CYPrefix :


@@ -205,6 +907,14 @@ struct CYPrefix :
         rhs_(rhs)
     {
     }
         rhs_(rhs)
     {
     }

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

 };
 
 struct CYInfix :
 };
 
 struct CYInfix :


@@ -218,6 +928,16 @@ struct CYInfix :
         rhs_(rhs)
     {
     }
         rhs_(rhs)
     {
     }

+
+    void SetLeft(CYExpression *lhs) {
+        lhs_ = lhs;
+    }
+
+    virtual bool Alphabetic() const = 0;
+    virtual const char *Operator() const = 0;
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYPostfix :
 };
 
 struct CYPostfix :


@@ -229,28 +949,62 @@ struct CYPostfix :
         lhs_(lhs)
     {
     }
         lhs_(lhs)
     {
     }

+
+    virtual const char *Operator() const = 0;
+
+    CYPrecedence(3)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYAssignment :
 };
 
 struct CYAssignment :

-    CYInfix
+    CYExpression

 {
 {

+    CYExpression *lhs_;
+    CYExpression *rhs_;
+

     CYAssignment(CYExpression *lhs, CYExpression *rhs) :
     CYAssignment(CYExpression *lhs, CYExpression *rhs) :

-        CYInfix(lhs, rhs)
+        lhs_(lhs),
+        rhs_(rhs)

     {
     }
     {
     }

+
+    void SetLeft(CYExpression *lhs) {
+        lhs_ = lhs;
+    }
+
+    virtual const char *Operator() const = 0;
+
+    CYPrecedence(16)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYArgument {
+struct CYArgument :
+    CYNext<CYArgument>,
+    CYThing
+{

     CYWord *name_;
     CYExpression *value_;
     CYWord *name_;
     CYExpression *value_;

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

 
     CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) :
 
     CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) :

+        CYNext<CYArgument>(next),

         name_(name),
         name_(name),

-        value_(value),
-        next_(next)
+        value_(value)

     {
     }
     {
     }

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

 };
 
 struct CYBlank :
 };
 
 struct CYBlank :


@@ -262,33 +1016,69 @@ struct CYBlank :
     }
 };
 
     }
 };
 

-struct CYClause {
+struct CYClause :
+    CYThing,
+    CYNext<CYClause>
+{

     CYExpression *case_;
     CYExpression *case_;

-    CYStatement *code_;
-    CYClause *next_;
+    CYStatement *statements_;

 
 

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

         case_(_case),
         case_(_case),

-        code_(code)
+        statements_(statements)

     {
     }
 
     {
     }
 

-    void SetNext(CYClause *next) {
-        next_ = next;
-    }
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 struct CYElement :
 };
 
 struct CYElement :

-    CYLiteral
+    CYNext<CYElement>,
+    CYThing

 {
     CYExpression *value_;
 {
     CYExpression *value_;

-    CYElement *next_;

 
     CYElement(CYExpression *value, CYElement *next) :
 
     CYElement(CYExpression *value, CYElement *next) :

-        value_(value),
-        next_(next)
+        CYNext<CYElement>(next),
+        value_(value)
+    {
+    }
+
+    void Replace(CYContext &context);
+    void Output(CYOutput &out) const;
+};
+
+struct CYArray :
+    CYLiteral
+{
+    CYElement *elements_;
+
+    CYArray(CYElement *elements = NULL) :
+        elements_(elements)
+    {
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYProperty :
+    CYNext<CYProperty>,
+    CYThing
+{
+    CYPropertyName *name_;
+    CYExpression *value_;
+
+    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next = NULL) :
+        CYNext<CYProperty>(next),
+        name_(name),
+        value_(value)

     {
     }
     {
     }

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

 };
 
 struct CYDeclaration :
 };
 
 struct CYDeclaration :


@@ -297,36 +1087,73 @@ struct CYDeclaration :
     CYIdentifier *identifier_;
     CYExpression *initialiser_;
 
     CYIdentifier *identifier_;
     CYExpression *initialiser_;
 

-    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser) :
+    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :

         identifier_(identifier),
         initialiser_(initialiser)
     {
     }
         identifier_(identifier),
         initialiser_(initialiser)
     {
     }

+
+    virtual void ForIn(CYOutput &out, CYFlags flags) const;
+
+    virtual const char *ForEachIn() const;
+    virtual CYExpression *ForEachIn(CYContext &out);
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual CYAssignment *Assignment(CYContext &context);
+
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYDeclarations :
 };
 
 struct CYDeclarations :

-    CYStatement,
+    CYNext<CYDeclarations>,
+    CYThing,

     CYForInitialiser
 {
     CYDeclaration *declaration_;
     CYForInitialiser
 {
     CYDeclaration *declaration_;

-    CYDeclarations *next_;

 
 

-    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
-        declaration_(declaration),
-        next_(next)
+    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :
+        CYNext<CYDeclarations>(next),
+        declaration_(declaration)

     {
     }
     {
     }

+
+    virtual void For(CYOutput &out) const;
+
+    virtual CYCompound *Replace(CYContext &context);
+    CYProperty *Property(CYContext &context);
+
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYParameter {
-    CYIdentifier *name_;
-    CYParameter *next_;
+struct CYVar :
+    CYStatement
+{
+    CYDeclarations *declarations_;

 
 

-    CYParameter(CYIdentifier *name, CYParameter *next) :
-        name_(name),
-        next_(next)
+    CYVar(CYDeclarations *declarations) :
+        declarations_(declarations)
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYLet :
+    CYStatement
+{
+    CYDeclarations *declarations_;
+    CYBlock code_;
+
+    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+        declarations_(declarations),
+        code_(statements)

     {
     }
     {
     }

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

 };
 
 struct CYFor :
 };
 
 struct CYFor :


@@ -344,6 +1171,9 @@ struct CYFor :
         code_(code)
     {
     }
         code_(code)
     {
     }

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

 };
 
 struct CYForIn :
 };
 
 struct CYForIn :


@@ -359,45 +1189,41 @@ struct CYForIn :
         code_(code)
     {
     }
         code_(code)
     {
     }

-};
-
-struct CYProperty :
-    CYLiteral
-{
-    CYName *name_;
-    CYExpression *value_;
-    CYProperty *next_;

 
 

-    CYProperty(CYName *name, CYExpression *value, CYProperty *next) :
-        name_(name),
-        value_(value),
-        next_(next)
-    {
-    }
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 };
 

-struct CYCatch {
-    CYIdentifier *name_;
+struct CYForEachIn :
+    CYStatement
+{
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;

     CYStatement *code_;
 
     CYStatement *code_;
 

-    CYCatch(CYIdentifier *name, CYStatement *code) :
-        name_(name),
+    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),

         code_(code)
     {
     }
         code_(code)
     {
     }

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

 };
 
 };
 

-struct CYMessage :
-    CYExpression
+struct CYObject :
+    CYLiteral

 {
 {

-    CYExpression *self_;
-    CYArgument *arguments_;
+    CYProperty *properties_;

 
 

-    CYMessage(CYExpression *self, CYArgument *arguments) :
-        self_(self),
-        arguments_(arguments)
+    CYObject(CYProperty *properties) :
+        properties_(properties)

     {
     }
     {
     }

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

 };
 
 struct CYMember :
 };
 
 struct CYMember :


@@ -411,6 +1237,42 @@ struct CYMember :
         property_(property)
     {
     }
         property_(property)
     {
     }

+
+    void SetLeft(CYExpression *object) {
+        object_ = object;
+    }
+
+    void Replace_(CYContext &context);
+};
+
+struct CYDirectMember :
+    CYMember
+{
+    CYDirectMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYIndirectMember :
+    CYMember
+{
+    CYIndirectMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
+
+    CYPrecedence(1)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYNew :
 };
 
 struct CYNew :


@@ -424,6 +1286,15 @@ struct CYNew :
         arguments_(arguments)
     {
     }
         arguments_(arguments)
     {
     }

+
+    virtual unsigned Precedence() const {
+        return arguments_ == NULL ? 2 : 1;
+    }
+
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYCall :
 };
 
 struct CYCall :


@@ -432,11 +1303,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(1)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYIf :
 };
 
 struct CYIf :


@@ -446,12 +1323,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 CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;

 };
 
 struct CYDoWhile :
 };
 
 struct CYDoWhile :


@@ -465,6 +1345,9 @@ struct CYDoWhile :
         code_(code)
     {
     }
         code_(code)
     {
     }

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

 };
 
 struct CYWhile :
 };
 
 struct CYWhile :


@@ -478,30 +1361,75 @@ struct CYWhile :
         code_(code)
     {
     }
         code_(code)
     {
     }

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

 };
 
 };
 

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

     CYIdentifier *name_;
     CYIdentifier *name_;

-    CYParameter *parameters_;
-    CYSource *body_;
+    CYFunctionParameter *parameters_;
+    CYBlock code_;

 
 

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

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

-        body_(body)
+        code_(statements)
+    {
+    }
+
+    virtual ~CYFunction() {
+    }
+
+    void Inject(CYContext &context);
+    virtual void Replace_(CYContext &context, bool outer);
+    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)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYFunctionStatement :
+    CYFunction,
+    CYStatement
+{
+    CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunction(name, parameters, statements)

     {
     }
     {
     }

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

 };
 
 };
 

-struct CYFunction :
-    CYLambda
+struct CYExpress :
+    CYStatement

 {
 {

-    CYFunction(CYIdentifier *name, CYParameter *parameters, CYSource *body) :
-        CYLambda(name, parameters, body)
+    CYExpression *expression_;
+
+    CYExpress(CYExpression *expression) :
+        expression_(expression)

     {
     {

+        if (expression == NULL)
+            throw;

     }
     }

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

 };
 
 struct CYContinue :
 };
 
 struct CYContinue :


@@ -513,6 +1441,9 @@ struct CYContinue :
         label_(label)
     {
     }
         label_(label)
     {
     }

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

 };
 
 struct CYBreak :
 };
 
 struct CYBreak :


@@ -524,6 +1455,9 @@ struct CYBreak :
         label_(label)
     {
     }
         label_(label)
     {
     }

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

 };
 
 struct CYReturn :
 };
 
 struct CYReturn :


@@ -535,39 +1469,86 @@ struct CYReturn :
         value_(value)
     {
     }
         value_(value)
     {
     }

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

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

+    virtual CYStatement *Collapse(CYContext &context);
+    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;
+};
+
+namespace cy {
+namespace Syntax {
+
+struct Catch :
+    CYThing
+{
+    CYIdentifier *name_;
+    CYBlock code_;
+
+    Catch(CYIdentifier *name, CYStatement *statements) :
+        name_(name),
+        code_(statements)
+    {
+    }
+
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;

 };
 
 };
 

-struct CYTry :
+struct Try :

     CYStatement
 {
     CYStatement
 {

-    CYStatement *try_;
-    CYCatch *catch_;
-    CYStatement *finally_;
+    CYBlock code_;
+    Catch *catch_;
+    CYFinally *finally_;

 
 

-    CYTry(CYStatement *_try, CYCatch *_catch, CYStatement *finally) :
-        try_(_try),
+    Try(CYStatement *statements, Catch *_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;

 };
 
 };
 

-struct CYThrow :
+struct Throw :

     CYStatement
 {
     CYExpression *value_;
 
     CYStatement
 {
     CYExpression *value_;
 

-    CYThrow(CYExpression *value) :
+    Throw(CYExpression *value) :

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

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

 };
 
 };
 

+} }
+

 struct CYWith :
     CYStatement
 {
 struct CYWith :
     CYStatement
 {


@@ -579,6 +1560,9 @@ struct CYWith :
         code_(code)
     {
     }
         code_(code)
     {
     }

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

 };
 
 struct CYSwitch :
 };
 
 struct CYSwitch :


@@ -592,6 +1576,9 @@ struct CYSwitch :
         clauses_(clauses)
     {
     }
         clauses_(clauses)
     {
     }

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

 };
 
 struct CYCondition :
 };
 
 struct CYCondition :


@@ -602,89 +1589,152 @@ struct CYCondition :
     CYExpression *false_;
 
     CYCondition(CYExpression *test, CYExpression *_true, CYExpression *_false) :
     CYExpression *false_;
 
     CYCondition(CYExpression *test, CYExpression *_true, CYExpression *_false) :

+        test_(test),

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

+
+    CYPrecedence(15)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYAddressOf :
+    CYPrefix
+{
+    CYAddressOf(CYExpression *rhs) :
+        CYPrefix(rhs)
+    {
+    }
+
+    virtual const char *Operator() const {
+        return "&";
+    }
+
+    CYAlphabetic(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+};
+
+struct CYIndirect :
+    CYPrefix
+{
+    CYIndirect(CYExpression *rhs) :
+        CYPrefix(rhs)
+    {
+    }
+
+    virtual const char *Operator() const {
+        return "*";
+    }
+
+    CYAlphabetic(false)
+
+    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) \
         { \
         } \

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

     };
 
     };
 

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

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

-    { \
+    { args \

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

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

     };
 
     };
 

-#define CYInfix_(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) \
         { \
         } \

+    \
+        CYAlphabetic(alphabetic) \
+        CYPrecedence(precedence) \
+    \
+        virtual const char *Operator() const { \
+            return op; \
+        } \

     };
 
     };
 

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

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

     };
 
 CYPostfix_("++", PostIncrement)
 CYPostfix_("--", PostDecrement)
 
     };
 
 CYPostfix_("++", PostIncrement)
 CYPostfix_("--", PostDecrement)
 

-CYPrefix_("delete", Delete)
-CYPrefix_("void", Void)
-CYPrefix_("typeof", TypeOf)
-CYPrefix_("++", PreIncrement)
-CYPrefix_("--", PreDecrement)
-CYPrefix_("-", Negate)
-CYPrefix_("~", BitwiseNot)
-CYPrefix_("!", LogicalNot)
-CYPrefix_("*", Indirect)
-CYPrefix_("&", AddressOf)
-
-CYInfix_("*", Multiply)
-CYInfix_("/", Divide)
-CYInfix_("%", Modulus)
-CYInfix_("+", Add)
-CYInfix_("-", Subtract)
-CYInfix_("<<", ShiftLeft)
-CYInfix_(">>", ShiftRightSigned)
-CYInfix_(">>>", ShiftRightUnsigned)
-CYInfix_("<", Less)
-CYInfix_(">", Greater)
-CYInfix_("<=", LessOrEqual)
-CYInfix_(">=", GreaterOrEqual)
-CYInfix_("instanceof", InstanceOf)
-CYInfix_("in", In)
-CYInfix_("==", Equal)
-CYInfix_("!=", NotEqual)
-CYInfix_("===", Identical)
-CYInfix_("!==", NotIdentical)
-CYInfix_("&", BitwiseAnd)
-CYInfix_("^", BitwiseXOr)
-CYInfix_("|", BitwiseOr)
-CYInfix_("&&", LogicalAnd)
-CYInfix_("||", LogicalOr)
+CYPrefix_(true, "delete", Delete)
+CYPrefix_(true, "void", Void)
+CYPrefix_(true, "typeof", TypeOf)
+CYPrefix_(false, "++", PreIncrement)
+CYPrefix_(false, "--", PreDecrement)
+CYPrefix_(false, "+", Affirm)
+CYPrefix_(false, "-", Negate)
+CYPrefix_(false, "~", BitwiseNot)
+CYPrefix_(false, "!", LogicalNot)
+
+CYInfix_(false, 5, "*", Multiply)
+CYInfix_(false, 5, "/", Divide)
+CYInfix_(false, 5, "%", Modulus)
+CYInfix_(false, 6, "+", Add, CYReplace)
+CYInfix_(false, 6, "-", Subtract)
+CYInfix_(false, 7, "<<", ShiftLeft)
+CYInfix_(false, 7, ">>", ShiftRightSigned)
+CYInfix_(false, 7, ">>>", ShiftRightUnsigned)
+CYInfix_(false, 8, "<", Less)
+CYInfix_(false, 8, ">", Greater)
+CYInfix_(false, 8, "<=", LessOrEqual)
+CYInfix_(false, 8, ">=", GreaterOrEqual)
+CYInfix_(true, 8, "instanceof", InstanceOf)
+CYInfix_(true, 8, "in", In)
+CYInfix_(false, 9, "==", Equal)
+CYInfix_(false, 9, "!=", NotEqual)
+CYInfix_(false, 9, "===", Identical)
+CYInfix_(false, 9, "!==", NotIdentical)
+CYInfix_(false, 10, "&", BitwiseAnd)
+CYInfix_(false, 11, "^", BitwiseXOr)
+CYInfix_(false, 12, "|", BitwiseOr)
+CYInfix_(false, 13, "&&", LogicalAnd)
+CYInfix_(false, 14, "||", LogicalOr)

 
 CYAssignment_("=", )
 CYAssignment_("*=", Multiply)
 
 CYAssignment_("=", )
 CYAssignment_("*=", Multiply)