X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/db5e284073ce1f951343c5825a7e4d64d159582b..6c093cce11bcc8875e4459b3670811227e8dafa7:/Parser.hpp?ds=sidebyside

diff --git a/Parser.hpp b/Parser.hpp
index d7322aa..49e0722 100644
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,11 +1,63 @@
+/* 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
 
-#include <cstdlib>
+// XXX: wtf is this here?!
+#define CYPA 16
+
+#include <iostream>
+
 #include <string>
 #include <vector>
+#include <map>
+#include <set>
 
+#include <cstdio>
+#include <cstdlib>
+
+#include "location.hh"
 #include "Pooling.hpp"
+#include "Options.hpp"
+
+class CYContext;
 
 template <typename Type_>
 struct CYNext {
@@ -16,40 +68,152 @@ struct CYNext {
     {
     }
 
+    CYNext(Type_ *next) :
+        next_(next)
+    {
+    }
+
     void SetNext(Type_ *next) {
         next_ = next;
     }
 };
 
 struct CYThing {
-    virtual void Output(std::ostream &out) const = 0;
+    virtual ~CYThing() {
+    }
+
+    virtual void Output(struct CYOutput &out) const = 0;
 };
 
-_finline std::ostream &operator <<(std::ostream &out, const CYThing &rhs) {
-    rhs.Output(out);
-    return out;
-}
+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)
+    {
+    }
 
-struct CYPart {
-    virtual void Part(std::ostream &out) const = 0;
+    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 CYSource :
-    CYNext<CYSource>
-{
-    virtual void Show(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const = 0;
-    virtual void Output(std::ostream &out, bool block) const;
+struct CYPropertyName {
+    virtual void PropertyName(CYOutput &out) const = 0;
+
+    virtual ~CYPropertyName() {
+    }
 };
 
-struct CYName :
-    CYThing
+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 const char *Name() const = 0;
+    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 :
-    CYName
+    CYThing,
+    CYPropertyName,
+    CYClassName
 {
     const char *word_;
 
@@ -58,47 +222,199 @@ struct CYWord :
     {
     }
 
-    const char *Value() const {
-        return word_;
+    void Set(const char *value) {
+        word_ = value;
     }
 
-    virtual const char *Name() const {
-        return Value();
-    }
+    virtual const char *Word() const;
+    virtual void Output(CYOutput &out) const;
 
-    virtual void Output(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) {
+    lhs << &rhs << '=';
+    return lhs << rhs.Word();
+}
+
 struct CYIdentifier :
+    CYNext<CYIdentifier>,
     CYWord
 {
+    CYIdentifier *replace_;
+    size_t offset_;
+    size_t usage_;
+
     CYIdentifier(const char *word) :
-        CYWord(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 {
+struct CYLabel :
+    CYStatement
+{
+    CYIdentifier *name_;
+    CYStatement *statement_;
+
+    CYLabel(CYIdentifier *name, CYStatement *statement) :
+        name_(name),
+        statement_(statement)
+    {
+    }
+
+    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());
+    }
+};
+
+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_;
-    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
 {
-    CYLabel *label_;
+    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_;
 
-    void AddLabel(CYIdentifier *identifier) {
-        label_ = new CYLabel(identifier, label_);
+    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
+{
+    CYStatement *statements_;
+
+    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,
@@ -108,67 +424,381 @@ enum CYState {
 class CYDriver {
   public:
     CYPool pool_;
+
     CYState state_;
-    std::string filename_;
-    std::vector<CYSource *> source_;
     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_;
+
+    bool auto_;
+
+    struct Context {
+        CYExpression *context_;
+
+        Context(CYExpression *context) :
+            context_(context)
+        {
+        }
+
+        typedef std::vector<CYWord *> Words;
+        Words words_;
+    };
+
+    typedef std::vector<Context> Contexts;
+    Contexts contexts_;
+
+    CYExpression *context_;
+
+    enum Mode {
+        AutoNone,
+        AutoPrimary,
+        AutoDirect,
+        AutoIndirect,
+        AutoMessage
+    } mode_;
+
   private:
     void ScannerInit();
     void ScannerDestroy();
 
   public:
-    CYDriver(const std::string &filename);
+    CYDriver(apr_pool_t *pool = NULL, const std::string &filename = "");
     ~CYDriver();
 
-    void Clear();
+    Condition GetCondition();
+    void SetCondition(Condition condition);
+
+    void PushCondition(Condition condition);
+    void PopCondition();
+
+    void Warning(const cy::location &location, const char *message);
 };
 
-struct CYForInitialiser :
-    CYPart
-{
+struct CYForInitialiser {
+    virtual ~CYForInitialiser() {
+    }
+
+    virtual void For(CYOutput &out) const = 0;
+    virtual CYExpression *Replace(CYContext &context) = 0;
 };
 
-struct CYForInInitialiser :
-    CYPart
-{
+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 :
     CYNext<CYExpression>,
     CYForInitialiser,
-    CYForInInitialiser
+    CYForInInitialiser,
+    CYClassName,
+    CYThing
 {
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const = 0;
-    void Output(std::ostream &out, bool raw) const;
+    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 CYExpression *AddArgument(CYContext &context, CYExpression *value);
+
+    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;
+    }
 };
 
-_finline std::ostream &operator <<(std::ostream &out, const CYExpression &rhs) {
-    rhs.Output(out, false);
-    return out;
-}
+#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)
+    {
+    }
+
+    virtual CYFunctionParameter *Replace(CYContext &context, CYBlock &code);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYOptionalFunctionParameter :
+    CYFunctionParameter
+{
+    CYExpression *initializer_;
+
+    CYOptionalFunctionParameter(CYIdentifier *name, CYExpression *initializer, CYFunctionParameter *next = NULL) :
+        CYFunctionParameter(name, next),
+        initializer_(initializer)
+    {
+    }
+
+    virtual CYFunctionParameter *Replace(CYContext &context, CYBlock &code);
+    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
 {
+    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 :
-    CYLiteral,
-    CYName
+    CYTrivial,
+    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 CYIdentifier *identifier) :
-        value_(identifier->Value()),
+    CYString(const CYWord *word) :
+        value_(word->Word()),
         size_(strlen(value_))
     {
     }
@@ -177,16 +807,19 @@ struct CYString :
         return value_;
     }
 
-    virtual const char *Name() const {
-        return Value();
-    }
+    virtual const char *Word() const;
+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
 
-    virtual void Output(std::ostream &out) const;
+    CYString *Concat(CYContext &out, CYString *rhs) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual void PropertyName(CYOutput &out) const;
 };
 
 struct CYNumber :
-    CYLiteral,
-    CYName
+    CYTrivial,
+    CYPropertyName
 {
     double value_;
 
@@ -199,42 +832,63 @@ struct CYNumber :
         return value_;
     }
 
-    virtual const char *Name() const {
-        throw;
+    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) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYNull :
     CYWord,
-    CYLiteral
+    CYTrivial
 {
     CYNull() :
         CYWord("null")
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
+
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYThis :
     CYWord,
-    CYExpression
+    CYMagic
 {
     CYThis() :
         CYWord("this")
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYBoolean :
-    CYLiteral
+    CYTrivial
 {
     virtual bool Value() const = 0;
-    virtual void Output(std::ostream &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFalse :
@@ -249,6 +903,9 @@ struct CYFalse :
     virtual bool Value() const {
         return false;
     }
+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
 };
 
 struct CYTrue :
@@ -263,6 +920,9 @@ struct CYTrue :
     virtual bool Value() const {
         return true;
     }
+
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
 };
 
 struct CYVariable :
@@ -275,7 +935,11 @@ struct CYVariable :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(0)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYPrefix :
@@ -288,9 +952,13 @@ struct CYPrefix :
     {
     }
 
+    virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(4)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYInfix :
@@ -305,9 +973,15 @@ struct CYInfix :
     {
     }
 
+    void SetLeft(CYExpression *lhs) {
+        lhs_ = lhs;
+    }
+
+    virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYPostfix :
@@ -322,33 +996,59 @@ struct CYPostfix :
 
     virtual const char *Operator() const = 0;
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(3)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYAssignment :
-    CYInfix
+    CYExpression
 {
+    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_;
-    CYArgument *next_;
+
+    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),
-        value_(value),
-        next_(next)
+        value_(value)
     {
     }
 
-    void Output(std::ostream &out, bool send) const;
+    void Replace(CYContext &context);
+    void Output(CYOutput &out) const;
 };
 
 struct CYBlank :
@@ -365,80 +1065,139 @@ struct CYClause :
     CYNext<CYClause>
 {
     CYExpression *case_;
-    CYStatement *code_;
+    CYStatement *statements_;
 
-    CYClause(CYExpression *_case, CYStatement *code) :
+    CYClause(CYExpression *_case, CYStatement *statements) :
         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 :
-    CYLiteral
+    CYNext<CYElement>,
+    CYThing
 {
     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 Output(std::ostream &out, bool raw) const;
-    virtual void Output(std::ostream &out) const;
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYDeclaration :
-    CYThing,
     CYForInInitialiser
 {
     CYIdentifier *identifier_;
     CYExpression *initialiser_;
 
-    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser) :
+    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :
         identifier_(identifier),
         initialiser_(initialiser)
     {
     }
 
-    virtual void Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
+    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 :
-    CYStatement,
+    CYNext<CYDeclarations>,
+    CYThing,
     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 Part(std::ostream &out) const;
-    virtual void Output(std::ostream &out) const;
+    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 :
-    CYThing
+struct CYVar :
+    CYStatement
 {
-    CYIdentifier *name_;
-    CYParameter *next_;
+    CYDeclarations *declarations_;
 
-    CYParameter(CYIdentifier *name, CYParameter *next) :
-        name_(name),
-        next_(next)
+    CYVar(CYDeclarations *declarations) :
+        declarations_(declarations)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    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 :
@@ -457,7 +1216,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 :
@@ -474,55 +1234,40 @@ struct CYForIn :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
-};
-
-struct CYProperty :
-    CYLiteral
-{
-    CYName *name_;
-    CYExpression *value_;
-    CYProperty *next_;
-
-    CYProperty(CYName *name, CYExpression *value, CYProperty *next) :
-        name_(name),
-        value_(value),
-        next_(next)
-    {
-    }
-
-    void Output(std::ostream &out, bool raw) const;
-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYCatch :
-    CYThing
+struct CYForEachIn :
+    CYStatement
 {
-    CYIdentifier *name_;
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;
     CYStatement *code_;
 
-    CYCatch(CYIdentifier *name, CYStatement *code) :
-        name_(name),
+    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),
         code_(code)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    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 void Output(std::ostream &out) const;
+    virtual CYExpression *Replace(CYContext &context);
+    void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYMember :
@@ -537,7 +1282,41 @@ struct CYMember :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    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 :
@@ -552,7 +1331,16 @@ struct CYNew :
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual unsigned Precedence() const {
+        return arguments_ == NULL ? 2 : 1;
+    }
+
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
 };
 
 struct CYCall :
@@ -561,13 +1349,40 @@ struct CYCall :
     CYExpression *function_;
     CYArgument *arguments_;
 
-    CYCall(CYExpression *function, CYArgument *arguments) :
+    CYCall(CYExpression *function, CYArgument *arguments = NULL) :
         function_(function),
         arguments_(arguments)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(1)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
+};
+
+struct CYRubyProc;
+
+struct CYRubyBlock :
+    CYExpression
+{
+    CYExpression *call_;
+    CYRubyProc *proc_;
+
+    CYRubyBlock(CYExpression *call, CYRubyProc *proc) :
+        call_(call),
+        proc_(proc)
+    {
+    }
+
+    CYPrecedence(1)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYIf :
@@ -577,14 +1392,15 @@ struct CYIf :
     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)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDoWhile :
@@ -599,7 +1415,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 :
@@ -614,36 +1431,73 @@ 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
-{
+// XXX: this should be split up into CYAnonymousFunction and CYNamedFunction (subclass)
+struct CYFunction {
     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),
-        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;
+};
+
+// XXX: this should be split up into CYAnonymousFunctionExpression and CYNamedFunctionExpression
+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;
+};
+
+// XXX: this should derive from CYAnonymousFunctionExpression
+struct CYRubyProc :
+    CYFunctionExpression
+{
+    CYRubyProc(CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunctionExpression(NULL, parameters, statements)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYFunction :
-    CYLambda,
-    CYSource
+// XXX: this should derive from CYNamedFunction
+struct CYFunctionStatement :
+    CYFunction,
+    CYStatement
 {
-    CYFunction(CYIdentifier *name, CYParameter *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 :
@@ -654,9 +1508,13 @@ struct CYExpress :
     CYExpress(CYExpression *expression) :
         expression_(expression)
     {
+        if (expression == NULL)
+            throw;
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Collapse(CYContext &context);
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYContinue :
@@ -669,7 +1527,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 :
@@ -682,7 +1541,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 :
@@ -695,46 +1555,85 @@ 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
 {
-    virtual void Output(std::ostream &out) const;
-    virtual void Output(std::ostream &out, bool block) const;
+    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 *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)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYThrow :
+struct Throw :
     CYStatement
 {
     CYExpression *value_;
 
-    CYThrow(CYExpression *value) :
+    Throw(CYExpression *value) :
         value_(value)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
+} }
+
 struct CYWith :
     CYStatement
 {
@@ -747,7 +1646,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 :
@@ -762,7 +1662,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 :
@@ -773,12 +1674,16 @@ struct CYCondition :
     CYExpression *false_;
 
     CYCondition(CYExpression *test, CYExpression *_true, CYExpression *_false) :
+        test_(test),
         true_(_true),
         false_(_false)
     {
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYPrecedence(15)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYAddressOf :
@@ -793,7 +1698,9 @@ struct CYAddressOf :
         return "&";
     }
 
-    virtual void Output(std::ostream &out) const;
+    CYAlphabetic(false)
+
+    virtual CYExpression *Replace(CYContext &context);
 };
 
 struct CYIndirect :
@@ -808,13 +1715,18 @@ struct CYIndirect :
         return "*";
     }
 
-    virtual void Output(std::ostream &out) const;
+    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 \
-    { \
+    { args \
         CY ## name(CYExpression *lhs) : \
             CYPostfix(lhs) \
         { \
@@ -825,38 +1737,43 @@ struct CYIndirect :
         } \
     };
 
-#define CYPrefix_(op, name) \
+#define CYPrefix_(alphabetic, op, name, args...) \
     struct CY ## name : \
         CYPrefix \
-    { \
+    { args \
         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 \
-    { \
+    { args \
         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 \
-    { \
+    { args \
         CY ## name ## Assign(CYExpression *lhs, CYExpression *rhs) : \
             CYAssignment(lhs, rhs) \
         { \
@@ -870,38 +1787,39 @@ struct CYIndirect :
 CYPostfix_("++", PostIncrement)
 CYPostfix_("--", PostDecrement)
 
-CYPrefix_("delete", Delete)
-CYPrefix_("void", Void)
-CYPrefix_("typeof", TypeOf)
-CYPrefix_("++", PreIncrement)
-CYPrefix_("--", PreDecrement)
-CYPrefix_("-", Negate)
-CYPrefix_("~", BitwiseNot)
-CYPrefix_("!", LogicalNot)
-
-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)