Commit a generally useful -gtiming implementation.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index ecfbba104edee8c89bef2d29be9b3c8a3fff5d7f..8b00100fe3a8371339306010165da79b31f8f19a 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1,52 +1,34 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * 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/>.
+**/

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

-@if Bison23 %{
-
-@if Bison24 %code top {
+%code top {

 #define cyscanner driver.scanner_
 #define YYSTACKEXPANDABLE 1
 #define cyscanner driver.scanner_
 #define YYSTACKEXPANDABLE 1

-@if Bison23 #define yyerrok (yyerrstatus_ = 0)
-@if Bison24 }
+}

 
 

-@if Bison24 %code requires {
+%code requires {
+#include "Driver.hpp"

 #include "Parser.hpp"
 #include "Parser.hpp"

+#include "Stack.hpp"
+#define CYNew new(driver.pool_)

 
 @begin ObjectiveC
 #include "ObjectiveC/Syntax.hpp"
 
 @begin ObjectiveC
 #include "ObjectiveC/Syntax.hpp"


@@ -56,8 +38,11 @@
 #include "E4X/Syntax.hpp"
 @end
 
 #include "E4X/Syntax.hpp"
 @end
 

+#include "Highlight.hpp"
+

 typedef struct {
     bool newline_;
 typedef struct {
     bool newline_;

+    hi::Value highlight_;

 
     union {
         bool bool_;
 
     union {
         bool bool_;


@@ -71,7 +56,6 @@ typedef struct {
         cy::Syntax::Catch *catch_;
         CYComment *comment_;
         CYComprehension *comprehension_;
         cy::Syntax::Catch *catch_;
         CYComment *comment_;
         CYComprehension *comprehension_;

-        CYCompound *compound_;

         CYDeclaration *declaration_;
         CYDeclarations *declarations_;
         CYElement *element_;
         CYDeclaration *declaration_;
         CYDeclarations *declarations_;
         CYElement *element_;


@@ -85,20 +69,30 @@ typedef struct {
         CYInfix *infix_;
         CYLiteral *literal_;
         CYMember *member_;
         CYInfix *infix_;
         CYLiteral *literal_;
         CYMember *member_;

+        CYModule *module_;

         CYNull *null_;
         CYNumber *number_;
         CYNull *null_;
         CYNumber *number_;

+        CYParenthetical *parenthetical_;

         CYProgram *program_;
         CYProperty *property_;
         CYPropertyName *propertyName_;
         CYProgram *program_;
         CYProperty *property_;
         CYPropertyName *propertyName_;

+        CYRubyProc *rubyProc_;

         CYStatement *statement_;
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;
         CYWord *word_;
 
         CYStatement *statement_;
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;
         CYWord *word_;
 

+@begin C
+        CYTypeModifier *modifier_;
+        CYTypeSpecifier *specifier_;
+        CYTypedIdentifier *typedIdentifier_;
+        CYTypedParameter *typedParameter_;
+@end
+

 @begin ObjectiveC
         CYClassName *className_;
 @begin ObjectiveC
         CYClassName *className_;

-        CYField *field_;
+        CYClassField *classField_;

         CYMessage *message_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYMessage *message_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;


@@ -114,18 +108,15 @@ typedef struct {
 } YYSTYPE;
 
 #define YYSTYPE YYSTYPE
 } YYSTYPE;
 
 #define YYSTYPE YYSTYPE

-@if Bison24 }
+}

 
 

-@if Bison24 %code provides {
-int cylex(YYSTYPE *, cy::location *, void *);
-@if Bison24 }
+%code provides {
+int cylex(YYSTYPE *, CYLocation *, void *);
+}

 
 

-@if Bison23 %}
+%name-prefix "cy"

 
 

-%name-prefix="cy"
-
-@if Bison23 %skeleton "lalr1.cc"
-@if Bison24 %language "C++"
+%language "C++"

 
 %initial-action {
     @$.begin.filename = @$.end.filename = &driver.filename_;
 
 %initial-action {
     @$.begin.filename = @$.end.filename = &driver.filename_;


@@ -134,6 +125,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %locations
 %defines
 
 %locations
 %defines
 

+%define api.location.type { CYLocation }
+

 //%glr-parser
 //%expect 1
 
 //%glr-parser
 //%expect 1
 


@@ -142,6 +135,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %parse-param { CYDriver &driver }
 %lex-param { void *cyscanner }
 
 %parse-param { CYDriver &driver }
 %lex-param { void *cyscanner }
 

+/* Token Declarations {{{ */

 @begin E4X
 %token XMLCDATA
 %token XMLComment
 @begin E4X
 %token XMLCDATA
 %token XMLComment


@@ -167,6 +161,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 
 @begin E4X ObjectiveC
 %token At "@"
 
 @begin E4X ObjectiveC
 %token At "@"

+%token Pound "#"

 @end
 
 %token Ampersand "&"
 @end
 
 %token Ampersand "&"


@@ -177,6 +172,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token Equal "="
 %token EqualEqual "=="
 %token EqualEqualEqual "==="
 %token Equal "="
 %token EqualEqual "=="
 %token EqualEqualEqual "==="

+%token EqualRight "=>"
+%token EqualRight_ "\n=>"

 %token Exclamation "!"
 %token ExclamationEqual "!="
 %token ExclamationEqualEqual "!=="
 %token Exclamation "!"
 %token ExclamationEqual "!="
 %token ExclamationEqualEqual "!=="


@@ -192,6 +189,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token Percent "%"
 %token PercentEqual "%="
 %token Period "."
 %token Percent "%"
 %token PercentEqual "%="
 %token Period "."

+%token PeriodPeriodPeriod "..."

 %token Pipe "|"
 %token PipeEqual "|="
 %token PipePipe "||"
 %token Pipe "|"
 %token PipeEqual "|="
 %token PipePipe "||"


@@ -223,71 +221,87 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token CloseParen ")"
 
 %token OpenBrace "{"
 %token CloseParen ")"
 
 %token OpenBrace "{"

+%token OpenBrace_ "\n{"
+%token OpenBrace__ ";{"

 %token CloseBrace "}"
 
 %token OpenBracket "["
 %token CloseBracket "]"
 
 %token CloseBrace "}"
 
 %token OpenBracket "["
 %token CloseBracket "]"
 

+%token AtError "@error"
+
+@begin Java

 %token AtClass "@class"
 %token AtClass "@class"

-%token AtSelector "@selector"
+@end
+
+@begin C
+%token <identifier_> Typedef "typedef"
+%token <identifier_> Unsigned "unsigned"
+%token <identifier_> Signed "signed"
+%token <identifier_> Extern "extern"
+@end
+
+@begin C
+%token AtEncode "@encode"
+@end
+
+@begin ObjectiveC
+%token AtImplementation "@implementation"
+%token AtImplementation_ ";@implementation"
+%token AtImport "@import"

 %token AtEnd "@end"
 %token AtEnd "@end"

+%token AtSelector "@selector"
+%token AtNull "@null"
+%token AtYes "@YES"
+%token AtNo "@NO"
+%token AtTrue "@true"
+%token AtFalse "@false"
+%token <identifier_> Yes "YES"
+%token <identifier_> No "NO"
+@end

 
 

-%token <false_> False "false"
-%token <null_> Null "null"
-%token <true_> True "true"
-
-// ES3/ES5/WIE/JSC Reserved
-%token <word_> Break "break"
-%token <word_> Case "case"
-%token <word_> Catch "catch"
-%token <word_> Continue "continue"
-%token <word_> Default "default"
-%token <word_> Delete "delete"
-%token <word_> Do "do"
-%token <word_> Else "else"
-%token <word_> Finally "finally"
-%token <word_> For "for"
-%token <word_> Function "function"
-%token <word_> If "if"
-%token <word_> In "in"
-%token <word_> InstanceOf "instanceof"
-%token <word_> New "new"
-%token <word_> Return "return"
-%token <word_> Switch "switch"
-%token <this_> This "this"
-%token <word_> Throw "throw"
-%token <word_> Try "try"
-%token <word_> TypeOf "typeof"
-%token <word_> Var "var"
-%token <word_> Void "void"
-%token <word_> While "while"
-%token <word_> With "with"
-
-// ES3/IE6 Future, ES5/JSC Reserved
-%token <word_> Debugger "debugger"
-
-// ES3/ES5/IE6 Future, JSC Reserved
-%token <word_> Const "const"
-
-// ES3/ES5/IE6/JSC Future
-%token <word_> Class "class"
-%token <word_> Enum "enum"
-%token <word_> Export "export"
-%token <word_> Extends "extends"
-%token <word_> Import "import"
-%token <word_> Super "super"
-
-// ES3 Future, ES5 Strict Future
-%token <identifier_> Implements "implements"
-%token <identifier_> Interface "interface"
-%token <identifier_> Package "package"
-%token <identifier_> Private "private"
-%token <identifier_> Protected "protected"
-%token <identifier_> Public "public"
-%token <identifier_> Static "static"
+%token False "false"
+%token Null "null"
+%token True "true"
+
+%token Break "break"
+%token Case "case"
+%token Catch "catch"
+%token Class "class"
+%token Const "const"
+%token Continue "continue"
+%token Debugger "debugger"
+%token Default "default"
+%token Delete "delete"
+%token Do "do"
+%token Else "else"
+%token Enum "enum"
+%token Export "export"
+%token Extends "extends"
+%token Finally "finally"
+%token For "for"
+%token Function "function"
+%token Function_ ";function"
+%token If "if"
+%token Import "import"
+%token In "in"
+%token In_ "!in"
+%token InstanceOf "instanceof"
+%token New "new"
+%token Return "return"
+%token Super "super"
+%token Switch "switch"
+%token This "this"
+%token Throw "throw"
+%token Try "try"
+%token TypeOf "typeof"
+%token Var "var"
+%token Void "void"
+%token While "while"
+%token With "with"

 
 

-// ES3 Future

 %token <identifier_> Abstract "abstract"
 %token <identifier_> Abstract "abstract"

+%token <identifier_> Await "await"

 %token <identifier_> Boolean "boolean"
 %token <identifier_> Byte "byte"
 %token <identifier_> Char "char"
 %token <identifier_> Boolean "boolean"
 %token <identifier_> Byte "byte"
 %token <identifier_> Char "char"


@@ -295,24 +309,29 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token <identifier_> Final "final"
 %token <identifier_> Float "float"
 %token <identifier_> Goto "goto"
 %token <identifier_> Final "final"
 %token <identifier_> Float "float"
 %token <identifier_> Goto "goto"

+%token <identifier_> Implements "implements"

 %token <identifier_> Int "int"
 %token <identifier_> Int "int"

+%token <identifier_> Interface "interface"
+%token <identifier_> Let "let"

 %token <identifier_> Long "long"
 %token <identifier_> Native "native"
 %token <identifier_> Long "long"
 %token <identifier_> Native "native"

+%token <identifier_> Package "package"
+%token <identifier_> Private "private"
+%token <identifier_> Protected "protected"
+%token <identifier_> Public "public"

 %token <identifier_> Short "short"
 %token <identifier_> Short "short"

+%token <identifier_> Static "static"

 %token <identifier_> Synchronized "synchronized"
 %token <identifier_> Throws "throws"
 %token <identifier_> Transient "transient"
 %token <identifier_> Volatile "volatile"
 %token <identifier_> Synchronized "synchronized"
 %token <identifier_> Throws "throws"
 %token <identifier_> Transient "transient"
 %token <identifier_> Volatile "volatile"

-
-// ES5 Strict
-%token <identifier_> Let "let"

 %token <identifier_> Yield "yield"
 
 %token <identifier_> Yield "yield"
 

-// Woah?!
+%token Auto "auto"

 %token <identifier_> Each "each"
 %token <identifier_> Each "each"

+%token <identifier_> Of "of"

 
 @begin E4X
 
 @begin E4X

-// E4X Conditional

 %token <identifier_> Namespace "namespace"
 %token <identifier_> XML "xml"
 @end
 %token <identifier_> Namespace "namespace"
 %token <identifier_> XML "xml"
 @end


@@ -325,45 +344,45 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token <literal_> RegularExpressionLiteral
 
 %type <expression_> AdditiveExpression
 %token <literal_> RegularExpressionLiteral
 
 %type <expression_> AdditiveExpression

-%type <expression_> AdditiveExpressionNoBF
-%type <argument_> ArgumentList

 %type <argument_> ArgumentList_
 %type <argument_> ArgumentList_

+%type <argument_> ArgumentList

 %type <argument_> ArgumentListOpt
 %type <argument_> Arguments
 %type <argument_> ArgumentListOpt
 %type <argument_> Arguments

+%type <expression_> ArrayComprehension
+%type <expression_> ArrayInitialiser

 %type <literal_> ArrayLiteral
 %type <literal_> ArrayLiteral

-%type <expression_> AssigneeExpression
-%type <expression_> AssigneeExpressionNoBF
+%type <expression_> ArrowFunction
+%type <functionParameter_> ArrowParameters

 %type <expression_> AssignmentExpression
 %type <expression_> AssignmentExpression

-%type <assignment_> AssignmentExpression_
-%type <expression_> AssignmentExpressionNoBF
-%type <expression_> AssignmentExpressionNoIn
+%type <identifier_> Binding
+%type <identifier_> BindingIdentifier

 %type <expression_> BitwiseANDExpression
 %type <expression_> BitwiseANDExpression

-%type <expression_> BitwiseANDExpressionNoBF
-%type <expression_> BitwiseANDExpressionNoIn
-%type <statement_> Block

 %type <statement_> Block_
 %type <statement_> Block_

+%type <statement_> Block

 %type <boolean_> BooleanLiteral
 %type <boolean_> BooleanLiteral

+%type <declaration_> BindingElement

 %type <expression_> BitwiseORExpression
 %type <expression_> BitwiseORExpression

-%type <expression_> BitwiseORExpressionNoBF
-%type <expression_> BitwiseORExpressionNoIn

 %type <expression_> BitwiseXORExpression
 %type <expression_> BitwiseXORExpression

-%type <expression_> BitwiseXORExpressionNoBF
-%type <expression_> BitwiseXORExpressionNoIn

 %type <statement_> BreakStatement
 %type <statement_> BreakStatement

+%type <statement_> BreakableStatement
+%type <expression_> CallExpression_

 %type <expression_> CallExpression
 %type <expression_> CallExpression

-%type <expression_> CallExpressionNoBF

 %type <clause_> CaseBlock
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
 %type <clause_> CaseBlock
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt

-%type <comprehension_> ComprehensionList
-%type <comprehension_> ComprehensionListOpt
+%type <expression_> Comprehension
+%type <comprehension_> ComprehensionFor
+%type <comprehension_> ComprehensionIf
+%type <comprehension_> ComprehensionTail

 %type <expression_> ConditionalExpression
 %type <expression_> ConditionalExpression

-%type <expression_> ConditionalExpressionNoBF
-%type <expression_> ConditionalExpressionNoIn

 %type <statement_> ContinueStatement
 %type <statement_> ContinueStatement

+%type <statement_> ConciseBody
+%type <statement_> DebuggerStatement
+%type <statement_> Declaration__
+%type <statement_> Declaration_
+%type <statement_> Declaration

 %type <clause_> DefaultClause
 %type <clause_> DefaultClause

-%type <statement_> DoWhileStatement

 %type <expression_> Element
 %type <expression_> ElementOpt
 %type <element_> ElementList
 %type <expression_> Element
 %type <expression_> ElementOpt
 %type <element_> ElementList


@@ -371,121 +390,109 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> ElseStatementOpt
 %type <statement_> EmptyStatement
 %type <expression_> EqualityExpression
 %type <statement_> ElseStatementOpt
 %type <statement_> EmptyStatement
 %type <expression_> EqualityExpression

-%type <expression_> EqualityExpressionNoBF
-%type <expression_> EqualityExpressionNoIn

 %type <expression_> Expression
 %type <expression_> ExpressionOpt
 %type <expression_> Expression
 %type <expression_> ExpressionOpt

-%type <compound_> Expression_
-%type <expression_> ExpressionNoBF
-%type <expression_> ExpressionNoIn
-%type <compound_> ExpressionNoIn_
-%type <expression_> ExpressionNoInOpt

 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt
 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt

-%type <comprehension_> ForComprehension
-%type <statement_> ForStatement

 %type <for_> ForStatementInitialiser
 %type <for_> ForStatementInitialiser

-%type <statement_> ForInStatement

 %type <forin_> ForInStatementInitialiser
 %type <forin_> ForInStatementInitialiser

-%type <functionParameter_> FormalParameterList
+%type <declaration_> FormalParameter

 %type <functionParameter_> FormalParameterList_
 %type <functionParameter_> FormalParameterList_

+%type <functionParameter_> FormalParameterList
+%type <functionParameter_> FormalParameterListOpt

 %type <statement_> FunctionBody
 %type <statement_> FunctionDeclaration
 %type <expression_> FunctionExpression
 %type <identifier_> Identifier
 %type <identifier_> IdentifierOpt
 %type <statement_> FunctionBody
 %type <statement_> FunctionDeclaration
 %type <expression_> FunctionExpression
 %type <identifier_> Identifier
 %type <identifier_> IdentifierOpt

-%type <comprehension_> IfComprehension
+%type <identifier_> IdentifierType
+%type <word_> IdentifierName

 %type <statement_> IfStatement
 %type <expression_> Initialiser
 %type <expression_> InitialiserOpt
 %type <statement_> IfStatement
 %type <expression_> Initialiser
 %type <expression_> InitialiserOpt

-%type <expression_> InitialiserNoIn
-%type <expression_> InitialiserNoInOpt

 %type <statement_> IterationStatement
 %type <statement_> LabelledStatement
 %type <expression_> LeftHandSideExpression
 %type <statement_> IterationStatement
 %type <statement_> LabelledStatement
 %type <expression_> LeftHandSideExpression

-%type <expression_> LeftHandSideExpressionNoBF
-//%type <statement_> LetStatement
+%type <statement_> LetStatement
+%type <statement_> LexicalDeclaration

 %type <literal_> Literal
 %type <literal_> Literal

-%type <literal_> LiteralNoRE
-%type <literal_> LiteralRE
+%type <literal_> ValueLiteral

 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalANDExpression

-%type <expression_> LogicalANDExpressionNoBF
-%type <expression_> LogicalANDExpressionNoIn

 %type <expression_> LogicalORExpression
 %type <expression_> LogicalORExpression

-%type <expression_> LogicalORExpressionNoBF
-%type <expression_> LogicalORExpressionNoIn

 %type <member_> MemberAccess
 %type <member_> MemberAccess

-%type <expression_> MemberExpression

 %type <expression_> MemberExpression_
 %type <expression_> MemberExpression_

-%type <expression_> MemberExpressionNoBF
+%type <expression_> MemberExpression
+%type <module_> Module

 %type <expression_> MultiplicativeExpression
 %type <expression_> MultiplicativeExpression

-%type <expression_> MultiplicativeExpressionNoBF

 %type <expression_> NewExpression
 %type <expression_> NewExpression

-%type <expression_> NewExpression_
-%type <expression_> NewExpressionNoBF

 %type <null_> NullLiteral
 %type <literal_> ObjectLiteral
 %type <null_> NullLiteral
 %type <literal_> ObjectLiteral

+%type <parenthetical_> Parenthetical

 %type <expression_> PostfixExpression
 %type <expression_> PostfixExpression

-%type <expression_> PostfixExpressionNoBF

 %type <expression_> PrimaryExpression
 %type <expression_> PrimaryExpression

-%type <expression_> PrimaryExpressionNo
-%type <expression_> PrimaryExpressionNoBF
-%type <expression_> PrimaryExpressionNoRE
-%type <expression_> PrimaryExpressionBF

 %type <statement_> Program
 %type <statement_> Program

-%type <propertyName_> PropertyName
+%type <statement_> ProgramBody
+%type <statement_> ProgramBodyOpt

 %type <propertyName_> PropertyName_
 %type <propertyName_> PropertyName_

-%type <property_> PropertyNameAndValueList
-%type <property_> PropertyNameAndValueList_
-%type <property_> PropertyNameAndValueListOpt
+%type <propertyName_> PropertyName
+%type <property_> PropertyDefinition
+%type <property_> PropertyDefinitionList_
+%type <property_> PropertyDefinitionList
+%type <property_> PropertyDefinitionListOpt

 %type <expression_> RelationalExpression
 %type <expression_> RelationalExpression

-%type <infix_> RelationalExpression_
-%type <expression_> RelationalExpressionNoBF
-%type <expression_> RelationalExpressionNoIn
-%type <infix_> RelationalExpressionNoIn_

 %type <statement_> ReturnStatement
 %type <statement_> ReturnStatement

+%type <rubyProc_> RubyProcExpression
+%type <functionParameter_> RubyProcParameterList_
+%type <functionParameter_> RubyProcParameterList
+%type <functionParameter_> RubyProcParameters
+%type <functionParameter_> RubyProcParametersOpt

 %type <expression_> ShiftExpression
 %type <expression_> ShiftExpression

-%type <expression_> ShiftExpressionNoBF
-%type <statement_> SourceElement
-%type <statement_> SourceElement_
-%type <statement_> SourceElements
-%type <statement_> Statement
+%type <declaration_> SingleNameBinding
+%type <statement_> Statement__

 %type <statement_> Statement_
 %type <statement_> Statement_

+%type <statement_> Statement

 %type <statement_> StatementList
 %type <statement_> StatementListOpt
 %type <statement_> StatementList
 %type <statement_> StatementListOpt

+%type <statement_> StatementListItem

 %type <statement_> SwitchStatement
 %type <statement_> ThrowStatement
 %type <statement_> TryStatement
 %type <statement_> SwitchStatement
 %type <statement_> ThrowStatement
 %type <statement_> TryStatement

-%type <expression_> UnaryExpression

 %type <expression_> UnaryExpression_
 %type <expression_> UnaryExpression_

-%type <expression_> UnaryExpressionNoBF
+%type <expression_> UnaryExpression

 %type <declaration_> VariableDeclaration
 %type <declaration_> VariableDeclaration

-%type <declaration_> VariableDeclarationNoIn
-%type <declarations_> VariableDeclarationList

 %type <declarations_> VariableDeclarationList_
 %type <declarations_> VariableDeclarationList_

-%type <declarations_> VariableDeclarationListNoIn
-%type <declarations_> VariableDeclarationListNoIn_
+%type <declarations_> VariableDeclarationList

 %type <statement_> VariableStatement
 %type <statement_> VariableStatement

-%type <statement_> WhileStatement

 %type <statement_> WithStatement
 %type <statement_> WithStatement

+%type <word_> Word
+@begin ObjectiveC
+%type <word_> WordOpt
+@end
+%type <expression_> Variable

 
 @begin C
 
 @begin C

-%type <expression_> AssigneeExpressionNoRE
-%type <expression_> CallExpressionNoRE
-%type <expression_> LeftHandSideExpressionNoRE
-%type <expression_> MemberExpressionNoRE
-%type <expression_> NewExpressionNoRE
-%type <expression_> PostfixExpressionNoRE
-%type <expression_> UnaryAssigneeExpression
-%type <expression_> UnaryExpressionNoRE
+%type <specifier_> IntegerType
+%type <specifier_> IntegerTypeOpt
+%type <typedIdentifier_> PrefixedType
+%type <specifier_> PrimitiveType
+%type <typedIdentifier_> SuffixedType
+%type <typedIdentifier_> TypeSignifier
+%type <modifier_> TypeQualifierLeft
+%type <typedIdentifier_> TypeQualifierRight
+%type <typedIdentifier_> TypedIdentifier
+%type <typedParameter_> TypedParameterList_
+%type <typedParameter_> TypedParameterList
+%type <typedParameter_> TypedParameterListOpt

 @end
 
 @begin ObjectiveC
 @end
 
 @begin ObjectiveC

+%type <expression_> BoxableExpression

 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression

+%type <classField_> ClassFieldListOpt
+%type <classField_> ClassFields

 %type <statement_> ClassStatement
 %type <expression_> ClassSuperOpt
 %type <statement_> ClassStatement
 %type <expression_> ClassSuperOpt

-%type <field_> ClassFieldList

 %type <message_> ClassMessageDeclaration
 %type <message_> ClassMessageDeclarationListOpt
 %type <className_> ClassName
 %type <message_> ClassMessageDeclaration
 %type <message_> ClassMessageDeclarationListOpt
 %type <className_> ClassName


@@ -499,25 +506,23 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope

-%type <argument_> SelectorCall

 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall_

-%type <selector_> SelectorExpression
+%type <argument_> SelectorCall

 %type <selector_> SelectorExpression_
 %type <selector_> SelectorExpression_

+%type <selector_> SelectorExpression

 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt
 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt

-%type <expression_> TypeOpt
+%type <typedIdentifier_> TypeOpt

 %type <argument_> VariadicCall
 %type <argument_> VariadicCall

-%type <word_> Word
-%type <word_> WordOpt

 @end
 
 @begin E4X
 %type <propertyIdentifier_> PropertyIdentifier_
 @end
 
 @begin E4X
 %type <propertyIdentifier_> PropertyIdentifier_

-%type <selector_> PropertySelector

 %type <selector_> PropertySelector_
 %type <selector_> PropertySelector_

-%type <identifier_> QualifiedIdentifier
+%type <selector_> PropertySelector

 %type <identifier_> QualifiedIdentifier_
 %type <identifier_> QualifiedIdentifier_

+%type <identifier_> QualifiedIdentifier

 %type <identifier_> WildcardIdentifier
 %type <identifier_> XMLComment
 %type <identifier_> XMLCDATA
 %type <identifier_> WildcardIdentifier
 %type <identifier_> XMLComment
 %type <identifier_> XMLCDATA


@@ -532,209 +537,255 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end

-
-%nonassoc Identifier_ "abstract" "boolean" "break" "byte" "case" "catch" "char" "class" "const" "continue" "debugger" "default" "delete" "do" "double" "each" "enum" "export" "extends" "false" "final" "finally" "float" /*"for"*/ "function" "goto" "implements" "import" /*"in"*/ /*"instanceof"*/ "int" "interface" "let" "long" "namespace" "native" "new" "null" "package" "private" "protected" "public" "return" "short" "super" "static" "switch" "synchronized" "this" "throw" "throws" "transient" "true" "try" "typeof" "var" "void" "volatile" "while" "with" "xml" "yield"
+/* }}} */
+/* Token Priorities {{{ */
+%nonassoc ""
+%left "++" "--"

 
 %nonassoc "if"
 %nonassoc "else"
 
 %nonassoc "if"
 %nonassoc "else"

-
-%nonassoc "++" "--"
-%nonassoc "(" "["
-
-%left "*" "/" "%"
-%left "+" "-"
-%left "<<" ">>" ">>>"
-%left "<" ">" "<=" ">=" "instanceof" "in"
-%left "==" "!=" "===" "!=="
-%left "&"
-%left "^"
-%left "|"
-%left "&&"
-%left "||"
-
-%right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="
+/* }}} */

 
 %start Program
 
 %%
 
 /* Lexer State {{{ */
 
 %start Program
 
 %%
 
 /* Lexer State {{{ */

+LexPushInOn
+    : { driver.in_.push(true); }
+    ;
+
+LexPushInOff
+    : { driver.in_.push(false); }
+    ;
+
+LexPopIn
+    : { driver.in_.pop(); }
+    ;
+

 LexSetRegExp
     : { driver.SetCondition(CYDriver::RegExpCondition); }
     ;
 LexSetRegExp
     : { driver.SetCondition(CYDriver::RegExpCondition); }
     ;

-/* }}} */

 
 

-StrictSemi
-    : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
+LexNoBrace
+    : { if (yyla.empty()) driver.no_.OpenBrace = true; else if (yyla.type == yytranslate_(token::OpenBrace) || yyla.type == yytranslate_(token::OpenBrace_)) yyla.type = yytranslate_(token::OpenBrace__); }

     ;
 
     ;
 

-Terminator_
-    : ";"
-    | "\n" StrictSemi
+LexNoFunction
+    : { if (yyla.empty()) driver.no_.Function = true; else if (yyla.type == yytranslate_(token::Function)) yyla.type = yytranslate_(token::Function_); }

     ;
 
     ;
 

-TerminatorOpt
-    : Terminator_
-    | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
+LexNoAtImplementation :
+@begin ObjectiveC
+    { if (yyla.empty()) driver.no_.AtImplementation = true; else if (yyla.type == yytranslate_(token::AtImplementation)) yyla.type = yytranslate_(token::AtImplementation_); }
+@end

     ;
 
     ;
 

-Terminator
-    : Terminator_
-    | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+LexSetStatement
+    : LexNoBrace LexNoFunction LexNoAtImplementation
+    ;
+/* }}} */
+/* Virtual Tokens {{{ */
+BRACE
+    : "{"
+    | "\n{"

     ;
 
     ;
 

-/*CommaOpt
-    : ","
-    |
-    ;*/
+Var_
+    : "var"
+    ;
+/* }}} */
+
+/* 7.6 Identifier Names and Identifiers {{{ */
+IdentifierName
+    : Word { $$ = $1; }
+    ;

 
 

-@begin ObjectiveC

 NewLineOpt
     : "\n"
     |
     ;
 
 NewLineOpt
     : "\n"
     |
     ;
 

+Word
+    : Identifier { $$ = $1; }
+
+    | "auto" { $$ = CYNew CYWord("auto"); }
+    | "break" NewLineOpt { $$ = CYNew CYWord("break"); }
+    | "case" { $$ = CYNew CYWord("case"); }
+    | "catch" { $$ = CYNew CYWord("catch"); }
+    | "class" { $$ = CYNew CYWord("class"); }
+    | "const" { $$ = CYNew CYWord("const"); }
+    | "continue" NewLineOpt { $$ = CYNew CYWord("continue"); }
+    | "debugger" { $$ = CYNew CYWord("debugger"); }
+    | "default" { $$ = CYNew CYWord("default"); }
+    | "delete" LexSetRegExp { $$ = CYNew CYWord("delete"); }
+    | "do" { $$ = CYNew CYWord("do"); }
+    | "else" { $$ = CYNew CYWord("else"); }
+    | "enum" { $$ = CYNew CYWord("enum"); }
+    | "export" { $$ = CYNew CYWord("export"); }
+    | "extends" { $$ = CYNew CYWord("extends"); }
+    | "false" { $$ = CYNew CYWord("false"); }
+    | "finally" { $$ = CYNew CYWord("finally"); }
+    /* XXX: | "for" { $$ = CYNew CYWord("for"); } */
+    | "function" { $$ = CYNew CYWord("function"); }
+    | "if" { $$ = CYNew CYWord("if"); }
+    | "import" { $$ = CYNew CYWord("import"); }
+    /* XXX: | "in" { $$ = CYNew CYWord("in"); } */
+    | "!in" { $$ = CYNew CYWord("in"); }
+    /* XXX: | "instanceof" { $$ = CYNew CYWord("instanceof"); } */
+
+    // XXX: as it currently is not an Identifier
+    | "let" { $$ = $1; }
+
+    | "new" LexSetRegExp { $$ = CYNew CYWord("new"); }
+    | "null" { $$ = CYNew CYWord("null"); }
+    | "return" NewLineOpt { $$ = CYNew CYWord("return"); }
+    | "super" { $$ = CYNew CYWord("super"); }
+    | "switch" { $$ = CYNew CYWord("switch"); }
+    | "this" { $$ = CYNew CYWord("this"); }
+    | "throw" NewLineOpt { $$ = CYNew CYWord("throw"); }
+    | "true" { $$ = CYNew CYWord("true"); }
+    | "try" { $$ = CYNew CYWord("try"); }
+    | "typeof" LexSetRegExp { $$ = CYNew CYWord("typeof"); }
+    | "var" { $$ = CYNew CYWord("var"); }
+    | "void" LexSetRegExp { $$ = CYNew CYWord("void"); }
+    | "while" { $$ = CYNew CYWord("while"); }
+    | "with" { $$ = CYNew CYWord("with"); }
+    ;
+
+@begin ObjectiveC

 WordOpt
     : Word { $$ = $1; }
     | { $$ = NULL; }
     ;
 WordOpt
     : Word { $$ = $1; }
     | { $$ = NULL; }
     ;

-
-Word
-    : Identifier { $$ = $1; }
-    | "break" NewLineOpt { $$ = $1; }
-    | "case" { $$ = $1; }
-    | "catch" { $$ = $1; }
-    | "class" { $$ = $1; }
-    | "const" { $$ = $1; }
-    | "continue" NewLineOpt { $$ = $1; }
-    | "debugger" { $$ = $1; }
-    | "default" { $$ = $1; }
-    | "delete" { $$ = $1; }
-    | "do" { $$ = $1; }
-    | "else" { $$ = $1; }
-    | "enum" { $$ = $1; }
-    | "export" { $$ = $1; }
-    | "extends" { $$ = $1; }
-    | "false" { $$ = $1; }
-    | "finally" { $$ = $1; }
-    /* XXX: | "for" { $$ = $1; } */
-    | "function" { $$ = $1; }
-    | "if" { $$ = $1; }
-    | "import" { $$ = $1; }
-    /* XXX: | "in" { $$ = $1; } */
-    /* XXX: | "instanceof" { $$ = $1; } */
-    | "new" { $$ = $1; }
-    | "null" { $$ = $1; }
-    | "return" NewLineOpt { $$ = $1; }
-    | "super" { $$ = $1; }
-    | "switch" { $$ = $1; }
-    | "this" { $$ = $1; }
-    | "throw" NewLineOpt { $$ = $1; }
-    | "true" { $$ = $1; }
-    | "try" { $$ = $1; }
-    | "typeof" { $$ = $1; }
-    | "var" { $$ = $1; }
-    | "void" { $$ = $1; }
-    | "while" { $$ = $1; }
-    | "with" { $$ = $1; }
-    ;

 @end
 
 @end
 

-Identifier
+IdentifierType

     : Identifier_ { $$ = $1; }
 
     : Identifier_ { $$ = $1; }
 

-    | "implements" { $$ = $1; }
-    | "interface" { $$ = $1; }
-    | "package" { $$ = $1; }
-    | "private" { $$ = $1; }
-    | "protected" { $$ = $1; }
-    | "public" { $$ = $1; }
-    | "static" { $$ = $1; }
-

     | "abstract" { $$ = $1; }
     | "abstract" { $$ = $1; }

+    | "await" { $$ = $1; }

     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }
     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }

-    | "char" { $$ = $1; }

     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }
     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }

-    | "int" { $$ = $1; }
-    | "long" { $$ = $1; }
+    | "implements" { $$ = $1; }
+    | "interface" { $$ = $1; }

     | "native" { $$ = $1; }
     | "native" { $$ = $1; }

-    | "short" { $$ = $1; }
+    | "package" { $$ = $1; }
+    | "private" { $$ = $1; }
+    | "protected" { $$ = $1; }
+    | "public" { $$ = $1; }
+    | "static" { $$ = $1; }

     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }
     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }

-    | "volatile" { $$ = $1; }

 
 

-    | "let" { $$ = $1; }
-    | "yield" { $$ = $1; }
+    // XXX: currently I only have this as Word
+    // | "let" { $$ = $1; }
+
+    | "yield" NewLineOpt { $$ = $1; }

 
     | "each" { $$ = $1; }
 
     | "each" { $$ = $1; }

+    | "of" { $$ = $1; }
+    ;
+
+Identifier
+    : IdentifierType
+    | "char" { $$ = $1; }
+    | "int" { $$ = $1; }
+    | "long" { $$ = $1; }
+    | "short" { $$ = $1; }
+    | "volatile" { $$ = $1; }
+@begin C
+    | "extern" { $$ = $1; }
+    | "signed" { $$ = $1; }
+    | "typedef" { $$ = $1; }
+    | "unsigned" { $$ = $1; }
+@end
+@begin ObjectiveC
+    | "NO" { $$ = $1; }
+    | "YES" { $$ = $1; }
+@end

     ;
 
 IdentifierOpt
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
     ;
     ;
 
 IdentifierOpt
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
     ;

+/* }}} */

 
 

-LiteralNoRE
+/* 7.8 Literals {{{ */
+Literal

     : NullLiteral { $$ = $1; }
     : NullLiteral { $$ = $1; }

-    | BooleanLiteral { $$ = $1; }
+    | ValueLiteral { $$ = $1; }
+    ;
+
+ValueLiteral
+    : BooleanLiteral { $$ = $1; }

     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }

-    | "@" StringLiteral { $$ = $2; }
+    | RegularExpressionLiteral { $$ = $1; }

     ;
     ;

-
-LiteralRE
-    : RegularExpressionLiteral { $$ = $1; }
+/* }}} */
+/* 7.8.1 Null Literals {{{ */
+NullLiteral
+    : "null" { $$ = CYNew CYNull(); }

     ;
     ;

-
-Literal
-    : LiteralNoRE { $$ = $1; }
-    | LiteralRE { $$ = $1; }
+/* }}} */
+/* 7.8.2 Boolean Literals {{{ */
+BooleanLiteral
+    : "true" { $$ = CYNew CYTrue(); }
+    | "false" { $$ = CYNew CYFalse(); }

     ;
     ;

+/* }}} */

 
 

-NullLiteral
-    : "null" { $$ = $1; }
+/* 7.9 Automatic Semicolon Insertion {{{ */
+StrictSemi
+    : { driver.Warning(@$, "warning, automatic semi-colon insertion required"); }

     ;
 
     ;
 

-BooleanLiteral
-    : "true" { $$ = $1; }
-    | "false" { $$ = $1; }
+Terminator
+    : ";"
+    | error { if (yyla.type_get() != yyeof_ && yyla.type != yytranslate_(token::CloseBrace) && !yyla.value.newline_) { error(@1, "required semi-colon"); } else { yyerrok; driver.errors_.pop_back(); } } StrictSemi

     ;
 
     ;
 

