Mark output from ?debug separate from the result.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index ec7c221f1246aad3ab78200970f3fd211ed0b752..e1408da4ea74983595dcad480c5b09f186d0025f 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2013  Jay Freeman (saurik)

 */
 
 */
 

-/* GNU Lesser General Public License, Version 3 {{{ */
+/* GNU General Public License, Version 3 {{{ */

 /*
 /*

- * Cycript is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the
- * Free Software Foundation, either version 3 of the License, or (at your
- * option) any later version.
+ * Cycript is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published
+ * by the Free Software Foundation, either version 3 of the License,
+ * or (at your option) any later version.

  *
  *

- * Cycript is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
- * License for more details.
+ * Cycript is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.

  *
  *

- * You should have received a copy of the GNU Lesser General Public License
+ * You should have received a copy of the GNU General Public License

  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -28,6 +28,7 @@
 @if Bison24 }
 
 @if Bison24 %code requires {
 @if Bison24 }
 
 @if Bison24 %code requires {

+#include "Driver.hpp"

 #include "Parser.hpp"
 #define CYNew new($pool)
 
 #include "Parser.hpp"
 #define CYNew new($pool)
 


@@ -39,8 +40,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_;


@@ -68,6 +72,7 @@ typedef struct {
         CYInfix *infix_;
         CYLiteral *literal_;
         CYMember *member_;
         CYInfix *infix_;
         CYLiteral *literal_;
         CYMember *member_;

+        CYModule *module_;

         CYNull *null_;
         CYNumber *number_;
         CYProgram *program_;
         CYNull *null_;
         CYNumber *number_;
         CYProgram *program_;


@@ -87,6 +92,9 @@ typedef struct {
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYSelectorPart *selector_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYSelectorPart *selector_;

+        CYTypeModifier *modifier_;
+        CYTypedIdentifier *typedIdentifier_;
+        CYTypedParameter *typedParameter_;

 @end
 
 @begin E4X
 @end
 
 @begin E4X


@@ -126,6 +134,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


@@ -216,16 +225,25 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token OpenBracket "["
 %token CloseBracket "]"
 
 %token OpenBracket "["
 %token CloseBracket "]"
 

+%token AtError "@error"
+

 @begin Java
 %token AtClass "@class"
 @end
 
 @begin Java
 %token AtClass "@class"
 @end
 

+@begin C
+%token <identifier_> Typedef "typedef"
+@end
+

 @begin ObjectiveC
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 %token AtImport "@import"
 @begin ObjectiveC
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 %token AtImport "@import"

+%token AtEncode "@encode"

 %token AtEnd "@end"
 %token AtSelector "@selector"
 %token AtEnd "@end"
 %token AtSelector "@selector"

+%token <identifier_> Yes "YES"
+%token <identifier_> No "NO"

 @end
 
 %token <false_> False "false"
 @end
 
 %token <false_> False "false"


@@ -233,6 +251,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token <true_> True "true"
 
 // ES3/ES5/WIE/JSC Reserved
 %token <true_> True "true"
 
 // ES3/ES5/WIE/JSC Reserved

+%token <word_> Auto "auto"

 %token <word_> Break "break"
 %token <word_> Case "case"
 %token <word_> Catch "catch"
 %token <word_> Break "break"
 %token <word_> Case "case"
 %token <word_> Catch "catch"


@@ -332,6 +351,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> ArrowFunction
 %type <functionParameter_> ArrowParameters
 %type <expression_> AssignmentExpression
 %type <expression_> ArrowFunction
 %type <functionParameter_> ArrowParameters
 %type <expression_> AssignmentExpression

+%type <identifier_> Binding

 %type <identifier_> BindingIdentifier
 %type <expression_> BitwiseANDExpression
 %type <statement_> Block_
 %type <identifier_> BindingIdentifier
 %type <expression_> BitwiseANDExpression
 %type <statement_> Block_


@@ -348,6 +368,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt

+%type <comprehension_> ComprehensionForList
+%type <comprehension_> ComprehensionForListOpt

 %type <comprehension_> ComprehensionList
 %type <comprehension_> ComprehensionListOpt
 %type <expression_> ConditionalExpression
 %type <comprehension_> ComprehensionList
 %type <comprehension_> ComprehensionListOpt
 %type <expression_> ConditionalExpression


@@ -393,7 +415,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> LetStatement
 %type <statement_> LexicalDeclaration
 %type <literal_> Literal
 %type <statement_> LetStatement
 %type <statement_> LexicalDeclaration
 %type <literal_> Literal

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

 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalORExpression
 %type <member_> MemberAccess
 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalORExpression
 %type <member_> MemberAccess


@@ -412,9 +434,10 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> ProgramBodyOpt
 %type <propertyName_> PropertyName_
 %type <propertyName_> PropertyName
 %type <statement_> ProgramBodyOpt
 %type <propertyName_> PropertyName_
 %type <propertyName_> PropertyName

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

 %type <expression_> RelationalExpression
 %type <statement_> ReturnStatement
 %type <rubyProc_> RubyProcExpression
 %type <expression_> RelationalExpression
 %type <statement_> ReturnStatement
 %type <rubyProc_> RubyProcExpression


@@ -442,13 +465,17 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> WithStatement
 %type <word_> Word
 %type <word_> WordOpt
 %type <statement_> WithStatement
 %type <word_> Word
 %type <word_> WordOpt

+%type <expression_> Variable

 
 @begin ObjectiveC
 
 @begin ObjectiveC

+%type <typedIdentifier_> ArrayedType
+%type <expression_> BoxableExpression

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

+%type <field_> ClassFieldListOpt
+%type <field_> 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


@@ -456,12 +483,18 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <protocol_> ClassProtocolListOpt
 %type <protocol_> ClassProtocols
 %type <protocol_> ClassProtocolsOpt
 %type <protocol_> ClassProtocolListOpt
 %type <protocol_> ClassProtocols
 %type <protocol_> ClassProtocolsOpt

+%type <expression_> EncodedType
+%type <modifier_> FunctionedType

 %type <expression_> MessageExpression
 %type <messageParameter_> MessageParameter
 %type <messageParameter_> MessageParameters
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope
 %type <expression_> MessageExpression
 %type <messageParameter_> MessageParameter
 %type <messageParameter_> MessageParameters
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope

+%type <typedIdentifier_> ModifiedType
+%type <module_> Module
+%type <typedIdentifier_> PrefixedType
+%type <expression_> PrimitiveType

 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_
 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_


@@ -469,7 +502,16 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt
 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt

+%type <typedIdentifier_> SuffixedType

 %type <expression_> TypeOpt
 %type <expression_> TypeOpt

+%type <typedIdentifier_> TypeParenthetical
+%type <modifier_> TypeQualifierLeft
+%type <typedIdentifier_> TypeQualifierRight
+%type <typedIdentifier_> TypeSignifier
+%type <typedIdentifier_> TypedIdentifier
+%type <typedParameter_> TypedParameterList_
+%type <typedParameter_> TypedParameterList
+%type <typedParameter_> TypedParameterListOpt

 %type <argument_> VariadicCall
 @end
 
 %type <argument_> VariadicCall
 @end
 


@@ -493,12 +535,14 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end

-
+/* }}} */
+/* Token Priorities {{{ */

 %nonassoc ""
 %left "++" "--"
 
 %nonassoc "if"
 %nonassoc "else"
 %nonassoc ""
 %left "++" "--"
 
 %nonassoc "if"
 %nonassoc "else"

