{Functor,Selector}.type should return @encode().

[cycript.git] / Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 63aa17ad93f2c36dd84498c6ddae4bf334552b04..e68cf1a57b7ea4b1eb84bb375cd095c3ba964232 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,85 +1,56 @@
-/* Cycript - Remote Execution Server and Disassembler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* Modified BSD License {{{ */
+/* GNU 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:
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * 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.
+ * Cycript 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 General Public License for more details.

  *
  *

- * 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.
-*/
+ * You should have received a copy of the GNU General Public License
+ * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+**/

 /* }}} */
 
 /* }}} */
 

-#ifndef CYPARSER_HPP
-#define CYPARSER_HPP
-
-// XXX: wtf is this here?!
-#define CYPA 16
+#ifndef CYCRIPT_PARSER_HPP
+#define CYCRIPT_PARSER_HPP

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

+#include <map>
+#include <set>

 
 

+#include <cstdio>

 #include <cstdlib>
 
 #include <cstdlib>
 

-#include "location.hh"
+#include "List.hpp"

 #include "Pooling.hpp"
 #include "Pooling.hpp"

+#include "Options.hpp"

 
 

-template <typename Type_>
-struct CYNext {
-    Type_ *next_;
-
-    CYNext() :
-        next_(NULL)
-    {
-    }
-
-    CYNext(Type_ *next) :
-        next_(next)
-    {
-    }
+struct CYContext;

 
 

-    void SetNext(Type_ *next) {
-        next_ = next;
+struct CYThing {
+    virtual ~CYThing() {

     }
     }

-};

 
 

-struct CYThing {

     virtual void Output(struct CYOutput &out) const = 0;
 };
 
 struct CYOutput {
     std::ostream &out_;
     virtual void Output(struct CYOutput &out) const = 0;
 };
 
 struct CYOutput {
     std::ostream &out_;

+    CYOptions &options_;

     bool pretty_;
     unsigned indent_;
     bool pretty_;
     unsigned indent_;

+    bool right_;

 
     enum {
         NoMode,
 
     enum {
         NoMode,


@@ -89,10 +60,12 @@ struct CYOutput {
         Terminated
     } mode_;
 
         Terminated
     } mode_;
 

-    CYOutput(std::ostream &out) :
+    CYOutput(std::ostream &out, CYOptions &options) :

         out_(out),
         out_(out),

+        options_(options),

         pretty_(false),
         indent_(0),
         pretty_(false),
         indent_(0),

+        right_(false),

         mode_(NoMode)
     {
     }
         mode_(NoMode)
     {
     }


@@ -117,9 +90,13 @@ struct CYOutput {
 
 struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;
 
 struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;

+
+    virtual ~CYPropertyName() {
+    }

 };
 
 struct CYExpression;
 };
 
 struct CYExpression;

+struct CYAssignment;

 
 enum CYNeeded {
     CYNever     = -1,
 
 enum CYNeeded {
     CYNever     = -1,


@@ -135,33 +112,47 @@ enum CYFlags {
     CYNoCall =       (1 << 3),
     CYNoRightHand =  (1 << 4),
     CYNoDangle =     (1 << 5),
     CYNoCall =       (1 << 3),
     CYNoRightHand =  (1 << 4),
     CYNoDangle =     (1 << 5),

+    CYNoInteger =    (1 << 6),

     CYNoBF =         (CYNoBrace | CYNoFunction),
 };
 
     CYNoBF =         (CYNoBrace | CYNoFunction),
 };
 

-struct CYContext {
-    apr_pool_t *pool_;
+_finline CYFlags operator ~(CYFlags rhs) {
+    return static_cast<CYFlags>(~static_cast<unsigned>(rhs));
+}

 
 

-    CYContext(apr_pool_t *pool) :
-        pool_(pool)
-    {
-    }
+_finline CYFlags operator &(CYFlags lhs, CYFlags rhs) {
+    return static_cast<CYFlags>(static_cast<unsigned>(lhs) & static_cast<unsigned>(rhs));
+}

 
 

-    template <typename Type_>
-    void Replace(Type_ *&value) {
-        if (value != NULL)
-            while (Type_ *replace = value->Replace(*this))
-                value = replace;
-    }
-};
+_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));
+}

 
 struct CYStatement :
     CYNext<CYStatement>
 {
 
 struct CYStatement :
     CYNext<CYStatement>
 {

+    virtual ~CYStatement() {
+    }
+

     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 
     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 

-    CYStatement *ReplaceAll(CYContext &context);
-

     virtual CYStatement *Replace(CYContext &context) = 0;
 
   private:
     virtual CYStatement *Replace(CYContext &context) = 0;
 
   private:


@@ -198,6 +189,9 @@ struct CYStatements {
 };
 
 struct CYClassName {
 };
 
 struct CYClassName {

+    virtual ~CYClassName() {
+    }
+

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


@@ -214,10 +208,11 @@ 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 Output(CYOutput &out) const;
 
     virtual CYExpression *ClassName(CYContext &context, bool object);


@@ -226,16 +221,42 @@ struct CYWord :
 };
 
 _finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) {
 };
 
 _finline std::ostream &operator <<(std::ostream &lhs, const CYWord &rhs) {

-    return lhs << rhs.Value();
+    lhs << &rhs << '=';
+    return lhs << rhs.Word();

 }
 
 struct CYIdentifier :
 }
 
 struct CYIdentifier :