-/* 11.1 Primary Expressions {{{ */
-PrimaryExpression
-    : LexSetRegExp PrimaryExpressionNoRE { $$ = $2; }
+TerminatorOpt
+    : ";"
+    | error { yyerrok; driver.errors_.pop_back(); } StrictSemi

     ;
     ;

+/* }}} */

 
 

-PrimaryExpressionNoBF
-    : PrimaryExpressionNo { $$ = $1; }
+/* 11.1 Primary Expressions {{{ */
+Parenthetical
+    : "(" LexPushInOff Expression ")" LexPopIn { $$ = CYNew CYParenthetical($3); }

     ;
 
     ;
 

-PrimaryExpressionNoRE
-    : PrimaryExpressionBF { $$ = $1; }
-    | PrimaryExpressionNo { $$ = $1; }
+Variable
+    : Identifier { $$ = CYNew CYVariable($1); }

     ;
 
     ;
 

-PrimaryExpressionNo
-    : "this" { $$ = $1; }
-    | Identifier { $$ = new(driver.pool_) CYVariable($1); }
-    | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
+PrimaryExpression
+    : "this" { $$ = CYNew CYThis(); }
+    | Variable { $$ = $1; }

     | Literal { $$ = $1; }
     | Literal { $$ = $1; }

-    | ArrayLiteral { $$ = $1; }
-    | "(" Expression ")" { $$ = $2; }
+    | ArrayInitialiser { $$ = $1; }
+    | ObjectLiteral { $$ = $1; }
+    | Parenthetical { $$ = $1; }
+    | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }

     ;
     ;

-
-PrimaryExpressionBF
-    : ObjectLiteral { $$ = $1; }
+/* }}} */
+/* 11.1.4 Array Initializer {{{ */
+ArrayInitialiser
+    : ArrayLiteral { $$ = $1; }
+    | ArrayComprehension { $$ = $1; }

     ;
 /* }}} */
     ;
 /* }}} */

-/* 11.1.4 Array Initialiser {{{ */
+/* 11.1.4.1 Array Literal {{{ */

 ArrayLiteral
 ArrayLiteral

-    : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); }
+    : "[" LexPushInOff ElementListOpt "]" LexPopIn { $$ = CYNew CYArray($3); }

     ;
 
 Element
     ;
 
 Element