+/* }}} */

 
 %start Program
 
 
 %start Program
 


@@ -522,53 +566,47 @@ LexSetRegExp
     ;
 
 LexNoBrace
     ;
 
 LexNoBrace

-    : { if (yychar == yyempty_) driver.nobrace_ = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }
+    : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }

     ;
 
 LexNoFunction
     ;
 
 LexNoFunction

-    : { if (yychar == token::Function) yychar = token::Function_; }
+    : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
+    ;
+
+LexNoAtImplementation :
+@begin ObjectiveC
+    { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+@end

     ;
 
 LexSetStatement
     ;
 
 LexSetStatement

-    : LexNoBrace LexNoFunction
+    : LexNoBrace LexNoFunction LexNoAtImplementation

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

-
+/* Virtual Tokens {{{ */

 BRACE
     : "{"
     | "\n{"
     ;
 
 BRACE
     : "{"
     | "\n{"
     ;
 

-StrictSemi
-    : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
-    ;
-
-Terminator
-    : ";"
-    | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+Var_
+    : "var"

     ;
     ;

+/* }}} */

 
 

-TerminatorOpt
-    : ";"
-    | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
+/* 7.6 Identifier Names and Identifiers {{{ */
+IdentifierName
+    : Word { $$ = $1; }

     ;
 
     ;
 

-/*CommaOpt
-    : ","
-    |
-    ;*/
-

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

-IdentifierName
-    : Word { $$ = $1; }
-    ;
-

 Word
     : Identifier { $$ = $1; }
 Word
     : Identifier { $$ = $1; }

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

     | "break" NewLineOpt { $$ = $1; }
     | "case" { $$ = $1; }
     | "catch" { $$ = $1; }
     | "break" NewLineOpt { $$ = $1; }
     | "case" { $$ = $1; }
     | "catch" { $$ = $1; }


@@ -617,18 +655,15 @@ WordOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-@begin ObjectiveC
-PrimaryExpression
-    : "@" LiteralNoRE { $$ = CYNew CYBox($2); }
-    | "@" ArrayLiteral { $$ = CYNew CYBox($2); }
-    | "@" ObjectLiteral { $$ = CYNew CYBox($2); }
-    | "@" Parenthetical { $$ = CYNew CYBox($2); }
-    ;
-@end
-

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

+@begin C
+    | "typedef" { $$ = $1; }
+    | "YES" { $$ = $1; }
+    | "NO" { $$ = $1; }
+@end
+

     | "implements" { $$ = $1; }
     | "interface" { $$ = $1; }
     | "package" { $$ = $1; }
     | "implements" { $$ = $1; }
     | "interface" { $$ = $1; }
     | "package" { $$ = $1; }


@@ -667,31 +702,52 @@ IdentifierOpt
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
     ;
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
     ;

+/* }}} */

 
 

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

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

-    | BooleanLiteral { $$ = $1; }
-    | NumericLiteral { $$ = $1; }
-    | StringLiteral { $$ = $1; }
+    | ValueLiteral { $$ = $1; }

     ;
 
     ;
 

-Literal
-    : LiteralNoRE { $$ = $1; }
+ValueLiteral
+    : BooleanLiteral { $$ = $1; }
+    | NumericLiteral { $$ = $1; }
+    | StringLiteral { $$ = $1; }

     | RegularExpressionLiteral { $$ = $1; }
     ;
     | RegularExpressionLiteral { $$ = $1; }
     ;

-
+/* }}} */
+/* 7.8.1 Null Literals {{{ */

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

-
+/* }}} */
+/* 7.8.2 Boolean Literals {{{ */

 BooleanLiteral
     : "true" { $$ = $1; }
     | "false" { $$ = $1; }
     ;
 BooleanLiteral
     : "true" { $$ = $1; }
     | "false" { $$ = $1; }
     ;

+/* }}} */
+
+/* 7.9 Automatic Semicolon Insertion {{{ */
+StrictSemi
+    : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
+    ;
+
+Terminator
+    : ";"
+    | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+    ;
+
+TerminatorOpt
+    : ";"
+    | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
+    ;
+/* }}} */

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

-    : "(" LexPushInOff Expression LexPopIn ")" { $$ = $3; }
+    : "(" LexPushInOff Expression ")" LexPopIn { $$ = $3; }

     ;
 
 ParentheticalOpt
     ;
 
 ParentheticalOpt


@@ -699,20 +755,23 @@ ParentheticalOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

+Variable
+    : Identifier { $$ = CYNew CYVariable($1); }
+    ;
+

 PrimaryExpression
     : "this" { $$ = $1; }
 PrimaryExpression
     : "this" { $$ = $1; }

-    | Identifier { $$ = CYNew CYVariable($1); }
+    | Variable { $$ = $1; }

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

-    | FunctionExpression { $$ = $1; }

     | Parenthetical { $$ = $1; }
     | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
     ;
 /* }}} */
 /* 11.1.4.1 Array Initialiser {{{ */
 ArrayLiteral
     | Parenthetical { $$ = $1; }
     | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
     ;
 /* }}} */
 /* 11.1.4.1 Array Initialiser {{{ */
 ArrayLiteral

-    : "[" LexPushInOff ElementListOpt LexPopIn "]" { $$ = CYNew CYArray($3); }
+    : "[" LexPushInOff ElementListOpt "]" LexPopIn { $$ = CYNew CYArray($3); }

     ;
 
 Element
     ;
 
 Element


@@ -734,23 +793,47 @@ ElementListOpt
     | LexSetRegExp { $$ = NULL; }
     ;
 /* }}} */
     | LexSetRegExp { $$ = NULL; }
     ;
 /* }}} */

+/* 11.1.4.2 Array Comprehension {{{ */
+PrimaryExpression
+    : "[" LexPushInOff AssignmentExpression ComprehensionForList "]" LexPopIn { $$ = CYNew CYArrayComprehension($3, $4); }
+    ;
+
+ComprehensionForList
+    : "for" Binding "in" Expression ComprehensionForListOpt { $$ = CYNew CYForInComprehension($2, $4, $5); }
+    | "for" Binding "of" Expression ComprehensionForListOpt { $$ = CYNew CYForOfComprehension($2, $4, $5); }
+    ;
+
+ComprehensionForListOpt
+    : ComprehensionForList { $$ = $1; }
+    | "if" Expression { $$ = CYNew CYIfComprehension($2); }
+    | { $$ = NULL; }
+    ;
+/* }}} */

 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral

-    : BRACE LexPushInOff PropertyNameAndValueListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }
+    : BRACE LexPushInOff PropertyDefinitionListOpt "}" LexPopIn { $$ = CYNew CYObject($3); }

     ;
 
     ;
 

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

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