+    CYNext<CYIdentifier>,

     CYWord
 {
     CYWord
 {

+    CYIdentifier *replace_;
+    size_t offset_;
+    size_t usage_;
+

     CYIdentifier(const char *word) :
     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 :


@@ -254,6 +275,63 @@ struct CYLabel :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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,
+    CYIdentifierCatch,
+};
+
+typedef std::set<const char *, CYCStringLess> CYCStringSet;
+typedef std::set<CYIdentifier *, CYIdentifierValueLess> CYIdentifierValueSet;
+typedef std::map<CYIdentifier *, CYIdentifierFlags> CYIdentifierAddressFlagsMap;
+
+struct CYIdentifierUsage {
+    CYIdentifier *identifier_;
+    size_t usage_;
+};
+
+typedef std::vector<CYIdentifierUsage> CYIdentifierUsageVector;
+
+struct CYScope {
+    bool transparent_;
+
+    CYContext &context_;
+    CYStatement *&statements_;
+
+    CYScope *parent_;
+
+    CYIdentifierAddressFlagsMap internal_;
+    CYIdentifierValueSet identifiers_;
+
+    CYScope(bool transparent, CYContext &context, CYStatement *&statements);
+    virtual ~CYScope();
+
+    void Close();
+
+    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 CYProgram :
     CYThing
 {
 struct CYProgram :
     CYThing
 {


@@ -265,10 +343,97 @@ struct CYProgram :
     }
 
     virtual void Replace(CYContext &context);
     }
 
     virtual void Replace(CYContext &context);

-

     virtual void Output(CYOutput &out) const;
 };
 
     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 ~CYContext() {
+    }
+
+    template <typename Type_>
+    void ReplaceAll(Type_ *&values) {
+        Type_ **last(&values);
+        CYForEach (next, values) {
+            Replace(*last = next);
+            if (*last != NULL)
+                last = &(*last)->next_;
+        }
+    }
+
+    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;
+        }
+    }
+
+    void NonLocal(CYStatement *&statements);
+    CYIdentifier *Unique();
+};
+
+struct CYNonLocal {
+    CYIdentifier *identifier_;
+
+    CYNonLocal() :
+        identifier_(NULL)
+    {
+    }
+
+    CYIdentifier *Target(CYContext &context) {
+        if (identifier_ == NULL)
+            identifier_ = context.Unique();
+        return identifier_;
+    }
+};
+
+struct CYThisScope :
+    CYNext<CYThisScope>
+{
+    CYIdentifier *identifier_;
+
+    CYThisScope() :
+        identifier_(NULL)
+    {
+    }
+
+    CYIdentifier *Identifier(CYContext &context) {
+        if (next_ != NULL)
+            return next_->Identifier(context);
+        if (identifier_ == NULL)
+            identifier_ = context.Unique();
+        return identifier_;
+    }
+};
+

 struct CYBlock :
     CYStatement,
     CYThing
 struct CYBlock :
     CYStatement,
     CYThing