@@ -746,37 +797,68 @@ ElementOpt
     | LexSetRegExp { $$ = NULL; }
     ;
 
     | LexSetRegExp { $$ = NULL; }
     ;
 

+ElementList
+    : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); }
+    | Element { $$ = CYNew CYElement($1, NULL); }
+    ;
+

 ElementListOpt
     : ElementList { $$ = $1; }
     | LexSetRegExp { $$ = NULL; }
     ;
 ElementListOpt
     : ElementList { $$ = $1; }
     | LexSetRegExp { $$ = NULL; }
     ;

+/* }}} */
+/* 11.1.4.2 Array Comprehension {{{ */
+ArrayComprehension
+    : "[" LexPushInOff Comprehension "]" LexPopIn { $$ = $3; }
+    ;

 
 

-ElementList
-    : ElementOpt "," ElementListOpt { $$ = new(driver.pool_) CYElement($1, $3); }
-    | Element { $$ = new(driver.pool_) CYElement($1, NULL); }
+Comprehension
+    : LexSetRegExp ComprehensionFor ComprehensionTail AssignmentExpression { $$ = CYNew CYArrayComprehension($4, $2->Modify($3)); }
+    ;
+
+ComprehensionTail
+    : { $$ = NULL; }
+    | ComprehensionFor ComprehensionTail { $$ = $1->Modify($2); }
+    | ComprehensionIf ComprehensionTail { $$ = $1->Modify($2); }
+    ;
+
+ComprehensionFor
+    : "for" "(" Binding "of" Expression ")" { $$ = CYNew CYForOfComprehension($3, $5); }
+    ;
+
+ComprehensionIf
+    : "if" "(" AssignmentExpression ")" { $$ = CYNew CYIfComprehension($3); }

     ;
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral
     ;
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral

-    : "{" PropertyNameAndValueListOpt "}" { $$ = new(driver.pool_) CYObject($2); }
+    : BRACE LexPushInOff PropertyDefinitionListOpt "}" LexPopIn { $$ = CYNew CYObject($3); }

     ;
 
     ;
 

-PropertyNameAndValueList_
-    : "," PropertyNameAndValueList { $$ = $2; }
+PropertyDefinitionList_
+    : "," PropertyDefinitionList { $$ = $2; }
+    | "," LexSetRegExp { $$ = NULL; }

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-PropertyNameAndValueListOpt
-    : PropertyNameAndValueList { $$ = $1; }
-    | { $$ = NULL; }
+PropertyDefinitionList
+    : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; }
+    ;
+
+PropertyDefinitionListOpt
+    : PropertyDefinitionList { $$ = $1; }
+    | LexSetRegExp { $$ = NULL; }

     ;
 
     ;
 

-PropertyNameAndValueList
-    : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
+PropertyDefinition
+    // XXX: this should be IdentifierName
+    : LexSetRegExp Identifier { $$ = CYNew CYProperty($2, CYNew CYVariable($2)); }
+    | PropertyName ":" AssignmentExpression { $$ = CYNew CYProperty($1, $3); }
+    //| MethodDefinition

     ;
 
 PropertyName_
     ;
 
 PropertyName_

-    : Identifier { $$ = $1; }
+    : IdentifierName { $$ = $1; }

     | StringLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     ;
     | StringLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     ;


@@ -787,497 +869,289 @@ PropertyName
 /* }}} */
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 /* }}} */
 
 /* 11.2 Left-Hand-Side Expressions {{{ */

-MemberExpression_
-    : "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); }
-    ;
-

 MemberAccess
 MemberAccess

-    : "[" Expression "]" { $$ = new(driver.pool_) CYDirectMember(NULL, $2); }
-    | "." Identifier { $$ = new(driver.pool_) CYDirectMember(NULL, new(driver.pool_) CYString($2)); }
+    : "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYDirectMember(NULL, $3); }
+    | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }

     | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
     ;
 
     | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
     ;
 

-MemberExpression
-    : PrimaryExpression { $$ = $1; }
-    | LexSetRegExp FunctionExpression { $$ = $2; }
-    | MemberExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
-    | LexSetRegExp MemberExpression_ { $$ = $2; }
-    ;
-
-MemberExpressionNoBF
-    : PrimaryExpressionNoBF { $$ = $1; }
-    | MemberExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
-    | MemberExpression_ { $$ = $1; }
-    ;
-
-@begin C
-MemberExpressionNoRE
-    : PrimaryExpressionNoRE { $$ = $1; }
-    | FunctionExpression { $$ = $1; }
-    | MemberExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
-    | MemberExpression_ { $$ = $1; }
+MemberExpression_
+    : MemberExpression { $$ = $1; }
+    //| "super" { $$ = $1; }

     ;
     ;

-@end

 
 

-NewExpression_
-    : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); }
+MemberExpression
+    : LexSetRegExp PrimaryExpression { $$ = $2; }
+    | LexSetRegExp FunctionExpression { $$ = $2; }
+    | MemberExpression_ { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
+    | LexSetRegExp "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($3, $4); }

     ;
 
 NewExpression
     : MemberExpression { $$ = $1; }
     ;
 
 NewExpression
     : MemberExpression { $$ = $1; }

-    | LexSetRegExp NewExpression_ { $$ = $2; }
+    | LexSetRegExp "new" NewExpression { $$ = CYNew cy::Syntax::New($3, NULL); }

     ;
 
     ;
 

-NewExpressionNoBF
-    : MemberExpressionNoBF { $$ = $1; }
-    | NewExpression_ { $$ = $1; }
+CallExpression_
+    : MemberExpression_
+    | CallExpression

     ;
 
     ;
 

-@begin C
-NewExpressionNoRE
-    : MemberExpressionNoRE { $$ = $1; }
-    | NewExpression_ { $$ = $1; }
-    ;
-@end
-

 CallExpression
 CallExpression

-    : MemberExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
-    | CallExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    : CallExpression_ Arguments { $$ = CYNew CYCall($1, $2); }

     | CallExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
     ;
 
     | CallExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
     ;
 

-CallExpressionNoBF
-    : MemberExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
-    | CallExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
-    | CallExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
-    ;
-
-@begin C
-CallExpressionNoRE
-    : MemberExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
-    | CallExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
-    | CallExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
+Arguments
+    : "(" LexPushInOff ArgumentListOpt ")" LexPopIn { $$ = $3; }

     ;
     ;

-@end

 
 ArgumentList_
     : "," ArgumentList { $$ = $2; }
     | { $$ = NULL; }
     ;
 
 
 ArgumentList_
     : "," ArgumentList { $$ = $2; }
     | { $$ = NULL; }
     ;
 

-ArgumentListOpt
-    : ArgumentList { $$ = $1; }
-    | LexSetRegExp { $$ = NULL; }
-    ;
-

 ArgumentList
 ArgumentList

-    : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); }
+    : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); }
+    | LexSetRegExp Word ":" AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument($2, $4, $5); }

     ;
 
     ;
 

-Arguments
-    : "(" ArgumentListOpt ")" { $$ = $2; }
+ArgumentListOpt
+    : ArgumentList { $$ = $1; }
+    | LexSetRegExp { $$ = NULL; }

     ;
 
 LeftHandSideExpression
     : NewExpression { $$ = $1; }
     | CallExpression { $$ = $1; }
     ;
     ;
 
 LeftHandSideExpression
     : NewExpression { $$ = $1; }
     | CallExpression { $$ = $1; }
     ;

-
-LeftHandSideExpressionNoBF
-    : NewExpressionNoBF { $$ = $1; }
-    | CallExpressionNoBF { $$ = $1; }
-    ;
-
-@begin C
-LeftHandSideExpressionNoRE
-    : NewExpressionNoRE { $$ = $1; }
-    | CallExpressionNoRE { $$ = $1; }
-    ;
-@end

 /* }}} */
 /* 11.3 Postfix Expressions {{{ */
 PostfixExpression
 /* }}} */
 /* 11.3 Postfix Expressions {{{ */
 PostfixExpression

-    : AssigneeExpression { $$ = $1; }
-    | LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
-    | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+    : %prec "" LeftHandSideExpression { $$ = $1; }
+    | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); }
+    | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); }

     ;
     ;

-
-PostfixExpressionNoBF
-    : AssigneeExpressionNoBF { $$ = $1; }
-    | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
-    | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
-    ;
-
-@begin C
-PostfixExpressionNoRE
-    : AssigneeExpressionNoRE { $$ = $1; }
-    | LeftHandSideExpressionNoRE "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
-    | LeftHandSideExpressionNoRE "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
-    ;
-@end

 /* }}} */
 /* 11.4 Unary Operators {{{ */
 UnaryExpression_
 /* }}} */
 /* 11.4 Unary Operators {{{ */
 UnaryExpression_

-    : "delete" UnaryExpression { $$ = new(driver.pool_) CYDelete($2); }
-    | "void" UnaryExpression { $$ = new(driver.pool_) CYVoid($2); }
-    | "typeof" UnaryExpression { $$ = new(driver.pool_) CYTypeOf($2); }
-    | "++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); }
-    | "\n++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); }
-    | "--" UnaryExpression { $$ = new(driver.pool_) CYPreDecrement($2); }
-    | "\n--" UnaryExpression { $$ = new(driver.pool_) CYPreDecrement($2); }
-    | "+" UnaryExpression { $$ = new(driver.pool_) CYAffirm($2); }
-    | "-" UnaryExpression { $$ = new(driver.pool_) CYNegate($2); }
-    | "~" UnaryExpression { $$ = new(driver.pool_) CYBitwiseNot($2); }
-    | "!" UnaryExpression { $$ = new(driver.pool_) CYLogicalNot($2); }
+    : "delete" UnaryExpression { $$ = CYNew CYDelete($2); }
+    | "void" UnaryExpression { $$ = CYNew CYVoid($2); }
+    | "typeof" UnaryExpression { $$ = CYNew CYTypeOf($2); }
+    | "++" UnaryExpression { $$ = CYNew CYPreIncrement($2); }
+    | "\n++" UnaryExpression { $$ = CYNew CYPreIncrement($2); }
+    | "--" UnaryExpression { $$ = CYNew CYPreDecrement($2); }
+    | "\n--" UnaryExpression { $$ = CYNew CYPreDecrement($2); }
+    | "+" UnaryExpression { $$ = CYNew CYAffirm($2); }
+    | "-" UnaryExpression { $$ = CYNew CYNegate($2); }
+    | "~" UnaryExpression { $$ = CYNew CYBitwiseNot($2); }
+    | "!" UnaryExpression { $$ = CYNew CYLogicalNot($2); }

     ;
 
 UnaryExpression
     : PostfixExpression { $$ = $1; }
     | LexSetRegExp UnaryExpression_ { $$ = $2; }
     ;
     ;
 
 UnaryExpression
     : PostfixExpression { $$ = $1; }
     | LexSetRegExp UnaryExpression_ { $$ = $2; }
     ;

-
-UnaryExpressionNoBF
-    : PostfixExpressionNoBF { $$ = $1; }
-    | UnaryExpression_ { $$ = $1; }
-    ;
-
-@begin C
-UnaryExpressionNoRE
-    : PostfixExpressionNoRE { $$ = $1; }
-    | UnaryExpression_ { $$ = $1; }
-    ;
-@end

 /* }}} */
 /* 11.5 Multiplicative Operators {{{ */
 MultiplicativeExpression
     : UnaryExpression { $$ = $1; }
 /* }}} */
 /* 11.5 Multiplicative Operators {{{ */
 MultiplicativeExpression
     : UnaryExpression { $$ = $1; }

-    | MultiplicativeExpression "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
-    | MultiplicativeExpression "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
-    | MultiplicativeExpression "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
-    ;
-
-MultiplicativeExpressionNoBF
-    : UnaryExpressionNoBF { $$ = $1; }
-    | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
-    | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
-    | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
+    | MultiplicativeExpression "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); }
+    | MultiplicativeExpression "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); }
+    | MultiplicativeExpression "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); }

     ;
 /* }}} */
 /* 11.6 Additive Operators {{{ */
 AdditiveExpression
     : MultiplicativeExpression { $$ = $1; }
     ;
 /* }}} */
 /* 11.6 Additive Operators {{{ */
 AdditiveExpression
     : MultiplicativeExpression { $$ = $1; }

-    | AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
-    | AdditiveExpression "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
-    ;
-
-AdditiveExpressionNoBF
-    : MultiplicativeExpressionNoBF { $$ = $1; }
-    | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
-    | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
+    | AdditiveExpression "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); }
+    | AdditiveExpression "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); }

     ;
 /* }}} */
 /* 11.7 Bitwise Shift Operators {{{ */
 ShiftExpression
     : AdditiveExpression { $$ = $1; }
     ;
 /* }}} */
 /* 11.7 Bitwise Shift Operators {{{ */
 ShiftExpression
     : AdditiveExpression { $$ = $1; }

-    | ShiftExpression "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
-    | ShiftExpression ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
-    | ShiftExpression ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
-    ;
-
-ShiftExpressionNoBF
-    : AdditiveExpressionNoBF { $$ = $1; }
-    | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
-    | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
-    | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
+    | ShiftExpression "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); }
+    | ShiftExpression ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); }
+    | ShiftExpression ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); }

     ;
 /* }}} */
 /* 11.8 Relational Operators {{{ */
     ;
 /* }}} */
 /* 11.8 Relational Operators {{{ */