-PropertyNameAndValueList
-    : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); }
+PropertyDefinitionList
+    : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; }

     ;
 
     ;
 

-PropertyNameAndValueListOpt
-    : PropertyNameAndValueList { $$ = $1; }
-    | { $$ = NULL; }
+PropertyDefinitionListOpt
+    : PropertyDefinitionList { $$ = $1; }
+    | LexSetRegExp { $$ = NULL; }
+    ;
+
+PropertyDefinition
+    // XXX: this should be IdentifierName
+    : LexSetRegExp Identifier { $$ = CYNew CYProperty($2, CYNew CYVariable($2)); }
+    | PropertyName ":" AssignmentExpression { $$ = CYNew CYProperty($1, $3); }
+    //| MethodDefinition

     ;
 
 PropertyName_
     ;
 
 PropertyName_


@@ -766,7 +849,7 @@ PropertyName
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 MemberAccess
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 MemberAccess

-    : "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYDirectMember(NULL, $3); }
+    : "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYDirectMember(NULL, $3); }

     | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
     | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
     ;
     | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
     | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
     ;


@@ -778,6 +861,7 @@ MemberExpression_
 
 MemberExpression
     : LexSetRegExp PrimaryExpression { $$ = $2; }
 
 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); }
     ;
     | MemberExpression_ { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
     | LexSetRegExp "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($3, $4); }
     ;


@@ -798,7 +882,7 @@ CallExpression
     ;
 
 Arguments
     ;
 
 Arguments

-    : "(" LexPushInOff ArgumentListOpt LexPopIn ")" { $$ = $3; }
+    : "(" LexPushInOff ArgumentListOpt ")" LexPopIn { $$ = $3; }

     ;
 
 ArgumentList_
     ;
 
 ArgumentList_


@@ -920,7 +1004,7 @@ LogicalORExpression
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }

-    | LogicalORExpression "?" LexPushInOff AssignmentExpression LexPopIn ":" AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); }
+    | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); }

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


@@ -1016,7 +1100,7 @@ StatementList
 
 StatementListOpt
     : StatementList { $$ = $1; }
 
 StatementListOpt
     : StatementList { $$ = $1; }

-    | LexSetRegExp { $$ = NULL; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }

     ;
 
 StatementListItem
     ;
 
 StatementListItem


@@ -1024,11 +1108,16 @@ StatementListItem
     | Declaration { $$ = $1; }
     ;
 /* }}} */
     | Declaration { $$ = $1; }
     ;
 /* }}} */

+

 /* 12.2 Declarations {{{ */
 BindingIdentifier
     : Identifier { $$ = $1; }
     ;
 
 /* 12.2 Declarations {{{ */
 BindingIdentifier
     : Identifier { $$ = $1; }
     ;
 

+Binding
+    : BindingIdentifier
+    ;
+

 // XXX: BindingPattern
 /* }}} */
 /* 12.2.1 Let and Const Declarations {{{ */
 // XXX: BindingPattern
 /* }}} */
 /* 12.2.1 Let and Const Declarations {{{ */


@@ -1043,7 +1132,7 @@ LetOrConst
 /* }}} */
 /* 12.2.2 Variable Statement {{{ */
 VariableStatement
 /* }}} */
 /* 12.2.2 Variable Statement {{{ */
 VariableStatement

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

     ;
 
 VariableDeclarationList_
     ;
 
 VariableDeclarationList_