@@ -284,69 +449,57 @@ struct CYBlock :
         return statements_;
     }
 
         return statements_;
     }
 

+    void AddPrev(CYStatement *statement) {
+        CYSetLast(statement) = statements_;
+        statements_ = statement;
+    }
+

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

-enum CYState {
-    CYClear,
-    CYRestricted,
-    CYNewLine
-};
-
-class CYDriver {
-  public:
-    CYPool pool_;
-
-    CYState state_;
-    void *scanner_;
-
-    const char *data_;
-    size_t size_;
-    FILE *file_;
-
-    bool strict_;
-
-    enum Condition {
-        RegExpCondition,
-    };
-
-    std::string filename_;
-
-    struct Error {
-        bool warning_;
-        cy::location location_;
-        std::string message_;
-    };
-
-    typedef std::vector<Error> Errors;
-
-    CYProgram *program_;
-    Errors errors_;
-
+class CYStream :
+    public std::istream
+{

   private:
   private:

-    void ScannerInit();
-    void ScannerDestroy();
+    class CYBuffer :
+        public std::streambuf
+    {
+      public:
+        CYBuffer(const char *start, const char *end) {
+            setg(const_cast<char *>(start), const_cast<char *>(start), const_cast<char *>(end));
+        }
+    } buffer_;

 
   public:
 
   public:

-    CYDriver(const std::string &filename);
-    ~CYDriver();
-
-    void BeginCondition(Condition condition);
-
-    void Warning(const cy::location &location, const char *message);
+    CYStream(const char *start, const char *end) :
+        std::istream(&buffer_),
+        buffer_(start, end)
+    {
+    }

 };
 
 struct CYForInitialiser {
 };
 
 struct CYForInitialiser {

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

 };
 
 struct CYForInInitialiser {
 };
 
 struct CYForInInitialiser {

+    virtual ~CYForInInitialiser() {
+    }
+

     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;
     virtual void ForIn(CYOutput &out, CYFlags flags) const = 0;

-    virtual const char *ForEachIn() const = 0;
-    virtual CYExpression *ForEachIn(CYContext &out) = 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 CYNumber;
 };
 
 struct CYNumber;


@@ -359,28 +512,26 @@ struct CYExpression :
     CYClassName,
     CYThing
 {
     CYClassName,
     CYThing
 {

-    virtual unsigned Precedence() const = 0;
+    virtual int Precedence() const = 0;

 
     virtual bool RightHand() const {
         return true;
     }
 
 
     virtual bool RightHand() const {
         return true;
     }
 

-    virtual void For(CYOutput &out) const;

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

+    virtual CYStatement *ForEachIn(CYContext &out, CYExpression *value);

 
 

-    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;
 
     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 *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 *Replace(CYContext &context) = 0;

+    virtual CYAssignment *Assignment(CYContext &context);

 
     virtual CYExpression *Primitive(CYContext &context) {
         return this;
 
     virtual CYExpression *Primitive(CYContext &context) {
         return this;


@@ -405,8 +556,9 @@ struct CYExpression :
     }
 
 #define CYPrecedence(value) \
     }
 
 #define CYPrecedence(value) \

-    virtual unsigned Precedence() const { \
-        return value; \
+    static const int Precedence_ = value; \
+    virtual int Precedence() const { \
+        return Precedence_; \

     }
 
 #define CYRightHand(value) \
     }
 
 #define CYRightHand(value) \


@@ -419,16 +571,13 @@ struct CYCompound :
 {
     CYExpression *expressions_;
 
 {
     CYExpression *expressions_;
 

-    CYCompound(CYExpression *expressions) :
+    CYCompound(CYExpression *expressions = NULL) :

         expressions_(expressions)
     {
     }
 
     void AddPrev(CYExpression *expression) {
         expressions_(expressions)
     {
     }
 
     void AddPrev(CYExpression *expression) {

-        CYExpression *last(expression);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(expressions_);
+        CYSetLast(expression) = expressions_;

         expressions_ = expression;
     }
 
         expressions_ = expression;
     }
 


@@ -436,27 +585,37 @@ struct CYCompound :
 
     virtual CYExpression *Replace(CYContext &context);
     void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYExpression *Replace(CYContext &context);
     void Output(CYOutput &out, CYFlags flags) const;

+
+    virtual CYExpression *Primitive(CYContext &context);

 };
 
 };
 

+struct CYDeclaration;
+

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

-    CYIdentifier *name_;
+    CYForInInitialiser *initialiser_;

 
 

-    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next = NULL) :
+    CYFunctionParameter(CYForInInitialiser *initialiser, CYFunctionParameter *next = NULL) :

         CYNext<CYFunctionParameter>(next),
         CYNext<CYFunctionParameter>(next),

-        name_(name)
+        initialiser_(initialiser)

     {
     }
 
     {
     }
 

-    virtual void Output(CYOutput &out) const;
+    void Replace(CYContext &context, CYBlock &code);
+    void Output(CYOutput &out) const;

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

+    CYComprehension(CYComprehension *next = NULL) :
+        CYNext<CYComprehension>(next)
+    {
+    }
+

     virtual const char *Name() const = 0;
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
     virtual const char *Name() const = 0;
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;


@@ -471,14 +630,15 @@ struct CYForInComprehension :
     CYIdentifier *name_;
     CYExpression *set_;
 
     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 {
         name_(name),
         set_(set)
     {
     }
 
     virtual const char *Name() const {

-        return name_->Value();
+        return name_->Word();

     }
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     }
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const;


@@ -486,20 +646,21 @@ struct CYForInComprehension :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYForEachInComprehension :
+struct CYForOfComprehension :

     CYComprehension
 {
     CYIdentifier *name_;
     CYExpression *set_;
 
     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 {
         name_(name),
         set_(set)
     {
     }
 
     virtual const char *Name() const {

-        return name_->Value();
+        return name_->Word();

     }
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const;
     }
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const;


@@ -614,7 +775,7 @@ struct CYString :
     }
 
     CYString(const CYWord *word) :
     }
 
     CYString(const CYWord *word) :

-        value_(word->Value()),
+        value_(word->Word()),

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


@@ -628,7 +789,7 @@ struct CYString :
     virtual CYNumber *Number(CYContext &context);
     virtual CYString *String(CYContext &context);
 
     virtual CYNumber *Number(CYContext &context);
     virtual CYString *String(CYContext &context);
 

-    virtual CYString *Concat(CYContext &out, CYString *rhs) const;
+    CYString *Concat(CYContext &out, CYString *rhs) const;

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


@@ -751,6 +912,11 @@ struct CYVariable :
     {
     }
 
     {
     }
 

+    CYVariable(const char *name) :
+        name_(new($pool) CYIdentifier(name))
+    {
+    }
+

     CYPrecedence(0)
     CYRightHand(false)
 
     CYPrecedence(0)
     CYRightHand(false)
 


@@ -863,7 +1029,7 @@ struct CYArgument :
     {
     }
 
     {
     }
 

-    void Replace(CYContext &context);
+    CYArgument *Replace(CYContext &context);

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


@@ -923,31 +1089,49 @@ struct CYArray :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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_;
 
 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;
         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 CYExpression *ForEachIn(CYContext &out);
+    virtual CYExpression *Replace(CYContext &context);

 
 

-    void Replace(CYContext &context);
+    virtual CYAssignment *Assignment(CYContext &context);
+    CYVariable *Variable(CYContext &context);

 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDeclarations :
     CYNext<CYDeclarations>,
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
 struct CYDeclarations :
     CYNext<CYDeclarations>,

-    CYForInitialiser,

     CYThing
 {
     CYDeclaration *declaration_;
     CYThing
 {
     CYDeclaration *declaration_;


@@ -958,14 +1142,31 @@ struct CYDeclarations :
     {
     }
 
     {
     }
 

-    virtual void For(CYOutput &out) const;
-

     void Replace(CYContext &context);
 
     void Replace(CYContext &context);
 

+    CYCompound *Compound(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;
 };
 
     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 CYCompound *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYVar :
     CYStatement
 {
 struct CYVar :
     CYStatement
 {


@@ -980,15 +1181,15 @@ struct CYVar :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYLet :
+struct CYLetStatement :

     CYStatement
 {
     CYDeclarations *declarations_;
     CYStatement
 {
     CYDeclarations *declarations_;

-    CYBlock code_;
+    CYStatement *code_;

 
 

-    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+    CYLetStatement(CYDeclarations *declarations, CYStatement *code) :

         declarations_(declarations),
         declarations_(declarations),

-        code_(statements)
+        code_(code)

     {
     }
 
     {
     }
 


@@ -1034,14 +1235,14 @@ struct CYForIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYForEachIn :
+struct CYForOf :

     CYStatement
 {
     CYForInInitialiser *initialiser_;
     CYExpression *set_;
     CYStatement *code_;
 
     CYStatement
 {
     CYForInInitialiser *initialiser_;
     CYExpression *set_;
     CYStatement *code_;
 

-    CYForEachIn(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :
+    CYForOf(CYForInInitialiser *initialiser, CYExpression *set, CYStatement *code) :

         initialiser_(initialiser),
         set_(set),
         code_(code)
         initialiser_(initialiser),
         set_(set),
         code_(code)


@@ -1052,30 +1253,12 @@ struct CYForEachIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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 CYObject :
     CYLiteral
 {
     CYProperty *properties_;
 
 struct CYObject :
     CYLiteral
 {
     CYProperty *properties_;
 

-    CYObject(CYProperty *properties) :
+    CYObject(CYProperty *properties = NULL) :

         properties_(properties)
     {
     }
         properties_(properties)
     {
     }


@@ -1084,22 +1267,6 @@ struct CYObject :
     void Output(CYOutput &out, CYFlags flags) const;
 };
 
     void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYCatch :
-    CYThing
-{
-    CYIdentifier *name_;
-    CYBlock code_;
-
-    CYCatch(CYIdentifier *name, CYStatement *statements) :
-        name_(name),
-        code_(statements)
-    {
-    }
-
-    void Replace(CYContext &context);
-    virtual void Output(CYOutput &out) const;
-};
-

 struct CYMember :
     CYExpression
 {
 struct CYMember :
     CYExpression
 {


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

-
-    void Replace_(CYContext &context);

 };
 
 struct CYDirectMember :
 };
 
 struct CYDirectMember :


@@ -1149,19 +1314,22 @@ struct CYIndirectMember :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYNew :
+namespace cy {
+namespace Syntax {
+
+struct New :

     CYExpression
 {
     CYExpression *constructor_;
     CYArgument *arguments_;
 
     CYExpression
 {
     CYExpression *constructor_;
     CYArgument *arguments_;
 

-    CYNew(CYExpression *constructor, CYArgument *arguments) :
+    New(CYExpression *constructor, CYArgument *arguments) :

         constructor_(constructor),
         arguments_(arguments)
     {
     }
 
         constructor_(constructor),
         arguments_(arguments)
     {
     }
 

-    virtual unsigned Precedence() const {
+    virtual int Precedence() const {

         return arguments_ == NULL ? 2 : 1;
     }
 
         return arguments_ == NULL ? 2 : 1;
     }
 


@@ -1169,8 +1337,12 @@ struct CYNew :
 
     virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;

+
+    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);

 };
 
 };
 

+} }
+

 struct CYCall :
     CYExpression
 {
 struct CYCall :
     CYExpression
 {


@@ -1188,6 +1360,29 @@ struct CYCall :
 
     virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
 
     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 :
 };
 
 struct CYIf :


@@ -1240,22 +1435,32 @@ struct CYWhile :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     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_;
     CYBlock code_;
 
 struct CYFunction {
     CYIdentifier *name_;
     CYFunctionParameter *parameters_;
     CYBlock code_;
 

+    CYNonLocal *nonlocal_;
+    CYThisScope this_;
+

     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
         parameters_(parameters),
     CYFunction(CYIdentifier *name, CYFunctionParameter *parameters, CYStatement *statements) :
         name_(name),
         parameters_(parameters),

-        code_(statements)
+        code_(statements),
+        nonlocal_(NULL)

     {
     }
 
     {
     }
 

-    virtual void Replace_(CYContext &context);
+    virtual ~CYFunction() {
+    }
+
+    void Inject(CYContext &context);
+    virtual void Replace_(CYContext &context, bool outer);

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

+// XXX: this should be split up into CYAnonymousFunctionExpression and CYNamedFunctionExpression

 struct CYFunctionExpression :
     CYFunction,
     CYExpression
 struct CYFunctionExpression :
     CYFunction,
     CYExpression


@@ -1272,6 +1477,37 @@ struct CYFunctionExpression :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+// XXX: this should derive from CYAnonymousFunction
+struct CYFatArrow :
+    CYFunction,
+    CYExpression
+{
+    CYFatArrow(CYFunctionParameter *parameters, CYStatement *statements) :
+        CYFunction(NULL, 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 CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+// XXX: this should derive from CYNamedFunction

 struct CYFunctionStatement :
     CYFunction,
     CYStatement
 struct CYFunctionStatement :
     CYFunction,
     CYStatement


@@ -1293,6 +1529,8 @@ struct CYExpress :
     CYExpress(CYExpression *expression) :
         expression_(expression)
     {
     CYExpress(CYExpression *expression) :
         expression_(expression)
     {

+        if (expression == NULL)
+            throw;

     }
 
     virtual CYStatement *Replace(CYContext &context);
     }
 
     virtual CYStatement *Replace(CYContext &context);


@@ -1362,14 +1600,226 @@ struct CYFinally :
     virtual void Output(CYOutput &out) const;
 };
 
     virtual void Output(CYOutput &out) const;
 };
 

-struct CYTry :
+struct CYTypeModifier :
+    CYNext<CYTypeModifier>
+{
+    CYTypeModifier(CYTypeModifier *next) :
+        CYNext<CYTypeModifier>(next)
+    {
+    }
+
+    virtual int Precedence() const = 0;
+
+    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;
+};
+
+struct CYTypeArrayOf :
+    CYTypeModifier
+{
+    CYExpression *size_;
+
+    CYTypeArrayOf(CYExpression *size, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        size_(size)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypeConstant :
+    CYTypeModifier
+{
+    CYTypeConstant(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypePointerTo :
+    CYTypeModifier
+{
+    CYTypePointerTo(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypeVolatile :
+    CYTypeModifier
+{
+    CYTypeVolatile(CYTypeModifier *next = NULL) :
+        CYTypeModifier(next)
+    {
+    }
+
+    CYPrecedence(0)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) const;
+};
+
+struct CYTypedIdentifier :
+    CYNext<CYTypedIdentifier>,
+    CYThing
+{
+    CYIdentifier *identifier_;
+    CYExpression *type_;
+    CYTypeModifier *modifier_;
+
+    CYTypedIdentifier(CYIdentifier *identifier = NULL) :
+        identifier_(identifier),
+        type_(NULL),
+        modifier_(NULL)
+    {
+    }
+
+    CYTypedIdentifier(CYExpression *type, CYTypeModifier *modifier = NULL) :
+        identifier_(NULL),
+        type_(type),
+        modifier_(modifier)
+    {
+    }
+
+    inline CYTypedIdentifier *Modify(CYTypeModifier *modifier) {
+        CYSetLast(modifier_) = modifier;
+        return this;
+    }
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYEncodedType :
+    CYExpression
+{
+    CYTypedIdentifier *typed_;
+
+    CYEncodedType(CYTypedIdentifier *typed) :
+        typed_(typed)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYTypedParameter :
+    CYNext<CYTypedParameter>,
+    CYThing
+{
+    CYTypedIdentifier *typed_;
+
+    CYTypedParameter(CYTypedIdentifier *typed, CYTypedParameter *next) :
+        CYNext<CYTypedParameter>(next),
+        typed_(typed)
+    {
+    }
+
+    CYArgument *Argument(CYContext &context);
+    CYFunctionParameter *Parameters(CYContext &context);
+    CYExpression *TypeSignature(CYContext &context, CYExpression *prefix);
+
+    virtual void Output(CYOutput &out) const;
+};
+
+struct CYLambda :
+    CYExpression
+{
+    CYTypedIdentifier *typed_;
+    CYTypedParameter *parameters_;
+    CYStatement *statements_;
+
+    CYLambda(CYTypedIdentifier *typed, CYTypedParameter *parameters, CYStatement *statements) :
+        typed_(typed),
+        parameters_(parameters),
+        statements_(statements)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYTypeDefinition :
+    CYStatement
+{
+    CYTypedIdentifier *typed_;
+
+    CYTypeDefinition(CYTypedIdentifier *typed) :
+        typed_(typed)
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+
+struct CYTypeFunctionWith :
+    CYTypeModifier
+{
+    CYTypedParameter *parameters_;
+
+    CYTypeFunctionWith(CYTypedParameter *parameters, CYTypeModifier *next = NULL) :
+        CYTypeModifier(next),
+        parameters_(parameters)
+    {
+    }
+
+    CYPrecedence(1)
+
+    virtual CYExpression *Replace_(CYContext &context, CYExpression *type);
+    virtual void Output(CYOutput &out, CYIdentifier *identifier) 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 Try :

     CYStatement
 {
     CYBlock code_;
     CYStatement
 {
     CYBlock code_;

-    CYCatch *catch_;
+    Catch *catch_;

     CYFinally *finally_;
 
     CYFinally *finally_;
 

-    CYTry(CYStatement *statements, CYCatch *_catch, CYFinally *finally) :
+    Try(CYStatement *statements, Catch *_catch, CYFinally *finally) :

         code_(statements),
         catch_(_catch),
         finally_(finally)
         code_(statements),
         catch_(_catch),
         finally_(finally)


@@ -1380,12 +1830,12 @@ struct CYTry :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

-struct CYThrow :
+struct Throw :

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

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

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


@@ -1394,6 +1844,8 @@ struct CYThrow :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+} }
+

 struct CYWith :
     CYStatement
 {
 struct CYWith :
     CYStatement
 {


@@ -1426,6 +1878,17 @@ struct CYSwitch :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 

+struct CYDebugger :
+    CYStatement
+{
+    CYDebugger()
+    {
+    }
+
+    virtual CYStatement *Replace(CYContext &context);
+    virtual void Output(CYOutput &out, CYFlags flags) const;
+};
+

 struct CYCondition :
     CYExpression
 {
 struct CYCondition :
     CYExpression
 {


@@ -1594,4 +2057,4 @@ CYAssignment_("&=", BitwiseAnd)
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 

-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/