-RelationalExpressionNoIn_
-    : "<" ShiftExpression { $$ = new(driver.pool_) CYLess(NULL, $2); }
-    | ">" ShiftExpression { $$ = new(driver.pool_) CYGreater(NULL, $2); }
-    | "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual(NULL, $2); }
-    | ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual(NULL, $2); }
-    | "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf(NULL, $2); }
-    ;
-
-RelationalExpression_
-    : RelationalExpressionNoIn_ { $$ = $1; }
-    | "in" ShiftExpression { $$ = new(driver.pool_) CYIn(NULL, $2); }
-    ;
-

 RelationalExpression
     : ShiftExpression { $$ = $1; }
 RelationalExpression
     : ShiftExpression { $$ = $1; }

-    | RelationalExpression RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
-    ;
-
-RelationalExpressionNoIn
-    : ShiftExpression { $$ = $1; }
-    | RelationalExpressionNoIn RelationalExpressionNoIn_ { $2->SetLeft($1); $$ = $2; }
-    ;
-
-RelationalExpressionNoBF
-    : ShiftExpressionNoBF { $$ = $1; }
-    | RelationalExpressionNoBF RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
+    | RelationalExpression "<" ShiftExpression { $$ = CYNew CYLess($1, $3); }
+    | RelationalExpression ">" ShiftExpression { $$ = CYNew CYGreater($1, $3); }
+    | RelationalExpression "<=" ShiftExpression { $$ = CYNew CYLessOrEqual($1, $3); }
+    | RelationalExpression ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual($1, $3); }
+    | RelationalExpression "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf($1, $3); }
+    | RelationalExpression "in" ShiftExpression { $$ = CYNew CYIn($1, $3); }

     ;
 /* }}} */
 /* 11.9 Equality Operators {{{ */
 EqualityExpression
     : RelationalExpression { $$ = $1; }
     ;
 /* }}} */
 /* 11.9 Equality Operators {{{ */
 EqualityExpression
     : RelationalExpression { $$ = $1; }

-    | EqualityExpression "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
-    | EqualityExpression "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); }
-    | EqualityExpression "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
-    | EqualityExpression "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
-    ;
-
-EqualityExpressionNoIn
-    : RelationalExpressionNoIn { $$ = $1; }
-    | EqualityExpressionNoIn "==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYEqual($1, $3); }
-    | EqualityExpressionNoIn "!=" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotEqual($1, $3); }
-    | EqualityExpressionNoIn "===" RelationalExpressionNoIn { $$ = new(driver.pool_) CYIdentical($1, $3); }
-    | EqualityExpressionNoIn "!==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
-    ;
-
-EqualityExpressionNoBF
-    : RelationalExpressionNoBF { $$ = $1; }
-    | EqualityExpressionNoBF "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
-    | EqualityExpressionNoBF "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); }
-    | EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
-    | EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
+    | EqualityExpression "==" RelationalExpression { $$ = CYNew CYEqual($1, $3); }
+    | EqualityExpression "!=" RelationalExpression { $$ = CYNew CYNotEqual($1, $3); }
+    | EqualityExpression "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); }
+    | EqualityExpression "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); }

     ;
 /* }}} */
 /* 11.10 Binary Bitwise Operators {{{ */
 BitwiseANDExpression
     : EqualityExpression { $$ = $1; }
     ;
 /* }}} */
 /* 11.10 Binary Bitwise Operators {{{ */
 BitwiseANDExpression
     : EqualityExpression { $$ = $1; }

-    | BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
-    ;
-
-BitwiseANDExpressionNoIn
-    : EqualityExpressionNoIn { $$ = $1; }
-    | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
-    ;
-
-BitwiseANDExpressionNoBF
-    : EqualityExpressionNoBF { $$ = $1; }
-    | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+    | BitwiseANDExpression "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); }

     ;
 
 BitwiseXORExpression
     : BitwiseANDExpression { $$ = $1; }
     ;
 
 BitwiseXORExpression
     : BitwiseANDExpression { $$ = $1; }

-    | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
-    ;
-
-BitwiseXORExpressionNoIn
-    : BitwiseANDExpressionNoIn { $$ = $1; }
-    | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
-    ;
-
-BitwiseXORExpressionNoBF
-    : BitwiseANDExpressionNoBF { $$ = $1; }
-    | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+    | BitwiseXORExpression "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); }

     ;
 
 BitwiseORExpression
     : BitwiseXORExpression { $$ = $1; }
     ;
 
 BitwiseORExpression
     : BitwiseXORExpression { $$ = $1; }

-    | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
-    ;
-
-BitwiseORExpressionNoIn
-    : BitwiseXORExpressionNoIn { $$ = $1; }
-    | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
-    ;
-
-BitwiseORExpressionNoBF
-    : BitwiseXORExpressionNoBF { $$ = $1; }
-    | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+    | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); }

     ;
 /* }}} */
 /* 11.11 Binary Logical Operators {{{ */
 LogicalANDExpression
     : BitwiseORExpression { $$ = $1; }
     ;
 /* }}} */
 /* 11.11 Binary Logical Operators {{{ */
 LogicalANDExpression
     : BitwiseORExpression { $$ = $1; }

-    | LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
-    ;
-
-LogicalANDExpressionNoIn
-    : BitwiseORExpressionNoIn { $$ = $1; }
-    | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
-    ;
-
-LogicalANDExpressionNoBF
-    : BitwiseORExpressionNoBF { $$ = $1; }
-    | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+    | LogicalANDExpression "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); }

     ;
 
 LogicalORExpression
     : LogicalANDExpression { $$ = $1; }
     ;
 
 LogicalORExpression
     : LogicalANDExpression { $$ = $1; }

-    | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
-    ;
-
-LogicalORExpressionNoIn
-    : LogicalANDExpressionNoIn { $$ = $1; }
-    | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
-    ;
-
-LogicalORExpressionNoBF
-    : LogicalANDExpressionNoBF { $$ = $1; }
-    | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+    | LogicalORExpression "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); }

     ;
 /* }}} */
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }
     ;
 /* }}} */
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }

-    | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
-    ;
-
-ConditionalExpressionNoIn
-    : LogicalORExpressionNoIn { $$ = $1; }
-    | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
-    ;
-
-ConditionalExpressionNoBF
-    : LogicalORExpressionNoBF { $$ = $1; }
-    | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+    | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); }
+    | LogicalORExpression "?" LexPushInOff LexSetRegExp ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $1, $7); }

     ;
 /* }}} */
 /* 11.13 Assignment Operators {{{ */
     ;
 /* }}} */
 /* 11.13 Assignment Operators {{{ */

-AssignmentExpression_
-    : "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign(NULL, $2); }
-    | "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign(NULL, $2); }
-    | "/=" AssignmentExpression { $$ = new(driver.pool_) CYDivideAssign(NULL, $2); }
-    | "%=" AssignmentExpression { $$ = new(driver.pool_) CYModulusAssign(NULL, $2); }
-    | "+=" AssignmentExpression { $$ = new(driver.pool_) CYAddAssign(NULL, $2); }
-    | "-=" AssignmentExpression { $$ = new(driver.pool_) CYSubtractAssign(NULL, $2); }
-    | "<<=" AssignmentExpression { $$ = new(driver.pool_) CYShiftLeftAssign(NULL, $2); }
-    | ">>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightSignedAssign(NULL, $2); }
-    | ">>>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightUnsignedAssign(NULL, $2); }
-    | "&=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseAndAssign(NULL, $2); }
-    | "^=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseXOrAssign(NULL, $2); }
-    | "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign(NULL, $2); }
-    ;
-
-AssigneeExpression
-    : LeftHandSideExpression { $$ = $1; }
-@begin C
-    | LexSetRegExp UnaryAssigneeExpression { $$ = $2; }
-@end
-    ;
-
-AssigneeExpressionNoBF
-    : LeftHandSideExpressionNoBF { $$ = $1; }
-@begin C
-    | UnaryAssigneeExpression { $$ = $1; }
-@end
-    ;
-
-@begin C
-AssigneeExpressionNoRE
-    : LeftHandSideExpressionNoRE { $$ = $1; }
-    | UnaryAssigneeExpression { $$ = $1; }
-    ;
-@end
-

 AssignmentExpression
     : ConditionalExpression { $$ = $1; }
 AssignmentExpression
     : ConditionalExpression { $$ = $1; }

-    | AssigneeExpression AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
-    ;
-
-AssignmentExpressionNoIn
-    : ConditionalExpressionNoIn { $$ = $1; }
-    | AssigneeExpression "=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAssign($1, $3); }
-    | AssigneeExpression "*=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); }
-    | AssigneeExpression "/=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYDivideAssign($1, $3); }
-    | AssigneeExpression "%=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYModulusAssign($1, $3); }
-    | AssigneeExpression "+=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAddAssign($1, $3); }
-    | AssigneeExpression "-=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYSubtractAssign($1, $3); }
-    | AssigneeExpression "<<=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); }
-    | AssigneeExpression ">>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); }
-    | AssigneeExpression ">>>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); }
-    | AssigneeExpression "&=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); }
-    | AssigneeExpression "^=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); }
-    | AssigneeExpression "|=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); }
-    ;
-
-AssignmentExpressionNoBF
-    : ConditionalExpressionNoBF { $$ = $1; }
-    | AssigneeExpressionNoBF AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
+    | ArrowFunction { $$ = $1; }
+    | LeftHandSideExpression "=" AssignmentExpression { $$ = CYNew CYAssign($1, $3); }
+    | LeftHandSideExpression "*=" AssignmentExpression { $$ = CYNew CYMultiplyAssign($1, $3); }
+    | LeftHandSideExpression "/=" AssignmentExpression { $$ = CYNew CYDivideAssign($1, $3); }
+    | LeftHandSideExpression "%=" AssignmentExpression { $$ = CYNew CYModulusAssign($1, $3); }
+    | LeftHandSideExpression "+=" AssignmentExpression { $$ = CYNew CYAddAssign($1, $3); }
+    | LeftHandSideExpression "-=" AssignmentExpression { $$ = CYNew CYSubtractAssign($1, $3); }
+    | LeftHandSideExpression "<<=" AssignmentExpression { $$ = CYNew CYShiftLeftAssign($1, $3); }
+    | LeftHandSideExpression ">>=" AssignmentExpression { $$ = CYNew CYShiftRightSignedAssign($1, $3); }
+    | LeftHandSideExpression ">>>=" AssignmentExpression { $$ = CYNew CYShiftRightUnsignedAssign($1, $3); }
+    | LeftHandSideExpression "&=" AssignmentExpression { $$ = CYNew CYBitwiseAndAssign($1, $3); }
+    | LeftHandSideExpression "^=" AssignmentExpression { $$ = CYNew CYBitwiseXOrAssign($1, $3); }
+    | LeftHandSideExpression "|=" AssignmentExpression { $$ = CYNew CYBitwiseOrAssign($1, $3); }

     ;
 /* }}} */
 /* 11.14 Comma Operator {{{ */
     ;
 /* }}} */
 /* 11.14 Comma Operator {{{ */

-Expression_
-    : "," Expression { $$ = new(driver.pool_) CYCompound($2); }
-    | { $$ = NULL; }
-    ;
-
-ExpressionNoIn_
-    : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); }
-    | { $$ = NULL; }
+Expression
+    : AssignmentExpression { $$ = $1; }
+    | AssignmentExpression "," Expression { $$ = CYNew CYCompound($1, $3); }

     ;
 
 ExpressionOpt
     : Expression { $$ = $1; }
     | LexSetRegExp { $$ = NULL; }
     ;
     ;
 
 ExpressionOpt
     : Expression { $$ = $1; }
     | LexSetRegExp { $$ = NULL; }
     ;

-
-ExpressionNoInOpt
-    : ExpressionNoIn { $$ = $1; }
-    | LexSetRegExp { $$ = NULL; }
-    ;
-
-Expression
-    : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
-    ;
-
-ExpressionNoIn
-    : AssignmentExpressionNoIn ExpressionNoIn_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
-    ;
-
-ExpressionNoBF
-    : AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
-    ;

 /* }}} */
 
 /* 12 Statements {{{ */
 /* }}} */
 
 /* 12 Statements {{{ */

-Statement_
+Statement__

     : Block { $$ = $1; }
     | VariableStatement { $$ = $1; }
     | EmptyStatement { $$ = $1; }
     : Block { $$ = $1; }
     | VariableStatement { $$ = $1; }
     | EmptyStatement { $$ = $1; }

-    | ExpressionStatement { $$ = $1; }

     | IfStatement { $$ = $1; }
     | IfStatement { $$ = $1; }

-    | IterationStatement { $$ = $1; }
+    | BreakableStatement { $$ = $1; }

     | ContinueStatement { $$ = $1; }
     | BreakStatement { $$ = $1; }
     | ReturnStatement { $$ = $1; }
     | WithStatement { $$ = $1; }
     | LabelledStatement { $$ = $1; }
     | ContinueStatement { $$ = $1; }
     | BreakStatement { $$ = $1; }
     | ReturnStatement { $$ = $1; }
     | WithStatement { $$ = $1; }
     | LabelledStatement { $$ = $1; }

-    | SwitchStatement { $$ = $1; }

     | ThrowStatement { $$ = $1; }
     | TryStatement { $$ = $1; }
     | ThrowStatement { $$ = $1; }
     | TryStatement { $$ = $1; }

+    | DebuggerStatement { $$ = $1; }
+    ;
+
+Statement_
+    : LexSetRegExp Statement__ { $$ = $2; }
+    | ExpressionStatement { $$ = $1; }

     ;
 
 Statement
     ;
 
 Statement