@@ -1080,6 +1169,7 @@ SingleNameBinding
     : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
     ;
 /* }}} */
     : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
     ;
 /* }}} */

+

 /* 12.3 Empty Statement {{{ */
 EmptyStatement
     : ";" { $$ = CYNew CYEmpty(); }
 /* 12.3 Empty Statement {{{ */
 EmptyStatement
     : ";" { $$ = CYNew CYEmpty(); }


@@ -1113,23 +1203,23 @@ IterationStatement
 /* }}} */
 /* 12.6.3 The for Statement {{{ */
 IterationStatement
 /* }}} */
 /* 12.6.3 The for Statement {{{ */
 IterationStatement

-    : "for" "(" LexPushInOn ForStatementInitialiser LexPopIn ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }
+    : "for" "(" LexPushInOn ForStatementInitialiser ";" LexPopIn ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }

     ;
 
 ForStatementInitialiser
     : ExpressionOpt { $$ = $1; }
     ;
 
 ForStatementInitialiser
     : ExpressionOpt { $$ = $1; }

-    | LexSetRegExp "var" VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }
+    | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }

     ;
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */
 IterationStatement
     ;
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */
 IterationStatement

-    : "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); }
-    | "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "of" Expression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); }
+    : "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" VariableDeclaration { $$ = $3; }
+    | LexSetRegExp Var_ VariableDeclaration { $$ = $3; }

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


@@ -1147,7 +1237,7 @@ BreakStatement
 /* }}} */
 /* 12.9 The return Statement {{{ */
 ReturnStatement
 /* }}} */
 /* 12.9 The return Statement {{{ */
 ReturnStatement

-    : "return" "\n" StrictSemi { $$ = CYNew CYReturn(NULL); }
+    : "return" LexSetRegExp "\n" StrictSemi { $$ = CYNew CYReturn(NULL); }

     | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); }
     ;
 /* }}} */
     | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); }
     ;
 /* }}} */


@@ -1187,7 +1277,7 @@ LabelledStatement
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement

-    : "throw" "\n" StrictSemi { YYABORT; }
+    : "throw" LexSetRegExp "\n" StrictSemi { YYABORT; }

     | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }
     ;
 /* }}} */
     | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }
     ;
 /* }}} */


@@ -1218,7 +1308,7 @@ FunctionDeclaration
     ;
 
 FunctionExpression
     ;
 
 FunctionExpression

-    : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt LexPopIn ")" BRACE LexPushInOff FunctionBody LexPopIn "}" { $$ = CYNew CYFunctionExpression($2, $5, $10); }
+    : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYFunctionExpression($2, $5, $10); }

     ;
 
 FormalParameterList_
     ;
 
 FormalParameterList_


@@ -1250,7 +1340,7 @@ FunctionBody
 /* }}} */
 /* 13.2 Arrow Function Definitions {{{ */
 ArrowFunction
 /* }}} */
 /* 13.2 Arrow Function Definitions {{{ */
 ArrowFunction

-    : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFunctionExpression(NULL, $2, $5); }
+    : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); }

     ;
 
 ArrowParameters
     ;
 
 ArrowParameters


@@ -1260,7 +1350,7 @@ ArrowParameters
 
 ConciseBody
     : AssignmentExpression { $$ = CYNew CYReturn($1); }
 
 ConciseBody
     : AssignmentExpression { $$ = CYNew CYReturn($1); }

-    | ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $3; }
+    | LexSetRegExp ";{" LexPushInOff FunctionBody "}" LexPopIn { $$ = $4; }

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


