X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/561ac4181ec3ad1e1e207e840f70d5017ba9a1ed..bf45251b6ef1230ffdbd79319b9c4a60c5ae6913:/Parser.hpp

diff --git a/Parser.hpp b/Parser.hpp
index 600e3bb..c26e6d2 100644
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1,85 +1,59 @@
-/* Cycript - Error.hppution Server and Disassembler
- * Copyright (C) 2009  Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)
 */
 
-/* Modified BSD License {{{ */
+/* GNU Lesser 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 Lesser 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 Lesser 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 Lesser 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 <stack>
 #include <string>
 #include <vector>
+#include <map>
+#include <set>
 
+#include <cstdio>
 #include <cstdlib>
 
 #include "location.hh"
-#include "Pooling.hpp"
-
-template <typename Type_>
-struct CYNext {
-    Type_ *next_;
 
-    CYNext() :
-        next_(NULL)
-    {
-    }
+#include "List.hpp"
+#include "Pooling.hpp"
+#include "Options.hpp"
 
-    CYNext(Type_ *next) :
-        next_(next)
-    {
-    }
+class 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_;
+    CYOptions &options_;
     bool pretty_;
     unsigned indent_;
+    bool right_;
 
     enum {
         NoMode,
@@ -89,10 +63,12 @@ struct CYOutput {
         Terminated
     } mode_;
 
-    CYOutput(std::ostream &out) :
+    CYOutput(std::ostream &out, CYOptions &options) :
         out_(out),
+        options_(options),
         pretty_(false),
         indent_(0),
+        right_(false),
         mode_(NoMode)
     {
     }
@@ -117,9 +93,13 @@ struct CYOutput {
 
 struct CYPropertyName {
     virtual void PropertyName(CYOutput &out) const = 0;
+
+    virtual ~CYPropertyName() {
+    }
 };
 
 struct CYExpression;
+struct CYAssignment;
 
 enum CYNeeded {
     CYNever     = -1,
@@ -135,33 +115,47 @@ enum CYFlags {
     CYNoCall =       (1 << 3),
     CYNoRightHand =  (1 << 4),
     CYNoDangle =     (1 << 5),
+    CYNoInteger =    (1 << 6),
     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>
 {
+    virtual ~CYStatement() {
+    }
+
     void Single(CYOutput &out, CYFlags flags) const;
     void Multiple(CYOutput &out, CYFlags flags = CYNoFlags) const;
 
-    CYStatement *ReplaceAll(CYContext &context);
-
     virtual CYStatement *Replace(CYContext &context) = 0;
 
   private:
@@ -198,6 +192,9 @@ struct CYStatements {
 };
 
 struct CYClassName {
+    virtual ~CYClassName() {
+    }
+
     virtual CYExpression *ClassName(CYContext &context, bool object) = 0;
     virtual void ClassName(CYOutput &out, bool object) const = 0;
 };
@@ -214,10 +211,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);
@@ -226,16 +224,42 @@ struct CYWord :
 };
 
 _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 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 :
@@ -254,6 +278,63 @@ struct CYLabel :
     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
 {
@@ -265,10 +346,74 @@ struct CYProgram :
     }
 
     virtual void Replace(CYContext &context);
-
     virtual void Output(CYOutput &out) const;
 };
 
+struct CYNonLocal;
+
+struct CYContext {
+    CYOptions &options_;
+
+    CYScope *scope_;
+    CYIdentifierUsageVector rename_;
+
+    CYNonLocal *nonlocal_;
+    CYNonLocal *nextlocal_;
+    unsigned unique_;
+
+    CYContext(CYOptions &options) :
+        options_(options),
+        scope_(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 CYBlock :
     CYStatement,
     CYThing
@@ -284,6 +429,11 @@ struct CYBlock :
         return statements_;
     }
 
+    void AddPrev(CYStatement *statement) {
+        CYSetLast(statement) = statements_;
+        statements_ = statement;
+    }
+
     virtual CYStatement *Replace(CYContext &context);
 
     virtual void Output(CYOutput &out) const;
@@ -298,10 +448,11 @@ enum CYState {
 
 class CYDriver {
   public:
-    CYPool pool_;
+    void *scanner_;
 
     CYState state_;
-    void *scanner_;
+    bool nobrace_;
+    std::stack<bool> in_;
 
     const char *data_;
     size_t size_;
@@ -328,12 +479,39 @@ class CYDriver {
     CYProgram *program_;
     Errors errors_;
 
+    bool auto_;
+
+    struct Context {
+        CYExpression *context_;
+
+        Context(CYExpression *context) :
+            context_(context)
+        {
+        }
+
+        typedef std::vector<CYWord *> Words;
+        Words words_;
+    };
+
+    typedef std::vector<Context> Contexts;
+    Contexts contexts_;
+
+    CYExpression *context_;
+
+    enum Mode {
+        AutoNone,
+        AutoPrimary,
+        AutoDirect,
+        AutoIndirect,
+        AutoMessage
+    } mode_;
+
   private:
     void ScannerInit();
     void ScannerDestroy();
 
   public:
-    CYDriver(const std::string &filename);
+    CYDriver(const std::string &filename = "");
     ~CYDriver();
 
     Condition GetCondition();
@@ -346,13 +524,24 @@ class CYDriver {
 };
 
 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 {
+    virtual ~CYForInInitialiser() {
+    }
+
     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;
@@ -371,11 +560,10 @@ struct CYExpression :
         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 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;
@@ -384,9 +572,8 @@ struct CYExpression :
     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 CYAssignment *Assignment(CYContext &context);
 
     virtual CYExpression *Primitive(CYContext &context) {
         return this;
@@ -411,8 +598,9 @@ struct CYExpression :
     }
 
 #define CYPrecedence(value) \
+    static const unsigned Precedence_ = value; \
     virtual unsigned Precedence() const { \
-        return value; \
+        return Precedence_; \
     }
 
 #define CYRightHand(value) \
@@ -425,16 +613,13 @@ struct CYCompound :
 {
     CYExpression *expressions_;
 
-    CYCompound(CYExpression *expressions) :
+    CYCompound(CYExpression *expressions = NULL) :
         expressions_(expressions)
     {
     }
 
     void AddPrev(CYExpression *expression) {
-        CYExpression *last(expression);
-        while (last->next_ != NULL)
-            last = last->next_;
-        last->SetNext(expressions_);
+        CYSetLast(expression) = expressions_;
         expressions_ = expression;
     }
 
@@ -442,27 +627,37 @@ struct CYCompound :
 
     virtual CYExpression *Replace(CYContext &context);
     void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYExpression *Primitive(CYContext &context);
 };
 
+struct CYDeclaration;
+
 struct CYFunctionParameter :
     CYNext<CYFunctionParameter>,
     CYThing
 {
-    CYIdentifier *name_;
+    CYForInInitialiser *initialiser_;
 
-    CYFunctionParameter(CYIdentifier *name, CYFunctionParameter *next = NULL) :
+    CYFunctionParameter(CYForInInitialiser *initialiser, CYFunctionParameter *next = NULL) :
         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
 {
+    CYComprehension(CYComprehension *next = NULL) :
+        CYNext<CYComprehension>(next)
+    {
+    }
+
     virtual const char *Name() const = 0;
 
     virtual CYFunctionParameter *Parameter(CYContext &context) const = 0;
@@ -477,14 +672,15 @@ 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 CYFunctionParameter *Parameter(CYContext &context) const;
@@ -492,20 +688,21 @@ struct CYForInComprehension :
     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 CYFunctionParameter *Parameter(CYContext &context) const;
@@ -620,7 +817,7 @@ struct CYString :
     }
 
     CYString(const CYWord *word) :
-        value_(word->Value()),
+        value_(word->Word()),
         size_(strlen(value_))
     {
     }
@@ -634,7 +831,7 @@ struct CYString :
     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;
 };
@@ -757,6 +954,11 @@ struct CYVariable :
     {
     }
 
+    CYVariable(const char *name) :
+        name_(new($pool) CYIdentifier(name))
+    {
+    }
+
     CYPrecedence(0)
     CYRightHand(false)
 
@@ -869,7 +1071,7 @@ struct CYArgument :
     {
     }
 
-    void Replace(CYContext &context);
+    CYArgument *Replace(CYContext &context);
     void Output(CYOutput &out) const;
 };
 
@@ -960,18 +1162,18 @@ struct CYDeclaration :
     }
 
     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>,
-    CYForInitialiser,
     CYThing
 {
     CYDeclaration *declaration_;
@@ -982,15 +1184,31 @@ struct CYDeclarations :
     {
     }
 
-    virtual void For(CYOutput &out) const;
-
     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;
 };
 
+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
 {
@@ -1005,15 +1223,15 @@ struct CYVar :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYLet :
+struct CYLetStatement :
     CYStatement
 {
     CYDeclarations *declarations_;
-    CYBlock code_;
+    CYStatement *code_;
 
-    CYLet(CYDeclarations *declarations, CYStatement *statements) :
+    CYLetStatement(CYDeclarations *declarations, CYStatement *code) :
         declarations_(declarations),
-        code_(statements)
+        code_(code)
     {
     }
 
@@ -1059,14 +1277,14 @@ struct CYForIn :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYForEachIn :
+struct CYForOf :
     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)
@@ -1082,7 +1300,7 @@ struct CYObject :
 {
     CYProperty *properties_;
 
-    CYObject(CYProperty *properties) :
+    CYObject(CYProperty *properties = NULL) :
         properties_(properties)
     {
     }
@@ -1106,8 +1324,6 @@ struct CYMember :
     void SetLeft(CYExpression *object) {
         object_ = object;
     }
-
-    void Replace_(CYContext &context);
 };
 
 struct CYDirectMember :
@@ -1140,13 +1356,16 @@ struct CYIndirectMember :
     virtual void Output(CYOutput &out, CYFlags flags) const;
 };
 
-struct CYNew :
+namespace cy {
+namespace Syntax {
+
+struct New :
     CYExpression
 {
     CYExpression *constructor_;
     CYArgument *arguments_;
 
-    CYNew(CYExpression *constructor, CYArgument *arguments) :
+    New(CYExpression *constructor, CYArgument *arguments) :
         constructor_(constructor),
         arguments_(arguments)
     {
@@ -1160,8 +1379,12 @@ struct CYNew :
 
     virtual CYExpression *Replace(CYContext &context);
     virtual void Output(CYOutput &out, CYFlags flags) const;
+
+    virtual CYExpression *AddArgument(CYContext &context, CYExpression *value);
 };
 
+} }
+
 struct CYCall :
     CYExpression
 {
@@ -1179,6 +1402,29 @@ struct CYCall :
 
     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 :
@@ -1231,22 +1477,30 @@ struct CYWhile :
     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_;
+    CYNonLocal *nonlocal_;
 
     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;
 };
 
+// XXX: this should be split up into CYAnonymousFunctionExpression and CYNamedFunctionExpression
 struct CYFunctionExpression :
     CYFunction,
     CYExpression
@@ -1263,6 +1517,20 @@ struct CYFunctionExpression :
     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
@@ -1284,6 +1552,8 @@ struct CYExpress :
     CYExpress(CYExpression *expression) :
         expression_(expression)
     {
+        if (expression == NULL)
+            throw;
     }
 
     virtual CYStatement *Replace(CYContext &context);
@@ -1395,7 +1665,7 @@ struct Throw :
 {
     CYExpression *value_;
 
-    Throw(CYExpression *value) :
+    Throw(CYExpression *value = NULL) :
         value_(value)
     {
     }
@@ -1438,6 +1708,17 @@ struct CYSwitch :
     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
 {
@@ -1606,4 +1887,4 @@ CYAssignment_("&=", BitwiseAnd)
 CYAssignment_("^=", BitwiseXOr)
 CYAssignment_("|=", BitwiseOr)
 
-#endif/*CYPARSER_HPP*/
+#endif/*CYCRIPT_PARSER_HPP*/