-    : LexSetRegExp Statement_ { $$ = $2; }
+    : LexSetStatement Statement_ { $$ = $2; }
+    ;
+
+Declaration__
+    : FunctionDeclaration { $$ = $1; }
+    | LexicalDeclaration { $$ = $1; }
+    ;
+
+Declaration_
+    : LexSetRegExp Declaration__ { $$ = $2; }
+    ;
+
+Declaration
+    : LexSetStatement Declaration_ { $$ = $2; }
+    ;
+
+BreakableStatement
+    : IterationStatement { $$ = $1; }
+    | SwitchStatement { $$ = $1; }

     ;
 /* }}} */
 /* 12.1 Block {{{ */
 Block_
     ;
 /* }}} */
 /* 12.1 Block {{{ */
 Block_

-    : "{" StatementListOpt "}" { $$ = $2; }
+    : BRACE StatementListOpt "}" { $$ = $2; }

     ;
 
 Block
     ;
 
 Block

-    : Block_ { if ($1) $$ = new(driver.pool_) CYBlock($1); else $$ = new(driver.pool_) CYEmpty(); }
+    : ";{" StatementListOpt "}" { $$ = CYNew CYBlock($2); }

     ;
 
 StatementList
     ;
 
 StatementList

-    : Statement StatementListOpt { $1->SetNext($2); $$ = $1; }
+    : StatementListItem StatementListOpt { $1->SetNext($2); $$ = $1; }

     ;
 
 StatementListOpt
     : StatementList { $$ = $1; }
     ;
 
 StatementListOpt
     : StatementList { $$ = $1; }

-    | LexSetRegExp { $$ = NULL; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }
+    ;
+
+StatementListItem
+    : Statement { $$ = $1; }
+    | Declaration { $$ = $1; }
+    ;
+/* }}} */
+
+/* 12.2 Declarations {{{ */
+BindingIdentifier
+    : Identifier { $$ = $1; }
+    ;
+
+Binding
+    : BindingIdentifier
+    ;
+
+// XXX: BindingPattern
+/* }}} */
+/* 12.2.1 Let and Const Declarations {{{ */
+LexicalDeclaration
+    : LetOrConst VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
+    ;
+
+LetOrConst
+    : "let"
+    | "const"

     ;
 /* }}} */
     ;
 /* }}} */

-/* 12.2 Variable Statement {{{ */
+/* 12.2.2 Variable Statement {{{ */

 VariableStatement
 VariableStatement

-    : "var" VariableDeclarationList Terminator { $$ = new(driver.pool_) CYVar($2); }
+    : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }

     ;
 
 VariableDeclarationList_
     ;
 
 VariableDeclarationList_


@@ -1285,53 +1159,44 @@ VariableDeclarationList_
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-VariableDeclarationListNoIn_
-    : "," VariableDeclarationListNoIn { $$ = $2; }
-    | { $$ = NULL; }
-    ;
-

 VariableDeclarationList
 VariableDeclarationList

-    : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
-    ;
-
-VariableDeclarationListNoIn
-    : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
+    : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); }

     ;
 
 VariableDeclaration
     ;
 
 VariableDeclaration

-    : Identifier InitialiserOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
+    : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
+    // XXX: | BindingPattern Initialiser { $$ = CYNew CYDeclaration($1, $2); }

     ;
 
     ;
 

-VariableDeclarationNoIn
-    : Identifier InitialiserNoInOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
+Initialiser
+    : "=" AssignmentExpression { $$ = $2; }

     ;
 
 InitialiserOpt
     : Initialiser { $$ = $1; }
     | { $$ = NULL; }
     ;
     ;
 
 InitialiserOpt
     : Initialiser { $$ = $1; }
     | { $$ = NULL; }
     ;

+/* }}} */
+/* 12.2.4 Destructuring Binding Patterns {{{ */
+// XXX: *

 
 

-InitialiserNoInOpt
-    : InitialiserNoIn { $$ = $1; }
-    | { $$ = NULL; }
-    ;
-
-Initialiser
-    : "=" AssignmentExpression { $$ = $2; }
+BindingElement
+    : SingleNameBinding { $$ = $1; }

     ;
 
     ;
 

-InitialiserNoIn
-    : "=" AssignmentExpressionNoIn { $$ = $2; }
+SingleNameBinding
+    : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }

     ;
 /* }}} */
     ;
 /* }}} */

+

 /* 12.3 Empty Statement {{{ */
 EmptyStatement
 /* 12.3 Empty Statement {{{ */
 EmptyStatement

-    : ";" { $$ = new(driver.pool_) CYEmpty(); }
+    : ";" { $$ = CYNew CYEmpty(); }

     ;
 /* }}} */
 /* 12.4 Expression Statement {{{ */
 ExpressionStatement
     ;
 /* }}} */
 /* 12.4 Expression Statement {{{ */
 ExpressionStatement

-    : ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); }
+    : Expression Terminator { $$ = CYNew CYExpress($1); }

     ;
 /* }}} */
 /* 12.5 The if Statement {{{ */
     ;
 /* }}} */
 /* 12.5 The if Statement {{{ */


@@ -1341,77 +1206,77 @@ ElseStatementOpt
     ;
 
 IfStatement
     ;
 
 IfStatement

-    : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); }
+    : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = CYNew CYIf($3, $5, $6); }

     ;
 /* }}} */
 
     ;
 /* }}} */
 

-/* 12.6 Iteration Statements {{{ */
-IterationStatement
-    : DoWhileStatement { $$ = $1; }
-    | WhileStatement { $$ = $1; }
-    | ForStatement { $$ = $1; }
-    | ForInStatement { $$ = $1; }
-    ;
-/* }}} */

 /* 12.6.1 The do-while Statement {{{ */
 /* 12.6.1 The do-while Statement {{{ */

-DoWhileStatement
-    : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); }
+IterationStatement
+    : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); }

     ;
 /* }}} */
 /* 12.6.2 The while Statement {{{ */
     ;
 /* }}} */
 /* 12.6.2 The while Statement {{{ */

-WhileStatement
-    : "while" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWhile($3, $5); }
+IterationStatement
+    : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); }

     ;
 /* }}} */
 /* 12.6.3 The for Statement {{{ */
     ;
 /* }}} */
 /* 12.6.3 The for Statement {{{ */

-ForStatement
-    : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new(driver.pool_) CYFor($3, $5, $7, $9); }
+IterationStatement
+    : "for" "(" LexPushInOn ForStatementInitialiser ";" LexPopIn ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }

     ;
 
 ForStatementInitialiser
     ;
 
 ForStatementInitialiser

-    : ExpressionNoInOpt { $$ = $1; }
-    | LexSetRegExp "var" VariableDeclarationListNoIn { $$ = $3; }
+    : ExpressionOpt { $$ = $1; }
+    | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }

     ;
 /* }}} */
     ;
 /* }}} */

-/* 12.6.4 The for-in Statement {{{ */
-ForInStatement
-    : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); }
+/* 12.6.4 The for-in and for-of Statements {{{ */
+IterationStatement
+    : "for" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); }
+    | "for" "(" LexPushInOn ForInStatementInitialiser "of" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); }

     ;
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }
     ;
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }

-    | LexSetRegExp "var" VariableDeclarationNoIn { $$ = $3; }
+    | LexSetRegExp Var_ VariableDeclaration { $$ = $3; }

     ;
 /* }}} */
 
 /* 12.7 The continue Statement {{{ */
 ContinueStatement
     ;
 /* }}} */
 
 /* 12.7 The continue Statement {{{ */
 ContinueStatement

-    : "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); }
+    : "continue" "\n" StrictSemi { $$ = CYNew CYContinue(NULL); }
+    | "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); }

     ;
 /* }}} */
 /* 12.8 The break Statement {{{ */
 BreakStatement
     ;
 /* }}} */
 /* 12.8 The break Statement {{{ */
 BreakStatement

-    : "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); }
+    : "break" "\n" StrictSemi { $$ = CYNew CYBreak(NULL); }
+    | "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); }

     ;
 /* }}} */
 /* 12.9 The return Statement {{{ */
 ReturnStatement
     ;
 /* }}} */
 /* 12.9 The return Statement {{{ */
 ReturnStatement

-    : "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); }
+    : "return" LexSetRegExp "\n" StrictSemi { $$ = CYNew CYReturn(NULL); }
+    | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); }

     ;
 /* }}} */
 /* 12.10 The with Statement {{{ */
 WithStatement
     ;
 /* }}} */
 /* 12.10 The with Statement {{{ */
 WithStatement

-    : "with" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWith($3, $5); }
+    : "with" "(" Expression ")" Statement { $$ = CYNew CYWith($3, $5); }

     ;
 /* }}} */
 
 /* 12.11 The switch Statement {{{ */
 SwitchStatement
     ;
 /* }}} */
 
 /* 12.11 The switch Statement {{{ */
 SwitchStatement

-    : "switch" "(" Expression ")" CaseBlock { $$ = new(driver.pool_) CYSwitch($3, $5); }
+    : "switch" "(" Expression ")" CaseBlock { $$ = CYNew CYSwitch($3, $5); }

     ;
 
 CaseBlock
     ;
 
 CaseBlock

-    : "{" CaseClausesOpt "}" { $$ = $2; }
+    : BRACE CaseClausesOpt "}" { $$ = $2; }
+    ;
+
+CaseClause
+    : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); }

     ;
 
 CaseClausesOpt
     ;
 
 CaseClausesOpt


@@ -1420,47 +1285,49 @@ CaseClausesOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-CaseClause
-    : "case" Expression ":" StatementListOpt { $$ = new(driver.pool_) CYClause($2, $4); }
-    ;
-

 DefaultClause
 DefaultClause

-    : "default" ":" StatementListOpt { $$ = new(driver.pool_) CYClause(NULL, $3); }
+    : "default" ":" StatementListOpt { $$ = CYNew CYClause(NULL, $3); }

     ;
 /* }}} */
 /* 12.12 Labelled Statements {{{ */
 LabelledStatement
     ;
 /* }}} */
 /* 12.12 Labelled Statements {{{ */
 LabelledStatement

-    : Identifier ":" Statement { $$ = new(driver.pool_) CYLabel($1, $3); }
+    : Identifier ":" Statement { $$ = CYNew CYLabel($1, $3); }

     ;
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement
     ;
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement

-    : "throw" Expression Terminator { $$ = new(driver.pool_) cy::Syntax::Throw($2); }
+    : "throw" LexSetRegExp "\n" StrictSemi { error(@1, "throw without exception"); }
+    | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }

     ;
 /* }}} */
 /* 12.14 The try Statement {{{ */
 TryStatement
     ;
 /* }}} */
 /* 12.14 The try Statement {{{ */
 TryStatement

-    : "try" Block_ CatchOpt FinallyOpt { $$ = new(driver.pool_) cy::Syntax::Try($2, $3, $4); }
+    : "try" Block_ CatchOpt FinallyOpt { $$ = CYNew cy::Syntax::Try($2, $3, $4); }

     ;
 
 CatchOpt
     ;
 
 CatchOpt

-    : "catch" "(" Identifier ")" Block_ { $$ = new(driver.pool_) cy::Syntax::Catch($3, $5); }
+    : "catch" "(" Identifier ")" Block_ { $$ = CYNew cy::Syntax::Catch($3, $5); }

     | { $$ = NULL; }
     ;
 
 FinallyOpt
     | { $$ = NULL; }
     ;
 
 FinallyOpt

-    : "finally" Block_ { $$ = new(driver.pool_) CYFinally($2); }
+    : "finally" Block_ { $$ = CYNew CYFinally($2); }

     | { $$ = NULL; }
     ;
 /* }}} */
     | { $$ = NULL; }
     ;
 /* }}} */

+/* 12.14 The debugger Statement {{{ */
+DebuggerStatement
+    : "debugger" Terminator { $$ = CYNew CYDebugger(); }
+    ;
+/* }}} */

 
 

-/* 13 Function Definition {{{ */
+/* 13.1 Function Definitions {{{ */

 FunctionDeclaration
 FunctionDeclaration

-    : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionStatement($2, $4, $7); }
+    : ";function" Identifier "(" FormalParameterListOpt ")" BRACE FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); }

     ;
 
 FunctionExpression
     ;
 
 FunctionExpression

-    : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($2, $4, $7); }
+    : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYFunctionExpression($2, $5, $10); }

     ;
 
 FormalParameterList_
     ;
 
 FormalParameterList_


@@ -1469,44 +1336,138 @@ FormalParameterList_
     ;
 
 FormalParameterList
     ;
 
 FormalParameterList

-    : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYFunctionParameter($1, $2); }
+    // XXX: : FunctionRestParameter { $$ = $1; }
+    : FormalParameter FormalParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); }
+    ;
+
+FormalParameterListOpt
+    : FormalParameterList

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

+/* XXX: FunctionRestParameter
+    : "..." BindingIdentifier { $$ = CYNew CYFunctionRestParameter($2); }
+    ;*/
+
+FormalParameter
+    : BindingElement { $$ = $1; }
+    ;
+

 FunctionBody
 FunctionBody