@@ -1274,11 +1364,71 @@ ProgramBody
 
 ProgramBodyOpt
     : ProgramBody { $$ = $1; }
 
 ProgramBodyOpt
     : ProgramBody { $$ = $1; }

-    | { $$ = NULL; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }

     ;
 /* }}} */
 
 @begin ObjectiveC
     ;
 /* }}} */
 
 @begin ObjectiveC

+/* Cycript (Objective-C): Type Encoding {{{ */
+TypeParenthetical
+    : "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; }
+    ;
+
+TypeSignifier
+    : Identifier { $$ = CYNew CYTypedIdentifier($1); }
+    | TypeParenthetical { $$ = $1; }
+    ;
+
+ArrayedType
+    : ArrayedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); }
+    | TypeSignifier { $$ = $1; }
+    | { $$ = CYNew CYTypedIdentifier(); }
+    ;
+
+FunctionedType
+    : "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypeFunctionWith($3); }
+    ;
+
+SuffixedType
+    : ArrayedType { $$ = $1; }
+    | "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); }
+    | TypeParenthetical FunctionedType { $$ = $1; CYSetLast($2) = $$->modifier_; $$->modifier_ = $2; }
+    | FunctionedType { $$ = CYNew CYTypedIdentifier(); CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
+    ;
+
+PrefixedType
+    : "*" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
+    ;
+
+TypeQualifierLeft
+    : "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); }
+    /* XXX: | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); } */
+    | { $$ = NULL; }
+    ;
+
+TypeQualifierRight
+    : "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); }
+    | PrefixedType { $$ = $1; }
+    | SuffixedType { $$ = $1; }
+    ;
+
+PrimitiveType
+    : Variable { $$ = $1; }
+    | "void" { $$  = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); }
+    ;
+
+TypedIdentifier
+    : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->type_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
+    ;
+
+EncodedType
+    : TypedIdentifier { $$ = CYNew CYEncodedType($1); }
+    ;
+
+PrimaryExpression
+    : AtEncode "(" EncodedType ")" { $$ = $3; }
+    ;
+/* }}} */

 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt
     /* XXX: why the hell did I choose MemberExpression? */
 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt
     /* XXX: why the hell did I choose MemberExpression? */


@@ -1286,17 +1436,13 @@ ClassSuperOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-ClassField
-    : Expression Identifier ";"
-    ;
-
-ClassFieldList
-    : BRACE ClassFieldListOpt "}" { $$ = NULL; }
+ClassFieldListOpt
+    : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
+    | LexSetRegExp { $$ = NULL; }

     ;
 
     ;
 

-ClassFieldListOpt
-    : ClassFieldListOpt ClassField
-    |
+ClassFields
+    : BRACE ClassFieldListOpt "}" { $$ = $2; }

     ;
 
 MessageScope
     ;
 
 MessageScope


@@ -1305,8 +1451,7 @@ MessageScope
     ;
 
 TypeOpt
     ;
 
 TypeOpt

-    : "(" Expression ")" { $$ = $2; }
-    | "(" LexSetRegExp "void" ")" { $$ = NULL; }
+    : "(" LexSetRegExp EncodedType ")" { $$ = $3; }

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


@@ -1364,11 +1509,11 @@ ClassProtocolListOpt
     ;
 
 ClassExpression
     ;
 
 ClassExpression

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

     ;
 
 ClassStatement
     ;
 
 ClassStatement

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

     ;
 
 CategoryName
     ;
 
 CategoryName


@@ -1414,8 +1559,8 @@ SelectorList
     ;
 
 MessageExpression
     ;
 
 MessageExpression

-    : "[" 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); }
+    : "[" 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_
     ;
 
 SelectorExpression_


@@ -1434,24 +1579,44 @@ SelectorExpressionOpt
 
 PrimaryExpression
     : MessageExpression { $$ = $1; }
 
 PrimaryExpression
     : MessageExpression { $$ = $1; }

-    | "@selector" "(" LexPushInOff SelectorExpression LexPopIn ")" { $$ = CYNew CYSelector($4); }
+    | "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); }

     ;
 /* }}} */
 /* Cycript (Objective-C): @import Directive {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): @import Directive {{{ */

