X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/fb98ac0c3231f2685211b3120fd3dc315c056d37..7c4c728ddba1afa034d842723580e8ead8f71ac3:/Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index bf73389..a7ac66a 100644
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,90 +1,104 @@
-/* Cycript - Remove Execution Server and Disassembler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU Affero General Public License, Version 3 {{{ */
 /*
- *        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.
-*/
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+**/
 /* }}} */
 
-#ifndef CYPARSER_HPP
-#define CYPARSER_HPP
+#ifndef CYCRIPT_PARSER_HPP
+#define CYCRIPT_PARSER_HPP
 
-#include <cstdlib>
+#include <streambuf>
 #include <string>
 #include <vector>
+#include <map>
+#include <set>
 
-#include "location.hh"
-#include "Pooling.hpp"
-
-template <typename Type_>
-struct CYNext {
-    Type_ *next_;
-
-    CYNext() :
-        next_(NULL)
-    {
-    }
+#include <cstdio>
+#include <cstdlib>
 
-    CYNext(Type_ *next) :
-        next_(next)
-    {
-    }
+#include "List.hpp"
+#include "Location.hpp"
+#include "Pooling.hpp"
+#include "Options.hpp"
 
-    void SetNext(Type_ *next) {
-        next_ = next;
-    }
-};
+struct CYContext;
 
 struct CYThing {
     virtual void Output(struct CYOutput &out) const = 0;
 };
 
 struct CYOutput {
-    std::ostream &out_;
+    std::streambuf &out_;
+    CYPosition position_;
+
+    CYOptions &options_;
+    bool pretty_;
+    unsigned indent_;
+    unsigned recent_;
+    bool right_;
 
-    CYOutput(std::ostream &out) :
-        out_(out)
+    enum {
+        NoMode,
+        NoLetter,
+        NoPlus,
+        NoHyphen,
+        Terminated
+    } mode_;
+
+    CYOutput(std::streambuf &out, CYOptions &options) :
+        out_(out),
+        options_(options),
+        pretty_(false),
+        indent_(0),
+        recent_(0),
+        right_(false),
+        mode_(NoMode)
     {
     }
 
-    _finline CYOutput &operator <<(char rhs) {
-        out_ << rhs;
-        return *this;
+    void Check(char value);
+    void Terminate();
+
+    _finline void operator ()(char value) {
+        _assert(out_.sputc(value) != EOF);
+        recent_ = indent_;
+        if (value == '\n')
+            position_.lines(1);
+        else
+            position_.columns(1);
+    }
+
+    _finline void operator ()(const char *data, std::streamsize size) {
+        _assert(out_.sputn(data, size) == size);
+        recent_ = indent_;
+        position_.columns(size);
+    }
+
+    _finline void operator ()(const char *data) {
+        return operator ()(data, strlen(data));
     }
 
-    _finline CYOutput &operator <<(const char *rhs) {
-        out_ << rhs;
+    CYOutput &operator <<(char rhs);
+    CYOutput &operator <<(const char *rhs);
+
+    _finline CYOutput &operator <<(const CYThing *rhs) {
+        if (rhs != NULL)
+            rhs->Output(*this);
         return *this;
     }
 
@@ -98,7 +112,114 @@ struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;
 };
 
+struct CYExpression;
+struct CYAssignment;
+
+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),
+};
+
+_finline CYFlags operator ~(CYFlags rhs) {
+    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags operator |(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) | static_cast<unsigned>(rhs));
+}
+
+_finline CYFlags &operator |=(CYFlags &lhs, CYFlags rhs) {
+    return lhs = lhs | rhs;
+}
+
+_finline CYFlags CYLeft(CYFlags flags) {
+    return flags & ~(CYNoDangle | CYNoInteger);
+}
+
+_finline CYFlags CYRight(CYFlags flags) {
+    return flags & ~CYNoBF;
+}
+
+_finline CYFlags CYCenter(CYFlags flags) {
+    return CYLeft(CYRight(flags));
+}
+
+enum CYCompactType {
+    CYCompactNone,
+    CYCompactLong,
+    CYCompactShort,
+};
+
+#define CYCompact(type) \
+    virtual CYCompactType Compact() const { \
+        return CYCompact ## type; \
+    }
+
+struct CYStatement :
+    CYNext<CYStatement>,
+    CYThing
+{
+    void Single(CYOutput &out, CYFlags flags, CYCompactType request) const;
+    void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+    virtual void Output(CYOutput &out) const;
+
+    virtual CYStatement *Replace(CYContext &context) = 0;
+
+    virtual CYCompactType Compact() const = 0;
+    virtual CYStatement *Return();
+
+  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 CYExpression *ClassName(CYContext &context, bool object) = 0;
     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
 
@@ -114,187 +235,310 @@ struct CYWord :
     {
     }
 
-    const char *Value() const {
-        return word_;
+    void Set(const char *value) {
+        word_ = value;
     }
 
+    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) {
-    return lhs << rhs.Value();
+    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 CYLabel :
-    CYNext<CYLabel>
+struct CYComment :
+    CYStatement
 {
-    CYIdentifier *name_;
+    const char *value_;
 
-    CYLabel(CYIdentifier *name, CYLabel *next) :
-        CYNext<CYLabel>(next),
-        name_(name)
+    CYComment(const char *value) :
+        value_(value)
     {
     }
-};
 
-enum CYNeeded {
-    CYNever     = -1,
-    CYSometimes =  0,
-    CYAlways    =  1,
-};
+    CYCompact(None)
 
-enum CYFlags {
-    CYNoFlags =      0,
-    CYNoBrace =      (1 << 0),
-    CYNoFunction =   (1 << 1),
-    CYNoLeader =     (1 << 2),
-    CYNoTrailer =    (1 << 3),
-    CYNoIn =         (1 << 4),
-    CYNoHyphen =     (1 << 5),
-    CYNoCall =       (1 << 6),
-    CYNoRightHand =  (1 << 7),
-    CYNoDangle =     (1 << 8),
-    CYNoTerminator = (1 << 9),
-    CYNoBF =         (CYNoBrace | CYNoFunction),
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYStatement :
-    CYNext<CYStatement>
+struct CYLabel :
+    CYStatement
 {
-    CYLabel *labels_;
+    CYIdentifier *name_;
+    CYStatement *statement_;
 
-    CYStatement() :
-        labels_(NULL)
+    CYLabel(CYIdentifier *name, CYStatement *statement) :
+        name_(name),
+        statement_(statement)
     {
     }
 
-    void AddLabel(CYIdentifier *identifier) {
-        labels_ = new CYLabel(identifier, labels_);
+    CYCompact(Short)
+
+    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;
     }
+};
 
-    virtual bool IsBlock() const {
-        return next_ != NULL;
+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,
+    CYIdentifierCatch,
+};
 
-    virtual void Single(CYOutput &out, CYFlags flags) const;
-    virtual void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
+typedef std::set<const char *, CYCStringLess> CYCStringSet;
+typedef std::set<CYIdentifier *, CYIdentifierValueLess> CYIdentifierValueSet;
+typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap;
 
-  private:
-    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
+struct CYIdentifierUsage {
+    CYIdentifier *identifier_;
+    size_t usage_;
 };
 
-struct CYBlock :
-    CYStatement
+typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector;
+
+struct CYScope {
+    bool transparent_;
+    CYScope *parent_;
+
+    CYIdentifierAddressFlagsMap internal_;
+    CYIdentifierValueSet identifiers_;
+
+    CYScope(bool transparent, CYContext &context);
+
+    void Declare(CYContext &context, CYIdentifier *identifier, CYIdentifierFlags flags);
+    virtual CYIdentifier *Lookup(CYContext &context, CYIdentifier *identifier);
+    void Merge(CYContext &context, CYIdentifier *identifier);
+    void Close(CYContext &context, CYStatement *&statements);
+};
+
+struct CYProgram :
+    CYThing
 {
-    CYStatement *statements_;
+    CYStatement *code_;
 
-    CYBlock(CYStatement *statements) :
-        statements_(statements)
+    CYProgram(CYStatement *code) :
+        code_(code)
     {
     }
 
-    virtual bool IsBlock() const {
-        return true;
+    virtual void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYNonLocal;
+struct CYThisScope;
+
+struct CYContext {
+    CYOptions &options_;
+
+    CYScope *scope_;
+    CYThisScope *this_;
+
+    CYIdentifierUsageVector rename_;
+
+    CYNonLocal *nonlocal_;
+    CYNonLocal *nextlocal_;
+    unsigned unique_;
+
+    CYContext(CYOptions &options) :
+        options_(options),
+        scope_(NULL),
+        this_(NULL),
+        nonlocal_(NULL),
+        nextlocal_(NULL),
+        unique_(0)
+    {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
+    void ReplaceAll(CYStatement *&statement) {
+        if (statement == NULL)
+            return;
+        CYStatement *next(statement->next_);
 
-enum CYState {
-    CYClear,
-    CYRestricted,
-    CYNewLine
-};
+        Replace(statement);
+        ReplaceAll(next);
 
-class CYDriver {
-  public:
-    CYPool pool_;
+        if (statement == NULL)
+            statement = next;
+        else
+            statement->SetNext(next);
+    }
 
-    CYState state_;
-    void *scanner_;
+    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;
+        }
+    }
 
-    const char *data_;
-    size_t size_;
-    FILE *file_;
+    void NonLocal(CYStatement *&statements);
+    CYIdentifier *Unique();
+};
 
-    bool strict_;
+struct CYNonLocal {
+    CYIdentifier *identifier_;
 
-    enum Condition {
-        RegExStart,
-        RegExRest
-    };
+    CYNonLocal() :
+        identifier_(NULL)
+    {
+    }
 
-    std::string filename_;
+    CYIdentifier *Target(CYContext &context) {
+        if (identifier_ == NULL)
+            identifier_ = context.Unique();
+        return identifier_;
+    }
+};
 
-    struct Error {
-        bool warning_;
-        cy::location location_;
-        std::string message_;
-    };
+struct CYThisScope :
+    CYNext<CYThisScope>
+{
+    CYIdentifier *identifier_;
 
-    typedef std::vector<Error> Errors;
+    CYThisScope() :
+        identifier_(NULL)
+    {
+    }
 
-    CYStatement *program_;
-    Errors errors_;
+    CYIdentifier *Identifier(CYContext &context) {
+        if (next_ != NULL)
+            return next_->Identifier(context);
+        if (identifier_ == NULL)
+            identifier_ = context.Unique();
+        return identifier_;
+    }
+};
 
-  private:
-    void ScannerInit();
-    void ScannerDestroy();
+struct CYBlock :
+    CYStatement
+{
+    CYStatement *code_;
+
+    CYBlock(CYStatement *code) :
+        code_(code)
+    {
+    }
+
+    CYCompact(Short)
 
-  public:
-    CYDriver(const std::string &filename);
-    ~CYDriver();
+    virtual CYStatement *Replace(CYContext &context);
 
-    void SetCondition(Condition condition);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 
-    void Warning(const cy::location &location, const char *message);
+    virtual CYStatement *Return();
 };
 
 struct CYForInitialiser {
-    virtual void For(CYOutput &out) const = 0;
+    virtual CYExpression *Replace(CYContext &context) = 0;
+    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
 };
 
 struct CYForInInitialiser {
     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
-    virtual const char *ForEachIn() const = 0;
-    virtual void ForEachIn(CYOutput &out) const = 0;
+    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value) = 0;
+
+    virtual CYExpression *Replace(CYContext &context) = 0;
+    virtual CYAssignment *Assignment(CYContext &context) = 0;
+
+    virtual void Output(CYOutput &out, CYFlags flags) const = 0;
 };
 
+struct CYFunctionParameter;
+
+struct CYNumber;
+struct CYString;
+
 struct CYExpression :
-    CYNext<CYExpression>,
     CYForInitialiser,
     CYForInInitialiser,
-    CYClassName
+    CYClassName,
+    CYThing
 {
-    virtual unsigned Precedence() const = 0;
+    virtual int Precedence() const = 0;
 
     virtual bool RightHand() const {
         return true;
     }
 
-    virtual void For(CYOutput &out) const;
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
+    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);
 
-    virtual const char *ForEachIn() const;
-    virtual void ForEachIn(CYOutput &out) const;
+    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;
+    void Output(CYOutput &out, int precedence, CYFlags flags) const;
 
+    virtual CYExpression *ClassName(CYContext &context, bool object);
     virtual void ClassName(CYOutput &out, bool object) const;
 
+    virtual CYExpression *Replace(CYContext &context) = 0;
+    virtual CYAssignment *Assignment(CYContext &context);
+
+    virtual CYExpression *Primitive(CYContext &context) {
+        return NULL;
+    }
+
+    virtual CYFunctionParameter *Parameter() const;
+
+    virtual CYNumber *Number(CYContext &context) {
+        return NULL;
+    }
+
+    virtual CYString *String(CYContext &context) {
+        return NULL;
+    }
+
     virtual const char *Word() const {
         return NULL;
     }
@@ -306,8 +550,9 @@ struct CYExpression :
     }
 
 #define CYPrecedence(value) \
-    virtual unsigned Precedence() const { \
-        return value; \
+    static const int Precedence_ = value; \
+    virtual int Precedence() const { \
+        return Precedence_; \
     }
 
 #define CYRightHand(value) \
@@ -318,36 +563,79 @@ struct CYExpression :
 struct CYCompound :
     CYExpression
 {
-    CYExpression *expressions_;
+    CYExpression *expression_;
+    CYExpression *next_;
 
-    CYCompound(CYExpression *expressions) :
-        expressions_(expressions)
+    CYCompound(CYExpression *expression, CYExpression *next) :
+        expression_(expression),
+        next_(next)
     {
+        _assert(expression_ != NULL);
+        _assert(next != NULL);
     }
 
-    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;
+
+    virtual CYFunctionParameter *Parameter() const;
+};
+
+struct CYParenthetical :
+    CYExpression
+{
+    CYExpression *expression_;
+
+    CYParenthetical(CYExpression *expression) :
+        expression_(expression)
+    {
     }
 
-    CYPrecedence(17)
+    CYPrecedence(0)
 
+    virtual CYExpression *Replace(CYContext &context);
     void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYComprehension :
-    CYNext<CYComprehension>
+struct CYDeclaration;
+
+struct CYFunctionParameter :
+    CYNext<CYFunctionParameter>,
+    CYThing
 {
+    CYForInInitialiser *initialiser_;
+
+    CYFunctionParameter(CYForInInitialiser *initialiser, CYFunctionParameter *next = NULL) :
+        CYNext<CYFunctionParameter>(next),
+        initialiser_(initialiser)
+    {
+    }
+
+    void Replace(CYContext &context, CYStatement *&statements);
     void Output(CYOutput &out) const;
-    virtual const char *Name() const = 0;
+};
 
-    virtual void Begin_(CYOutput &out) const = 0;
+struct CYComprehension :
+    CYNext<CYComprehension>,
+    CYThing
+{
+    CYComprehension(CYComprehension *next = NULL) :
+        CYNext<CYComprehension>(next)
+    {
+    }
 
-    virtual void End_(CYOutput &out) const {
+    CYComprehension *Modify(CYComprehension *next) {
+        next_ = next;
+        return this;
     }
+
+    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 :
@@ -356,37 +644,42 @@ struct CYForInComprehension :
     CYIdentifier *name_;
     CYExpression *set_;
 
-    CYForInComprehension(CYIdentifier *name, CYExpression *set) :
+    CYForInComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+        CYComprehension(next),
         name_(name),
         set_(set)
     {
     }
 
     virtual const char *Name() const {
-        return name_->Value();
+        return name_->Word();
     }
 
-    virtual void Begin_(CYOutput &out) const;
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYForEachInComprehension :
+struct CYForOfComprehension :
     CYComprehension
 {
     CYIdentifier *name_;
     CYExpression *set_;
 
-    CYForEachInComprehension(CYIdentifier *name, CYExpression *set) :
+    CYForOfComprehension(CYIdentifier *name, CYExpression *set, CYComprehension *next = NULL) :
+        CYComprehension(next),
         name_(name),
         set_(set)
     {
     }
 
     virtual const char *Name() const {
-        return name_->Value();
+        return name_->Word();
     }
 
-    virtual void Begin_(CYOutput &out) const;
-    virtual void End_(CYOutput &out) const;
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYIfComprehension :
@@ -394,7 +687,8 @@ struct CYIfComprehension :
 {
     CYExpression *test_;
 
-    CYIfComprehension(CYExpression *test) :
+    CYIfComprehension(CYExpression *test, CYComprehension *next = NULL) :
+        CYComprehension(next),
         test_(test)
     {
     }
@@ -403,7 +697,9 @@ struct CYIfComprehension :
         return NULL;
     }
 
-    virtual void Begin_(CYOutput &out) const;
+    virtual CYFunctionParameter *Parameter(CYContext &context) const;
+    virtual CYStatement *Replace(CYContext &context, CYStatement *statement) const;
+    virtual void Output(CYOutput &out) const;
 };
 
 struct CYArrayComprehension :
@@ -420,6 +716,7 @@ struct CYArrayComprehension :
 
     CYPrecedence(0)
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -428,6 +725,16 @@ struct CYLiteral :
 {
     CYPrecedence(0)
     CYRightHand(false)
+
+    virtual CYExpression *Primitive(CYContext &context) {
+        return this;
+    }
+};
+
+struct CYTrivial :
+    CYLiteral
+{
+    virtual CYExpression *Replace(CYContext &context);
 };
 
 struct CYMagic :
@@ -437,49 +744,18 @@ struct CYMagic :
     CYRightHand(false)
 };
 
-struct CYSelectorPart :
-    CYNext<CYSelectorPart>
-{
-    CYWord *name_;
-    bool value_;
+struct CYRange {
+    uint64_t lo_;
+    uint64_t hi_;
 
-    CYSelectorPart(CYWord *name, bool value, CYSelectorPart *next) :
-        CYNext<CYSelectorPart>(next),
-        name_(name),
-        value_(value)
+    CYRange(uint64_t lo, uint64_t hi) :
+        lo_(lo), hi_(hi)
     {
     }
 
-    virtual void Output(CYOutput &out) const;
-};
-
-struct CYSelector :
-    CYLiteral
-{
-    CYSelectorPart *name_;
-
-    CYSelector(CYSelectorPart *name) :
-        name_(name)
-    {
-    }
-
-    CYPrecedence(1)
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYRange {
-    uint64_t lo_;
-    uint64_t hi_;
-
-    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;
-    }
+    bool operator [](uint8_t value) const {
+        return !(value >> 7) && (value >> 6 ? hi_ : lo_) >> (value & 0x3f) & 0x1;
+    }
 
     void operator()(uint8_t value) {
         if (value >> 7)
@@ -493,20 +769,32 @@ extern CYRange WordStartRange_;
 extern CYRange WordEndRange_;
 
 struct CYString :
-    CYLiteral,
+    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_))
     {
     }
@@ -515,21 +803,18 @@ struct CYString :
         return value_;
     }
 
-    virtual const char *Word() const {
-        if (size_ == 0 || !WordStartRange_[value_[0]])
-            return NULL;
-        for (size_t i(1); i != size_; ++i)
-            if (!WordEndRange_[value_[i]])
-                return NULL;
-        return Value();
-    }
+    virtual const char *Word() const;
+
+    virtual 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 :
-    CYLiteral,
+    CYTrivial,
     CYPropertyName
 {
     double value_;
@@ -543,12 +828,15 @@ struct CYNumber :
         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 :
-    CYLiteral
+    CYTrivial
 {
     const char *value_;
 
@@ -565,58 +853,48 @@ struct CYRegEx :
 };
 
 struct CYNull :
-    CYWord,
-    CYLiteral
+    CYTrivial
 {
-    CYNull() :
-        CYWord("null")
-    {
-    }
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYThis :
-    CYWord,
     CYMagic
 {
-    CYThis() :
-        CYWord("this")
-    {
-    }
-
+    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(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYFalse :
-    CYWord,
     CYBoolean
 {
-    CYFalse() :
-        CYWord("false")
-    {
+    virtual bool Value() const {
+        return false;
     }
 
-    virtual bool Value() const;
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
 };
 
 struct CYTrue :
-    CYWord,
     CYBoolean
 {
-    CYTrue() :
-        CYWord("true")
-    {
+    virtual bool Value() const {
+        return true;
     }
 
-    virtual bool Value() const;
+    virtual CYNumber *Number(CYContext &context);
+    virtual CYString *String(CYContext &context);
 };
 
 struct CYVariable :
@@ -629,10 +907,18 @@ struct CYVariable :
     {
     }
 
+    CYVariable(const char *name) :
+        name_(new($pool) CYIdentifier(name))
+    {
+    }
+
     CYPrecedence(0)
     CYRightHand(false)
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYFunctionParameter *Parameter() const;
 };
 
 struct CYPrefix :
@@ -648,6 +934,9 @@ struct CYPrefix :
     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;
 };
 
@@ -670,6 +959,7 @@ struct CYInfix :
     virtual bool Alphabetic() const = 0;
     virtual const char *Operator() const = 0;
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -685,6 +975,9 @@ struct CYPostfix :
 
     virtual const char *Operator() const = 0;
 
+    CYPrecedence(3)
+
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -706,15 +999,26 @@ struct CYAssignment :
 
     virtual const char *Operator() const = 0;
 
+    CYPrecedence(16)
+
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYArgument :
-    CYNext<CYArgument>
+    CYNext<CYArgument>,
+    CYThing
 {
     CYWord *name_;
     CYExpression *value_;
 
+    CYArgument(CYExpression *value, CYArgument *next = NULL) :
+        CYNext<CYArgument>(next),
+        name_(NULL),
+        value_(value)
+    {
+    }
+
     CYArgument(CYWord *name, CYExpression *value, CYArgument *next = NULL) :
         CYNext<CYArgument>(next),
         name_(name),
@@ -722,18 +1026,10 @@ struct CYArgument :
     {
     }
 
+    CYArgument *Replace(CYContext &context);
     void Output(CYOutput &out) const;
 };
 
-struct CYBlank :
-    public CYWord
-{
-    CYBlank() :
-        CYWord("")
-    {
-    }
-};
-
 struct CYClause :
     CYThing,
     CYNext<CYClause>
@@ -747,11 +1043,13 @@ struct CYClause :
     {
     }
 
+    void Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
 struct CYElement :
-    CYNext<CYElement>
+    CYNext<CYElement>,
+    CYThing
 {
     CYExpression *value_;
 
@@ -761,6 +1059,7 @@ struct CYElement :
     {
     }
 
+    void Replace(CYContext &context);
     void Output(CYOutput &out) const;
 };
 
@@ -769,47 +1068,90 @@ struct CYArray :
 {
     CYElement *elements_;
 
-    CYArray(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 :
     CYForInInitialiser
 {
     CYIdentifier *identifier_;
     CYExpression *initialiser_;
 
-    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser) :
+    CYDeclaration(CYIdentifier *identifier, CYExpression *initialiser = NULL) :
         identifier_(identifier),
         initialiser_(initialiser)
     {
     }
 
     virtual void ForIn(CYOutput &out, CYFlags flags) const;
+    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);
 
-    virtual const char *ForEachIn() const;
-    virtual void ForEachIn(CYOutput &out) const;
+    virtual CYExpression *Replace(CYContext &context);
+
+    virtual CYAssignment *Assignment(CYContext &context);
+    CYVariable *Variable(CYContext &context);
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDeclarations :
     CYNext<CYDeclarations>,
-    CYForInitialiser
+    CYThing
 {
     CYDeclaration *declaration_;
 
-    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next) :
+    CYDeclarations(CYDeclaration *declaration, CYDeclarations *next = NULL) :
         CYNext<CYDeclarations>(next),
         declaration_(declaration)
     {
     }
 
-    virtual void For(CYOutput &out) const;
+    void Replace(CYContext &context);
+
+    CYExpression *Expression(CYContext &context);
+    CYProperty *Property(CYContext &context);
+    CYArgument *Argument(CYContext &context);
+    CYFunctionParameter *Parameter(CYContext &context);
+
+    virtual void Output(CYOutput &out) const;
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYForDeclarations :
+    CYForInitialiser
+{
+    CYDeclarations *declarations_;
+
+    CYForDeclarations(CYDeclarations *declarations) :
+        declarations_(declarations)
+    {
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -823,523 +1165,890 @@ struct CYVar :
     {
     }
 
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYLet :
+struct CYLetStatement :
     CYStatement
 {
     CYDeclarations *declarations_;
-    CYStatement *statements_;
+    CYStatement *code_;
 
-    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+    CYLetStatement(CYDeclarations *declarations, CYStatement *code) :
         declarations_(declarations),
-        statements_(statements)
+        code_(code)
+    {
+    }
+
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYFor :
+    CYStatement
+{
+    CYForInitialiser *initialiser_;
+    CYExpression *test_;
+    CYExpression *increment_;
+    CYStatement *code_;
+
+    CYFor(CYForInitialiser *initialiser, CYExpression *test, CYExpression *increment, CYStatement *code) :
+        initialiser_(initialiser),
+        test_(test),
+        increment_(increment),
+        code_(code)
     {
     }
 
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYField :
-    CYNext<CYField>
+struct CYForIn :
+    CYStatement
 {
-    virtual void Output(CYOutput &out) const;
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;
+    CYStatement *code_;
+
+    CYForIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),
+        code_(code)
+    {
+    }
+
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYMessageParameter :
-    CYNext<CYMessageParameter>
+struct CYForOf :
+    CYStatement
 {
-    CYWord *tag_;
-    CYExpression *type_;
-    CYIdentifier *name_;
+    CYForInInitialiser *initialiser_;
+    CYExpression *set_;
+    CYStatement *code_;
 
-    CYMessageParameter(CYWord *tag, CYExpression *type, CYIdentifier *name) :
-        tag_(tag),
-        type_(type),
-        name_(name)
+    CYForOf(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+        initialiser_(initialiser),
+        set_(set),
+        code_(code)
     {
     }
+
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYMessage :
-    CYNext<CYMessage>
+struct CYObject :
+    CYLiteral
 {
-    bool instance_;
-    CYExpression *type_;
-    CYMessageParameter *parameter_;
-    CYStatement *body_;
+    CYProperty *properties_;
 
-    CYMessage(bool instance, CYExpression *type, CYMessageParameter *parameter, CYStatement *body) :
-        instance_(instance),
-        type_(type),
-        parameter_(parameter),
-        body_(body)
+    CYObject(CYProperty *properties = NULL) :
+        properties_(properties)
     {
     }
 
-    virtual void Output(CYOutput &out, bool replace) const;
+    virtual CYExpression *Replace(CYContext &context);
+    void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYClass {
-    CYClassName *name_;
-    CYExpression *super_;
-    CYField *fields_;
-    CYMessage *messages_;
+struct CYMember :
+    CYExpression
+{
+    CYExpression *object_;
+    CYExpression *property_;
+
+    CYMember(CYExpression *object, CYExpression *property) :
+        object_(object),
+        property_(property)
+    {
+    }
+
+    void SetLeft(CYExpression *object) {
+        object_ = object;
+    }
+};
+
+struct CYDirectMember :
+    CYMember
+{
+    CYDirectMember(CYExpression *object, CYExpression *property) :
+        CYMember(object, property)
+    {
+    }
 
-    CYClass(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
+    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;
+};
+
+namespace cy {
+namespace Syntax {
+
+struct New :
+    CYExpression
+{
+    CYExpression *constructor_;
+    CYArgument *arguments_;
+
+    New(CYExpression *constructor, CYArgument *arguments) :
+        constructor_(constructor),
+        arguments_(arguments)
+    {
+    }
+
+    virtual int 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 :
+    CYExpression
+{
+    CYExpression *function_;
+    CYArgument *arguments_;
+
+    CYCall(CYExpression *function, CYArgument *arguments = NULL) :
+        function_(function),
+        arguments_(arguments)
+    {
+    }
+
+    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 :
+    CYStatement
+{
+    CYExpression *test_;
+    CYStatement *true_;
+    CYStatement *false_;
+
+    CYIf(CYExpression *test, CYStatement *_true, CYStatement *_false = NULL) :
+        test_(test),
+        true_(_true),
+        false_(_false)
+    {
+    }
+
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYStatement *Return();
+};
+
+struct CYDoWhile :
+    CYStatement
+{
+    CYExpression *test_;
+    CYStatement *code_;
+
+    CYDoWhile(CYExpression *test, CYStatement *code) :
+        test_(test),
+        code_(code)
+    {
+    }
+
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYWhile :
+    CYStatement
+{
+    CYExpression *test_;
+    CYStatement *code_;
+
+    CYWhile(CYExpression *test, CYStatement *code) :
+        test_(test),
+        code_(code)
+    {
+    }
+
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should be split up into CYAnonymousFunction and CYNamedFunction (subclass)
+struct CYFunction {
+    CYIdentifier *name_;
+    CYFunctionParameter *parameters_;
+    CYStatement *code_;
+
+    CYNonLocal *nonlocal_;
+    bool implicit_;
+    CYThisScope this_;
+
+    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
         name_(name),
-        super_(super),
-        fields_(fields),
-        messages_(messages)
+        parameters_(parameters),
+        code_(code),
+        nonlocal_(NULL),
+        implicit_(false)
     {
     }
 
+    void Inject(CYContext &context);
+    virtual void Replace_(CYContext &context, bool outer);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYClassExpression :
-    CYClass,
+// XXX: this should be split up into CYAnonymousFunctionExpression and CYNamedFunctionExpression
+struct CYFunctionExpression :
+    CYFunction,
     CYExpression
 {
-    CYClassExpression(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
+    CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
+        CYFunction(name, parameters, code)
+    {
+    }
+
+    CYPrecedence(0)
+    CYRightHand(false)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should derive from CYAnonymousFunction
+struct CYFatArrow :
+    CYFunction,
+    CYExpression
+{
+    CYFatArrow(CYFunctionParameter *parameters, CYStatement *code) :
+        CYFunction(NULL, parameters, code)
+    {
+    }
+
+    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 *code) :
+        CYFunctionExpression(NULL, parameters, code)
+    {
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should derive from CYNamedFunction
+struct CYFunctionStatement :
+    CYFunction,
+    CYStatement
+{
+    CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *code) :
+        CYFunction(name, parameters, code)
+    {
+    }
+
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYExpress :
+    CYStatement
+{
+    CYExpression *expression_;
+
+    CYExpress(CYExpression *expression) :
+        expression_(expression)
+    {
+        if (expression_ == NULL)
+            throw;
+    }
+
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYStatement *Return();
+};
+
+struct CYContinue :
+    CYStatement
+{
+    CYIdentifier *label_;
+
+    CYContinue(CYIdentifier *label) :
+        label_(label)
+    {
+    }
+
+    CYCompact(Short)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYBreak :
+    CYStatement
+{
+    CYIdentifier *label_;
+
+    CYBreak(CYIdentifier *label) :
+        label_(label)
+    {
+    }
+
+    CYCompact(Short)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYReturn :
+    CYStatement
+{
+    CYExpression *value_;
+
+    CYReturn(CYExpression *value) :
+        value_(value)
     {
     }
 
-    CYPrecedence(0)
+    CYCompact(None)
 
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYClassStatement :
-    CYClass,
+struct CYEmpty :
     CYStatement
 {
-    CYClassStatement(CYClassName *name, CYExpression *super, CYField *fields, CYMessage *messages) :
-        CYClass(name, super, fields, messages)
-    {
-    }
+    CYCompact(Short)
 
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYCategory :
-    CYStatement
+struct CYFinally :
+    CYThing
 {
-    CYClassName *name_;
-    CYMessage *messages_;
+    CYStatement *code_;
 
-    CYCategory(CYClassName *name, CYMessage *messages) :
-        name_(name),
-        messages_(messages)
+    CYFinally(CYStatement *code) :
+        code_(code)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    void Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYFunctionParameter :
-    CYNext<CYFunctionParameter>,
+struct CYTypeSpecifier :
     CYThing
 {
-    CYIdentifier *name_;
+    virtual CYExpression *Replace(CYContext &context) = 0;
+};
 
-    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next) :
-        CYNext<CYFunctionParameter>(next),
-        name_(name)
-    {
+struct CYTypeError :
+    CYTypeSpecifier
+{
+    CYTypeError() {
     }
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
-struct CYFor :
-    CYStatement
+struct CYTypeVoid :
+    CYTypeSpecifier
 {
-    CYForInitialiser *initialiser_;
-    CYExpression *test_;
-    CYExpression *increment_;
-    CYStatement *code_;
-
-    CYFor(CYForInitialiser *initialiser, CYExpression *test, CYExpression *increment, CYStatement *code) :
-        initialiser_(initialiser),
-        test_(test),
-        increment_(increment),
-        code_(code)
-    {
+    CYTypeVoid() {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYForIn :
-    CYStatement
+struct CYTypeVariable :
+    CYTypeSpecifier
 {
-    CYForInInitialiser *initialiser_;
-    CYExpression *set_;
-    CYStatement *code_;
+    CYIdentifier *name_;
 
-    CYForIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
-        initialiser_(initialiser),
-        set_(set),
-        code_(code)
+    CYTypeVariable(CYIdentifier *name) :
+        name_(name)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    CYTypeVariable(const char *name) :
+        name_(new($pool) CYIdentifier(name))
+    {
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYForEachIn :
-    CYStatement
+struct CYTypeUnsigned :
+    CYTypeSpecifier
 {
-    CYForInInitialiser *initialiser_;
-    CYExpression *set_;
-    CYStatement *code_;
+    CYTypeSpecifier *specifier_;
 
-    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
-        initialiser_(initialiser),
-        set_(set),
-        code_(code)
+    CYTypeUnsigned(CYTypeSpecifier *specifier) :
+        specifier_(specifier)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYProperty :
-    CYNext<CYProperty>
+struct CYTypeSigned :
+    CYTypeSpecifier
 {
-    CYPropertyName *name_;
-    CYExpression *value_;
+    CYTypeSpecifier *specifier_;
 
-    CYProperty(CYPropertyName *name, CYExpression *value, CYProperty *next) :
-        CYNext<CYProperty>(next),
-        name_(name),
-        value_(value)
+    CYTypeSigned(CYTypeSpecifier *specifier) :
+        specifier_(specifier)
     {
     }
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
-struct CYObject :
-    CYLiteral
+struct CYTypeLong :
+    CYTypeSpecifier
 {
-    CYProperty *property_;
+    CYTypeSpecifier *specifier_;
 
-    CYObject(CYProperty *property) :
-        property_(property)
+    CYTypeLong(CYTypeSpecifier *specifier) :
+        specifier_(specifier)
     {
     }
 
-    void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYCatch :
-    CYThing
+struct CYTypeShort :
+    CYTypeSpecifier
 {
-    CYIdentifier *name_;
-    CYStatement *code_;
+    CYTypeSpecifier *specifier_;
 
-    CYCatch(CYIdentifier *name, CYStatement *code) :
-        name_(name),
-        code_(code)
+    CYTypeShort(CYTypeSpecifier *specifier) :
+        specifier_(specifier)
     {
     }
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
-struct CYSend :
-    CYExpression
-{
-    CYExpression *self_;
-    CYArgument *arguments_;
+struct CYTypeFunctionWith;
 
-    CYSend(CYExpression *self, CYArgument *arguments) :
-        self_(self),
-        arguments_(arguments)
+struct CYTypeModifier :
+    CYNext<CYTypeModifier>
+{
+    CYTypeModifier(CYTypeModifier *next) :
+        CYNext<CYTypeModifier>(next)
     {
     }
 
-    CYPrecedence(0)
+    virtual int Precedence() const = 0;
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type) = 0;
+    CYExpression *Replace(CYContext &context, CYExpression *type);
+
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const = 0;
+    void Output(CYOutput &out, int precedence, CYIdentifier *identifier) const;
+
+    virtual CYTypeFunctionWith *Function() { return NULL; }
 };
 
-struct CYMember :
-    CYExpression
+struct CYTypeArrayOf :
+    CYTypeModifier
 {
-    CYExpression *object_;
-    CYExpression *property_;
+    CYExpression *size_;
 
-    CYMember(CYExpression *object, CYExpression *property) :
-        object_(object),
-        property_(property)
+    CYTypeArrayOf(CYExpression *size, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        size_(size)
     {
     }
 
-    void SetLeft(CYExpression *object) {
-        object_ = object;
-    }
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
-struct CYDirectMember :
-    CYMember
+struct CYTypeConstant :
+    CYTypeModifier
 {
-    CYDirectMember(CYExpression *object, CYExpression *property) :
-        CYMember(object, property)
+    CYTypeConstant(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
     {
     }
 
-    CYPrecedence(1)
-    CYRightHand(false)
+    CYPrecedence(0)
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
-struct CYIndirectMember :
-    CYMember
+struct CYTypePointerTo :
+    CYTypeModifier
 {
-    CYIndirectMember(CYExpression *object, CYExpression *property) :
-        CYMember(object, property)
+    CYTypePointerTo(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
     {
     }
 
-    CYPrecedence(1)
-    CYRightHand(false)
+    CYPrecedence(0)
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
-struct CYNew :
-    CYExpression
+struct CYTypeVolatile :
+    CYTypeModifier
 {
-    CYExpression *constructor_;
-    CYArgument *arguments_;
-
-    CYNew(CYExpression *constructor, CYArgument *arguments) :
-        constructor_(constructor),
-        arguments_(arguments)
+    CYTypeVolatile(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
     {
     }
 
-    virtual unsigned Precedence() const {
-        return arguments_ == NULL ? 2 : 1;
-    }
-
-    CYRightHand(false)
+    CYPrecedence(0)
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
-struct CYCall :
-    CYExpression
+struct CYTypedIdentifier :
+    CYNext<CYTypedIdentifier>,
+    CYThing
 {
-    CYExpression *function_;
-    CYArgument *arguments_;
+    CYLocation location_;
+    CYIdentifier *identifier_;
+    CYTypeSpecifier *specifier_;
+    CYTypeModifier *modifier_;
 
-    CYCall(CYExpression *function, CYArgument *arguments) :
-        function_(function),
-        arguments_(arguments)
+    CYTypedIdentifier(const CYLocation &location, CYIdentifier *identifier = NULL) :
+        location_(location),
+        identifier_(identifier),
+        specifier_(NULL),
+        modifier_(NULL)
     {
     }
 
-    CYPrecedence(1)
-    CYRightHand(false)
+    CYTypedIdentifier(CYTypeSpecifier *specifier, CYTypeModifier *modifier = NULL) :
+        identifier_(NULL),
+        specifier_(specifier),
+        modifier_(modifier)
+    {
+    }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    inline CYTypedIdentifier *Modify(CYTypeModifier *modifier) {
+        CYSetLast(modifier_) = modifier;
+        return this;
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+
+    CYTypeFunctionWith *Function();
 };
 
-struct CYIf :
-    CYStatement
+struct CYEncodedType :
+    CYExpression
 {
-    CYExpression *test_;
-    CYStatement *true_;
-    CYStatement *false_;
+    CYTypedIdentifier *typed_;
 
-    CYIf(CYExpression *test, CYStatement *_true, CYStatement *_false) :
-        test_(test),
-        true_(_true),
-        false_(_false)
+    CYEncodedType(CYTypedIdentifier *typed) :
+        typed_(typed)
     {
     }
 
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYDoWhile :
-    CYStatement
+struct CYTypedParameter :
+    CYNext<CYTypedParameter>,
+    CYThing
 {
-    CYExpression *test_;
-    CYStatement *code_;
+    CYTypedIdentifier *typed_;
 
-    CYDoWhile(CYExpression *test, CYStatement *code) :
-        test_(test),
-        code_(code)
+    CYTypedParameter(CYTypedIdentifier *typed, CYTypedParameter *next) :
+        CYNext<CYTypedParameter>(next),
+        typed_(typed)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    CYArgument *Argument(CYContext &context);
+    CYFunctionParameter *Parameters(CYContext &context);
+    CYExpression *TypeSignature(CYContext &context, CYExpression *prefix);
+
+    virtual void Output(CYOutput &out) const;
 };
 
-struct CYWhile :
-    CYStatement
+struct CYLambda :
+    CYExpression
 {
-    CYExpression *test_;
+    CYTypedIdentifier *typed_;
+    CYTypedParameter *parameters_;
     CYStatement *code_;
 
-    CYWhile(CYExpression *test, CYStatement *code) :
-        test_(test),
+    CYLambda(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *code) :
+        typed_(typed),
+        parameters_(parameters),
         code_(code)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
-
-struct CYFunction {
-    CYIdentifier *name_;
-    CYFunctionParameter *parameters_;
-    CYStatement *body_;
-
-    CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
-        name_(name),
-        parameters_(parameters),
-        body_(body)
-    {
-    }
+    CYPrecedence(1)
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYFunctionExpression :
-    CYFunction,
-    CYExpression
+struct CYModule :
+    CYNext<CYModule>,
+    CYThing
 {
-    CYFunctionExpression(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
-        CYFunction(name, parameters, body)
+    CYWord *part_;
+
+    CYModule(CYWord *part, CYModule *next = NULL) :
+        CYNext<CYModule>(next),
+        part_(part)
     {
     }
 
-    CYPrecedence(0)
-    CYRightHand(false)
-
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    CYString *Replace(CYContext &context, const char *separator) const;
+    void Output(CYOutput &out) const;
 };
 
-struct CYFunctionStatement :
-    CYFunction,
+struct CYImport :
     CYStatement
 {
-    CYFunctionStatement(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *body) :
-        CYFunction(name, parameters, body)
+    CYModule *module_;
+
+    CYImport(CYModule *module) :
+        module_(module)
     {
     }
 
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYExpress :
+struct CYExternal :
     CYStatement
 {
-    CYExpression *expression_;
+    CYString *abi_;
+    CYTypedIdentifier *typed_;
 
-    CYExpress(CYExpression *expression) :
-        expression_(expression)
+    CYExternal(CYString *abi, CYTypedIdentifier *typed) :
+        abi_(abi),
+        typed_(typed)
     {
     }
 
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYContinue :
+struct CYTypeDefinition :
     CYStatement
 {
-    CYIdentifier *label_;
+    CYTypedIdentifier *typed_;
 
-    CYContinue(CYIdentifier *label) :
-        label_(label)
+    CYTypeDefinition(CYTypedIdentifier *typed) :
+        typed_(typed)
     {
     }
 
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYBreak :
-    CYStatement
+struct CYTypeBlockWith :
+    CYTypeModifier
 {
-    CYIdentifier *label_;
+    CYTypedParameter *parameters_;
 
-    CYBreak(CYIdentifier *label) :
-        label_(label)
+    CYTypeBlockWith(CYTypedParameter *parameters, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        parameters_(parameters)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
 };
 
-struct CYReturn :
-    CYStatement
+struct CYTypeFunctionWith :
+    CYTypeModifier
 {
-    CYExpression *value_;
+    CYTypedParameter *parameters_;
 
-    CYReturn(CYExpression *value) :
-        value_(value)
+    CYTypeFunctionWith(CYTypedParameter *parameters, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        parameters_(parameters)
     {
     }
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
-};
+    CYPrecedence(1)
 
-struct CYEmpty :
-    CYStatement
-{
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+
+    virtual CYTypeFunctionWith *Function() { return this; }
 };
 
-struct CYFinally {
+namespace cy {
+namespace Syntax {
+
+struct Catch :
+    CYThing
+{
+    CYIdentifier *name_;
     CYStatement *code_;
 
-    CYFinally(CYStatement *code) :
+    Catch(CYIdentifier *name, CYStatement *code) :
+        name_(name),
         code_(code)
     {
     }
 
+    void Replace(CYContext &context);
     virtual void Output(CYOutput &out) const;
 };
 
-struct CYTry :
+struct Try :
     CYStatement
 {
     CYStatement *code_;
-    CYCatch *catch_;
+    Catch *catch_;
     CYFinally *finally_;
 
-    CYTry(CYStatement *code, CYCatch *_catch, CYFinally *finally) :
+    Try(CYStatement *code, Catch *_catch, CYFinally *finally) :
         code_(code),
         catch_(_catch),
         finally_(finally)
     {
     }
 
+    CYCompact(Short)
+
+    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 = NULL) :
         value_(value)
     {
     }
 
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
+} }
+
 struct CYWith :
     CYStatement
 {
@@ -1352,6 +2061,9 @@ struct CYWith :
     {
     }
 
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1367,6 +2079,22 @@ struct CYSwitch :
     {
     }
 
+    CYCompact(Long)
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYDebugger :
+    CYStatement
+{
+    CYDebugger()
+    {
+    }
+
+    CYCompact(None)
+
+    virtual CYStatement *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1386,6 +2114,7 @@ struct CYCondition :
 
     CYPrecedence(15)
 
+    virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
@@ -1402,9 +2131,8 @@ struct CYAddressOf :
     }
 
     CYAlphabetic(false)
-    CYPrecedence(2)
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace(CYContext &context);
 };
 
 struct CYIndirect :
@@ -1420,48 +2148,47 @@ struct CYIndirect :
     }
 
     CYAlphabetic(false)
-    CYPrecedence(1)
 
-    virtual void Output(CYOutput &out, CYFlags flags) const;
+    virtual CYExpression *Replace(CYContext &context);
 };
 
-#define CYPostfix_(op, name) \
+#define CYReplace \
+    virtual CYExpression *Replace(CYContext &context);
+
+#define CYPostfix_(op, name, args...) \
     struct CY ## name : \
         CYPostfix \
-    { \
+    { args \
         CY ## name(CYExpression *lhs) : \
             CYPostfix(lhs) \
         { \
         } \
-    \
-        CYPrecedence(3) \
     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 
-#define CYPrefix_(alphabetic, op, name) \
+#define CYPrefix_(alphabetic, op, name, args...) \
     struct CY ## name : \
         CYPrefix \
-    { \
+    { args \
         CY ## name(CYExpression *rhs) : \
             CYPrefix(rhs) \
         { \
         } \
     \
         CYAlphabetic(alphabetic) \
-        CYPrecedence(4) \
     \
         virtual const char *Operator() const { \
             return op; \
         } \
     };
 
-#define CYInfix_(alphabetic, precedence, op, name) \
+#define CYInfix_(alphabetic, precedence, op, name, args...) \
     struct CY ## name : \
         CYInfix \
-    { \
+    { args \
         CY ## name(CYExpression *lhs, CYExpression *rhs) : \
             CYInfix(lhs, rhs) \
         { \
@@ -1475,16 +2202,14 @@ struct CYIndirect :
         } \
     };
 
-#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) \
         { \
         } \
-    \
-        CYPrecedence(16) \
     \
         virtual const char *Operator() const { \
             return op; \
@@ -1499,14 +2224,15 @@ 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, "*", Multiply, CYReplace)
 CYInfix_(false, 5, "/", Divide)
 CYInfix_(false, 5, "%", Modulus)
-CYInfix_(false, 6, "+", Add)
+CYInfix_(false, 6, "+", Add, CYReplace)
 CYInfix_(false, 6, "-", Subtract)
 CYInfix_(false, 7, "<<", ShiftLeft)
 CYInfix_(false, 7, ">>", ShiftRightSigned)
@@ -1540,4 +2266,4 @@ CYAssignment_("&=", BitwiseAnd)
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 
-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/