-    : SourceElements { $$ = $1; }
+    : StatementListOpt { $$ = $1; }
+    ;
+/* }}} */
+/* 13.2 Arrow Function Definitions {{{ */
+ArrowFunction
+    : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); }
+    ;
+
+ArrowParameters
+    : BindingIdentifier { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1)); }
+    | "(" LexPushInOff LexSetRegExp ")" LexPopIn { $$ = NULL; }
+    | Parenthetical { $$ = $1->expression_->Parameter(); if ($$ == NULL) error(@1, "invalid parameter list"); }
+    ;
+
+ConciseBody
+    : AssignmentExpression { $$ = CYNew CYReturn($1); }
+    | LexSetRegExp ";{" LexPushInOff FunctionBody "}" LexPopIn { $$ = $4; }

     ;
 /* }}} */
 /* 14 Program {{{ */
 Program
     ;
 /* }}} */
 /* 14 Program {{{ */
 Program

-    : SourceElements { driver.program_ = new(driver.pool_) CYProgram($1); }
+    : ProgramBodyOpt { driver.program_ = CYNew CYProgram($1); }

     ;
 
     ;
 

-SourceElements
-    : SourceElement SourceElements { $1->SetNext($2); $$ = $1; }
-    | LexSetRegExp { $$ = NULL; }
+ProgramBody
+    : StatementList { $$ = $1; }
+    ;
+
+ProgramBodyOpt
+    : ProgramBody { $$ = $1; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }
+    ;
+/* }}} */
+
+@begin C
+/* Cycript (C): Type Encoding {{{ */
+TypeSignifier
+    : IdentifierType { $$ = CYNew CYTypedIdentifier(@1, $1); }
+    | "(" LexPushInOff "*" TypeQualifierRight ")" LexPopIn { $$ = $4; }
+    ;
+
+SuffixedType
+    : SuffixedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); }
+    | "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); }
+    | TypeSignifier "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $1; $$->modifier_ = CYNew CYTypeFunctionWith($4, $$->modifier_); }
+    | "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypedIdentifier(@1); $$->modifier_ = CYNew CYTypeFunctionWith($3, $$->modifier_); }
+    | TypeSignifier { $$ = $1; }
+    | { $$ = CYNew CYTypedIdentifier(@$); }
+    ;
+
+PrefixedType
+    : "*" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
+    ;
+
+TypeQualifierLeft
+    : { $$ = NULL; }
+    | "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); }
+    | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); }
+    ;
+
+TypeQualifierRight
+    : PrefixedType { $$ = $1; }
+    | SuffixedType { $$ = $1; }
+    | "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); }
+    | "volatile" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeVolatile($$->modifier_); }
+    ;
+
+IntegerType
+    : "int" { $$ = CYNew CYTypeVariable("int"); }
+    | "unsigned" IntegerTypeOpt { $$ = CYNew CYTypeUnsigned($2); }
+    | "signed" IntegerTypeOpt { $$ = CYNew CYTypeSigned($2); }
+    | "long" IntegerTypeOpt { $$ = CYNew CYTypeLong($2); }
+    | "short" IntegerTypeOpt { $$ = CYNew CYTypeShort($2); }
+    ;
+
+IntegerTypeOpt
+    : IntegerType { $$ = $1; }
+    | { $$ = CYNew CYTypeVariable("int"); }

     ;
 
     ;
 

-SourceElement_
-    : Statement_ { $$ = $1; }
-    | FunctionDeclaration { $$ = $1; }
+PrimitiveType
+    : IdentifierType { $$ = CYNew CYTypeVariable($1); }
+    | IntegerType { $$ = $1; }
+    | "void" { $$ = CYNew CYTypeVoid(); }
+    | "char" { $$ = CYNew CYTypeVariable("char"); }
+    | "signed" "char" { $$ = CYNew CYTypeSigned(CYNew CYTypeVariable("char")); }
+    | "unsigned" "char" { $$ = CYNew CYTypeUnsigned(CYNew CYTypeVariable("char")); }

     ;
 
     ;
 

-SourceElement
-    : LexSetRegExp SourceElement_ { $$ = $2; }
+TypedIdentifier
+    : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->specifier_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
+    ;
+
+PrimaryExpression
+    : "@encode" "(" TypedIdentifier ")" { $$ = CYNew CYEncodedType($3); }

     ;
 /* }}} */
     ;
 /* }}} */

+@end

 
 @begin ObjectiveC
 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt
 
 @begin ObjectiveC
 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt

-    /* XXX: why the hell did I choose MemberExpressionNoBF? */
-    : ":" LexSetRegExp MemberExpressionNoBF { $$ = $3; }
+    /* XXX: why the hell did I choose MemberExpression? */
+    : ":" LexSetRegExp MemberExpression { $$ = $3; }

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-ClassFieldList
-    : "{" "}" { $$ = NULL; }
+ClassFieldListOpt
+    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYClassField($1, $3); }
+    | LexSetRegExp { $$ = NULL; }
+    ;
+
+ClassFields
+    : BRACE ClassFieldListOpt "}" { $$ = $2; }

     ;
 
 MessageScope
     ;
 
 MessageScope


@@ -1515,12 +1476,16 @@ MessageScope
     ;
 
 TypeOpt
     ;
 
 TypeOpt

-    : "(" Expression ")" { $$ = $2; }
-    | { $$ = NULL; }
+    : "(" LexSetRegExp TypedIdentifier ")" { if ($3->identifier_ != NULL) error($3->location_, "unexpected identifier"); $$ = $3; }
+    | { $$ = CYNew CYTypedIdentifier(CYNew CYTypeVariable("id")); }

     ;
 
 MessageParameter
     ;
 
 MessageParameter

-    : Word ":" TypeOpt Identifier { $$ = new(driver.pool_) CYMessageParameter($1, $3, $4); }
+    : Word ":" TypeOpt Identifier { $3->identifier_ = $4; $$ = CYNew CYMessageParameter($1, $3); }
+    ;
+
+MessageParameterList
+    : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; }

     ;
 
 MessageParameterListOpt
     ;
 
 MessageParameterListOpt


@@ -1528,21 +1493,18 @@ MessageParameterListOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-MessageParameterList
-    : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; }
-    ;
-

 MessageParameters
     : MessageParameterList { $$ = $1; }
 MessageParameters
     : MessageParameterList { $$ = $1; }

-    | Word { $$ = new(driver.pool_) CYMessageParameter($1, NULL, NULL); }
+    | Word { $$ = CYNew CYMessageParameter($1, NULL); }

     ;
 
 ClassMessageDeclaration
     ;
 
 ClassMessageDeclaration

-    : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new(driver.pool_) CYMessage($1, $2, $3, $5); }
+    : MessageScope TypeOpt MessageParameters BRACE FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); }

     ;
 
 ClassMessageDeclarationListOpt
     : ClassMessageDeclarationListOpt ClassMessageDeclaration { $2->SetNext($1); $$ = $2; }
     ;
 
 ClassMessageDeclarationListOpt
     : ClassMessageDeclarationListOpt ClassMessageDeclaration { $2->SetNext($1); $$ = $2; }

+    | ClassMessageDeclarationListOpt Comment { $$ = $1; }

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 


@@ -1558,7 +1520,7 @@ ClassNameOpt
 
 // XXX: this should be AssignmentExpressionNoRight
 ClassProtocols
 
 // XXX: this should be AssignmentExpressionNoRight
 ClassProtocols

-    : ShiftExpression ClassProtocolsOpt { $$ = new(driver.pool_) CYProtocol($1, $2); }
+    : ShiftExpression ClassProtocolsOpt { $$ = CYNew CYProtocol($1, $2); }

     ;
 
 ClassProtocolsOpt
     ;
 
 ClassProtocolsOpt


@@ -1572,54 +1534,67 @@ ClassProtocolListOpt
     ;
 
 ClassExpression
     ;
 
 ClassExpression

-    : "@class" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassExpression($2, $3, $4, $5, $6); }
+    : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields ClassMessageDeclarationListOpt "@end" LexPopIn { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); }

     ;
 
 ClassStatement
     ;
 
 ClassStatement

-    : "@class" ClassName ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassStatement($2, $3, $4, $5, $6); }
+    : ";@implementation" ClassName ClassSuperOpt ClassProtocolListOpt ClassFields ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassStatement($2, $3, $4, $5, $6); }
+    ;
+
+CategoryName
+    : "(" WordOpt ")"

     ;
 
 CategoryStatement
     ;
 
 CategoryStatement

-    : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYCategory($2, $3); }
+    : ";@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); }

     ;
 
     ;
 

-PrimaryExpressionBF
+PrimaryExpression

     : ClassExpression { $$ = $1; }
     ;
 
     : ClassExpression { $$ = $1; }
     ;
 

-Statement_
+Statement__

     : ClassStatement { $$ = $1; }
     | CategoryStatement { $$ = $1; }
     ;
 /* }}} */
 /* Cycript (Objective-C): Send Message {{{ */
 VariadicCall
     : ClassStatement { $$ = $1; }
     | CategoryStatement { $$ = $1; }
     ;
 /* }}} */
 /* Cycript (Objective-C): Send Message {{{ */
 VariadicCall

-    : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
+    : "," AssignmentExpression VariadicCall { $$ = CYNew CYArgument(NULL, $2, $3); }

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-SelectorCall_
-    : SelectorCall { $$ = $1; }
-    | VariadicCall { $$ = $1; }
-    ;
-

 SelectorWordOpt
     : WordOpt { driver.contexts_.back().words_.push_back($1); } { $$ = $1; }
     | AutoComplete { driver.mode_ = CYDriver::AutoMessage; YYACCEPT; }
     ;
 
 SelectorWordOpt
     : WordOpt { driver.contexts_.back().words_.push_back($1); } { $$ = $1; }
     | AutoComplete { driver.mode_ = CYDriver::AutoMessage; YYACCEPT; }
     ;
 

+SelectorCall_
+    : SelectorCall { $$ = $1; }
+    | VariadicCall { $$ = $1; }
+    ;
+

 SelectorCall
 SelectorCall

-    : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = new(driver.pool_) CYArgument($1 ?: new(driver.pool_) CYBlank(), $3, $4); }
+    : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYWord(""), $3, $4); }

     ;
 
 SelectorList
     : SelectorCall { $$ = $1; }
     ;
 
 SelectorList
     : SelectorCall { $$ = $1; }

-    | Word { $$ = new(driver.pool_) CYArgument($1, NULL); }
+    | Word { $$ = CYNew CYArgument($1, NULL); }

     ;
 
 MessageExpression
     ;
 
 MessageExpression

-    : "[" AssignmentExpression { driver.contexts_.push_back($2); } SelectorList "]" { driver.contexts_.pop_back(); } { $$ = new(driver.pool_) CYSendDirect($2, $4); }
-    | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = new(driver.pool_) CYSendSuper($5); }
+    : "[" LexPushInOff AssignmentExpression { driver.contexts_.push_back($3); } SelectorList "]" LexPopIn { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($3, $5); }
+    | "[" LexPushInOff LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" LexPopIn { $$ = CYNew CYSendSuper($6); }
+    ;
+
+SelectorExpression_
+    : WordOpt ":" SelectorExpressionOpt { $$ = CYNew CYSelectorPart($1, true, $3); }
+    ;
+
+SelectorExpression
+    : SelectorExpression_ { $$ = $1; }
+    | Word { $$ = CYNew CYSelectorPart($1, false, NULL); }

     ;
 
 SelectorExpressionOpt
     ;
 
 SelectorExpressionOpt


@@ -1627,42 +1602,114 @@ SelectorExpressionOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-SelectorExpression_
-    : WordOpt ":" SelectorExpressionOpt { $$ = new(driver.pool_) CYSelectorPart($1, true, $3); }
+PrimaryExpression
+    : MessageExpression { $$ = $1; }
+    | "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); }

     ;
     ;

+/* }}} */
+@end

 
 

-SelectorExpression
-    : SelectorExpression_ { $$ = $1; }
-    | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
+/* Cycript: @import Directive {{{ */
+Module
+    : Module "." Word { $$ = CYNew CYModule($3, $1); }
+    | Word { $$ = CYNew CYModule($1); }

     ;
 
     ;
 

-PrimaryExpressionNo
-    : MessageExpression { $$ = $1; }
-    | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); }
+Declaration__
+    : "@import" Module { $$ = CYNew CYImport($2); }
+    ;
+/* }}} */
+
+@begin ObjectiveC
+/* Cycript (Objective-C): Boxed Expressions {{{ */
+BoxableExpression
+    : NullLiteral { $$ = $1; }
+    | BooleanLiteral { $$ = $1; }
+    | NumericLiteral { $$ = $1; }
+    | StringLiteral { $$ = $1; }
+    | ArrayLiteral { $$ = $1; }
+    | ObjectLiteral { $$ = $1; }
+    | Parenthetical { $$ = $1; }
+    | "YES" { $$ = CYNew CYTrue(); }
+    | "NO" { $$ = CYNew CYFalse(); }
+    ;
+
+PrimaryExpression
+    : "@" BoxableExpression { $$ = CYNew CYBox($2); }
+    | "@YES" { $$ = CYNew CYBox(CYNew CYTrue()); }
+    | "@NO" { $$ = CYNew CYBox(CYNew CYFalse()); }
+    | "@true" { $$ = CYNew CYBox(CYNew CYTrue()); }
+    | "@false" { $$ = CYNew CYBox(CYNew CYFalse()); }
+    | "@null" { $$ = CYNew CYBox(CYNew CYNull()); }
+    ;
+/* }}} */
+/* Cycript (Objective-C): Block Expressions {{{ */
+PrimaryExpression
+    : "^" TypedIdentifier { if ($2->identifier_ != NULL) error($2->location_, "unexpected identifier"); } BRACE LexPushInOff FunctionBody "}" LexPopIn { if (CYTypeFunctionWith *function = $2->Function()) $$ = CYNew CYObjCBlock($2, function->parameters_, $6); else error($2->location_, "expected parameters"); }
+    ;
+/* }}} */
+/* Cycript (Objective-C): Instance Literals {{{ */
+PrimaryExpression
+    : "#" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); }

     ;
 /* }}} */
 @end
 
 @begin C
 /* Cycript (C): Pointer Indirection/Addressing {{{ */
     ;
 /* }}} */
 @end
 
 @begin C
 /* Cycript (C): Pointer Indirection/Addressing {{{ */