-PathName
-    : "/" PathName
-    | "." PathName
-    | Word PathName
-    |
+Module
+    : Module "." Word { $$ = CYNew CYModule($3, $1); }
+    | Word { $$ = CYNew CYModule($1); }

     ;
 
     ;
 

-ImportPath
-    : "<" PathName ">"
-    | StringLiteral
+Declaration__
+    : "@import" Module { $$ = CYNew CYImport($2); }
+    ;
+/* }}} */
+/* 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(); }

     ;
 
     ;
 

-StatementListItem
-    : "@import" ImportPath { $$ = CYNew CYImport(); }
+PrimaryExpression
+    : "@" BoxableExpression { $$ = CYNew CYBox($2); }
+    ;
+/* }}} */
+/* Cycript (Objective-C): Block Expressions {{{ */
+ModifiedType
+    : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->type_ = $2; $$->modifier_ = $1; }
+    | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
+    ;
+
+PrimaryExpression
+    : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }

     ;
 /* }}} */
 @end
     ;
 /* }}} */
 @end


@@ -1472,6 +1637,35 @@ MemberAccess
     | "->" 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 Terminator { $$ = CYNew CYTypeDefinition($2); }
+    ;
+/* }}} */

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


@@ -1506,11 +1700,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


@@ -1525,6 +1720,7 @@ XMLMarkup
     | XMLPI { $$ = $1; }
     ;
 /* }}} */
     | XMLPI { $$ = $1; }
     ;
 /* }}} */

+

 /* 11.1 Primary Expressions {{{ */
 PrimaryExpression
     : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }
 /* 11.1 Primary Expressions {{{ */
 PrimaryExpression
     : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }


@@ -1545,7 +1741,7 @@ AttributeIdentifier
 
 PropertySelector_
     : PropertySelector { $$ = $1; }
 
 PropertySelector_
     : PropertySelector { $$ = $1; }

-    | "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYSelector($3); }
+    | "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYSelector($3); }

     ;
 
 PropertySelector
     ;
 
 PropertySelector


@@ -1575,8 +1771,8 @@ XMLInitialiser
     ;
 
 XMLElement
     ;
 
 XMLElement

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

     ;
 
 XMLTagContent
     ;
 
 XMLTagContent


@@ -1625,9 +1821,10 @@ XMLElementContentOpt
 /* }}} */
 /* 11.1.5 XMLList Initialiser {{{ */
 XMLListInitialiser
 /* }}} */
 /* 11.1.5 XMLList Initialiser {{{ */
 XMLListInitialiser

-    : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop LexPopIn "</>" { $$ = CYNew CYXMLList($4); }
+    : "<>" 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; }


@@ -1651,20 +1848,14 @@ Statement__
 /* }}} */
 @end
 
 /* }}} */
 @end
 

-/* ECMAScript5: Object Literal Trailing Comma {{{ */
-PropertyNameAndValueList_
-    : "," { $$ = NULL; }
-    ;
-/* }}} */
-

 /* JavaScript 1.7: Array Comprehensions {{{ */
 IfComprehension
     : "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); }
     ;
 
 ForComprehension
 /* JavaScript 1.7: Array Comprehensions {{{ */
 IfComprehension
     : "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); }
     ;
 
 ForComprehension

-    : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); }
-    | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); }
+    : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); }
+    | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); }

     ;
 
 ComprehensionList
     ;
 
 ComprehensionList


@@ -1678,12 +1869,12 @@ ComprehensionListOpt
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

-    : "[" LexPushInOff AssignmentExpression ComprehensionList LexPopIn "]" { $$ = CYNew CYArrayComprehension($3, $4); }
+    : "[" LexPushInOff AssignmentExpression ComprehensionList "]" LexPopIn { $$ = CYNew CYArrayComprehension($3, $4); }

     ;
 /* }}} */
 /* JavaScript 1.7: for each {{{ */
 IterationStatement
     ;
 /* }}} */
 /* JavaScript 1.7: for each {{{ */
 IterationStatement

-    : "for" "each" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); }
+    : "for" "each" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); }

     ;
 /* }}} */
 /* JavaScript 1.7: let Statements {{{ */
     ;
 /* }}} */
 /* JavaScript 1.7: let Statements {{{ */


@@ -1722,7 +1913,7 @@ RubyProcExpression
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

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

     ;
 
 CallExpression
     ;
 
 CallExpression