-UnaryAssigneeExpression
-    : "*" UnaryExpressionNoRE { $$ = new(driver.pool_) CYIndirect($2); }
+LeftHandSideExpression
+    : LexSetRegExp "*" UnaryExpression { $$ = CYNew CYIndirect($3); }

     ;
 
 UnaryExpression_
     ;
 
 UnaryExpression_

-    : "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); }
+    : "&" UnaryExpression { $$ = CYNew CYAddressOf($2); }

     ;
 
 MemberAccess
     ;
 
 MemberAccess

-    : "->" "[" Expression "]" { $$ = new(driver.pool_) CYIndirectMember(NULL, $3); }
-    | "->" Identifier { $$ = new(driver.pool_) CYIndirectMember(NULL, new(driver.pool_) CYString($2)); }
+    : "->" "[" Expression "]" { $$ = CYNew CYIndirectMember(NULL, $3); }
+    | "->" IdentifierName { $$ = CYNew CYIndirectMember(NULL, CYNew CYString($2)); }

     | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
     ;
 /* }}} */
     | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
     ;
 /* }}} */

+/* Cycript (C): auto Compatibility {{{ */
+Var_
+    : "auto"
+    ;
+/* }}} */
+/* Cycript (C): Lambda Expressions {{{ */
+TypedParameterList_
+    : "," TypedParameterList { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+TypedParameterList
+    : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); }
+    ;
+
+TypedParameterListOpt
+    : TypedParameterList { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+PrimaryExpression
+    : "[" LexPushInOff LexSetRegExp "&" LexSetRegExp "]" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn "->" TypedIdentifier BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYLambda($14, $10, $17); }
+    ;
+/* }}} */
+/* Cycript (C): Type Definitions {{{ */
+Statement__
+    : "typedef" TypedIdentifier { if ($2->identifier_ == NULL) error($2->location_, "expected identifier"); } Terminator { $$ = CYNew CYTypeDefinition($2); }
+    ;
+/* }}} */
+/* Cycript (C): extern "C" {{{ */
+Statement__
+    : "extern" StringLiteral { if (strcmp($2->Value(), "C") != 0) error(@2, "unknown extern binding"); } TypedIdentifier { if ($4->identifier_ == NULL) error($4->location_, "expected identifier"); } Terminator { $$ = CYNew CYExternal($2, $4); }
+    ;
+/* }}} */
+

 @end
 
 /* YUI: Documentation Comments {{{ */
 @end
 
 /* YUI: Documentation Comments {{{ */

-Statement_
+Statement__

     : Comment { $$ = $1; }
     ;
 /* }}} */
     : Comment { $$ = $1; }
     ;
 /* }}} */


@@ -1693,11 +1740,12 @@ LexSetXMLTag
     : { driver.SetCondition(CYDriver::XMLTagCondition); }
     ;
 /* }}} */
     : { driver.SetCondition(CYDriver::XMLTagCondition); }
     ;
 /* }}} */

-
+/* Virtual Tokens {{{ */

 XMLWhitespaceOpt
     : XMLWhitespace
     |
     ;
 XMLWhitespaceOpt
     : XMLWhitespace
     |
     ;

+/* }}} */

 
 /* 8.1 Context Keywords {{{ */
 Identifier
 
 /* 8.1 Context Keywords {{{ */
 Identifier


@@ -1712,9 +1760,10 @@ XMLMarkup
     | XMLPI { $$ = $1; }
     ;
 /* }}} */
     | XMLPI { $$ = $1; }
     ;
 /* }}} */

+

 /* 11.1 Primary Expressions {{{ */
 /* 11.1 Primary Expressions {{{ */

-PrimaryExpressionNo
-    : PropertyIdentifier { $$ = new(driver.pool_) CYPropertyVariable($1); }
+PrimaryExpression
+    : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }

     | XMLInitialiser { $$ = $1; }
     | XMLListInitialiser { $$ = $1; }
     ;
     | XMLInitialiser { $$ = $1; }
     | XMLListInitialiser { $$ = $1; }
     ;


@@ -1727,32 +1776,32 @@ PropertyIdentifier
 /* }}} */
 /* 11.1.1 Attribute Identifiers {{{ */
 AttributeIdentifier
 /* }}} */
 /* 11.1.1 Attribute Identifiers {{{ */
 AttributeIdentifier

-    : "@" QualifiedIdentifier_ { $$ = new(driver.pool_) CYAttribute($2); }
+    : "@" QualifiedIdentifier_ { $$ = CYNew CYAttribute($2); }

     ;
 
 PropertySelector_
     : PropertySelector { $$ = $1; }
     ;
 
 PropertySelector_
     : PropertySelector { $$ = $1; }

-    | "[" Expression "]" { $$ = new(driver.pool_) CYSelector($2); }
+    | "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYSelector($3); }

     ;
 
 PropertySelector
     ;
 
 PropertySelector

-    : Identifier { $$ = new(driver.pool_) CYSelector($1); }
+    : Identifier { $$ = CYNew CYSelector($1); }

     | WildcardIdentifier { $$ = $1; }
     ;
 /* }}} */
 /* 11.1.2 Qualified Identifiers {{{ */
 QualifiedIdentifier_
     | WildcardIdentifier { $$ = $1; }
     ;
 /* }}} */
 /* 11.1.2 Qualified Identifiers {{{ */
 QualifiedIdentifier_

-    : PropertySelector_ { $$ = new(driver.pool_) CYQualified(NULL, $1); }
+    : PropertySelector_ { $$ = CYNew CYQualified(NULL, $1); }

     | QualifiedIdentifier { $$ = $1; }
     ;
 
 QualifiedIdentifier
     | QualifiedIdentifier { $$ = $1; }
     ;
 
 QualifiedIdentifier

-    : PropertySelector "::" PropertySelector_ { $$ = new(driver.pool_) CYQualified($1, $3); }
+    : PropertySelector "::" PropertySelector_ { $$ = CYNew CYQualified($1, $3); }

     ;
 /* }}} */
 /* 11.1.3 Wildcard Identifiers {{{ */
 WildcardIdentifier
     ;
 /* }}} */
 /* 11.1.3 Wildcard Identifiers {{{ */
 WildcardIdentifier

-    : "*" { $$ = new(driver.pool_) CYWildcard(); }
+    : "*" { $$ = CYNew CYWildcard(); }

     ;
 /* }}} */
 /* 11.1.4 XML Initialiser {{{ */
     ;
 /* }}} */
 /* 11.1.4 XML Initialiser {{{ */


@@ -1762,8 +1811,8 @@ XMLInitialiser
     ;
 
 XMLElement
     ;
 
 XMLElement

-    : "<" XMLTagContent "/>" LexPop
-    | "<" XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "</" LexSetXMLTag XMLTagName XMLWhitespaceOpt ">" LexPop
+    : "<" LexPushInOff XMLTagContent LexPop "/>" LexPopIn
+    | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "</" LexSetXMLTag XMLTagName XMLWhitespaceOpt LexPop ">" LexPopIn

     ;
 
 XMLTagContent
     ;
 
 XMLTagContent


@@ -1771,7 +1820,7 @@ XMLTagContent
     ;
 
 XMLExpression
     ;
 
 XMLExpression

-    : "{" LexPushRegExp Expression "}" LexPop
+    : BRACE LexPushRegExp Expression LexPop "}"

     ;
 
 XMLTagName
     ;
 
 XMLTagName


@@ -1812,9 +1861,10 @@ XMLElementContentOpt
 /* }}} */
 /* 11.1.5 XMLList Initialiser {{{ */
 XMLListInitialiser
 /* }}} */
 /* 11.1.5 XMLList Initialiser {{{ */
 XMLListInitialiser

-    : "<>" LexPushXMLContent XMLElementContent "</>" LexPop { $$ = new(driver.pool_) CYXMLList($3); }
+    : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop "</>" LexPopIn { $$ = CYNew CYXMLList($4); }

     ;
 /* }}} */
     ;
 /* }}} */

+

 /* 11.2 Left-Hand-Side Expressions {{{ */
 PropertyIdentifier_
     : Identifier { $$ = $1; }
 /* 11.2 Left-Hand-Side Expressions {{{ */
 PropertyIdentifier_
     : Identifier { $$ = $1; }


@@ -1822,68 +1872,78 @@ PropertyIdentifier_
     ;
 
 MemberAccess
     ;
 
 MemberAccess

-    : "." PropertyIdentifier { $$ = new(driver.pool_) CYPropertyMember(NULL, $2); }
-    | ".." PropertyIdentifier_ { $$ = new(driver.pool_) CYDescendantMember(NULL, $2); }
-    | "." "(" Expression ")" { $$ = new(driver.pool_) CYFilteringPredicate(NULL, $3); }
+    : "." PropertyIdentifier { $$ = CYNew CYPropertyMember(NULL, $2); }
+    | ".." PropertyIdentifier_ { $$ = CYNew CYDescendantMember(NULL, $2); }
+    | "." "(" Expression ")" { $$ = CYNew CYFilteringPredicate(NULL, $3); }

     ;
 /* }}} */
 /* 12.1 The default xml namespace Statement {{{ */
 /* XXX: DefaultXMLNamespaceStatement
     ;
 /* }}} */
 /* 12.1 The default xml namespace Statement {{{ */
 /* XXX: DefaultXMLNamespaceStatement

-    : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); }
+    : "default" "xml" "namespace" "=" Expression Terminator { $$ = CYNew CYDefaultXMLNamespace($5); }

     ;
 
     ;
 

-Statement_
+Statement__

     : DefaultXMLNamespaceStatement { $$ = $1; }
     ; */
 /* }}} */
 @end
 
     : DefaultXMLNamespaceStatement { $$ = $1; }
     ; */
 /* }}} */
 @end
 

-/* ECMAScript5: Object Literal Trailing Comma {{{ */
-PropertyNameAndValueList_
-    : "," { $$ = NULL; }
+/* JavaScript 1.7: Array Comprehensions {{{ */
+Comprehension
+    : AssignmentExpression ComprehensionFor ComprehensionTail { $$ = CYNew CYArrayComprehension($1, $2->Modify($3)); }
+    ;
+
+ComprehensionFor
+    : "for" "(" Binding "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); }
+    | "for" "each" "(" Binding "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); }

     ;
 /* }}} */
     ;
 /* }}} */

-/* JavaScript 1.7: Array Comprehensions {{{ */
-IfComprehension
-    : "if" "(" Expression ")" { $$ = new(driver.pool_) CYIfComprehension($3); }
+/* JavaScript 1.7: for each {{{ */
+IterationStatement
+    : "for" "each" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); }
+    ;
+/* }}} */
+/* JavaScript 1.7: let Statements {{{ */
+LetStatement
+    : "let" "(" VariableDeclarationList ")" Statement { $$ = CYNew CYLetStatement($3, $5); }

     ;
 
     ;
 

-ForComprehension
-    : "for" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForInComprehension($3, $5); }
-    | "for" "each" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForEachInComprehension($4, $6); }
+Statement__
+    : LetStatement

     ;
     ;

+/* }}} */

 
 

-ComprehensionListOpt
-    : ComprehensionList { $$ = $1; }
-    | IfComprehension { $$ = $1; }
+/* JavaScript FTW: Ruby Blocks {{{ */
+RubyProcParameterList_
+    : "," RubyProcParameterList { $$ = $2; }

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-ComprehensionList
-    : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; }
+RubyProcParameterList
+    : Identifier RubyProcParameterList_ { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1), $2); }
+    | { $$ = NULL; }

     ;
 
     ;
 

-PrimaryExpressionNo
-    : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); }
+RubyProcParameters
+    : "|" RubyProcParameterList "|" { $$ = $2; }
+    | "||" { $$ = NULL; }

     ;
     ;

-/* }}} */
-/* JavaScript 1.7: for each {{{ */
-ForInStatement
-    : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForEachIn($4, $6, $8); }
+
+RubyProcParametersOpt
+    : RubyProcParameters
+    | { $$ = NULL; }

     ;
     ;

-/* }}} */
-/* JavaScript 1.7: let Statements {{{ *//*
-LetStatement
-    : "let" "(" VariableDeclarationList ")" Block_ { $$ = new(driver.pool_) CYLet($3, $5); }
+
+RubyProcExpression
+    : "{" RubyProcParametersOpt StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); }

     ;
 
     ;
 

-Statement_
-    : LetStatement
+PrimaryExpression
+    : "{" LexPushInOff RubyProcParameters StatementListOpt "}" LexPopIn { $$ = CYNew CYRubyProc($3, $4); }

     ;
     ;

-*//* }}} */
-/* JavaScript FTW: Function Statements {{{ */
-Statement
-    : LexSetRegExp FunctionDeclaration { driver.Warning(yylloc, "warning, FunctionDeclaration is a SourceElement, not a Statement"); } { $$ = $2; }
+
+CallExpression
+    : CallExpression_ RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }

     ;
 /* }}} */
 
     ;
 /* }}} */