Update included configure to match autoconf input.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 465b32b50f9e198445483dbc8339d1cb532bf51d..047983b940fffb71335c46bfa8a1e9f252d0d5a3 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-2012  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/>.
 **/
 /* }}} */


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


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

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

 @end
 
 @begin E4X
 @end
 
 @begin E4X


@@ -225,6 +231,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 %token AtImport "@import"
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 %token AtImport "@import"

+%token AtEncode "@encode"

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


@@ -448,6 +455,7 @@ 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
 %type <expression_> BoxableExpression
 
 @begin ObjectiveC
 %type <expression_> BoxableExpression


@@ -464,12 +472,17 @@ 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 <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 <type_> ModifiedType
+%type <typedIdentifier_> PrefixedType
+%type <expression_> PrimitiveType
+%type <type_> QualifiedType

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


@@ -477,7 +490,12 @@ 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_> TypedIdentifier
+%type <typedParameter_> TypedParameterList_
+%type <typedParameter_> TypedParameterList
+%type <typedParameter_> TypedParameterListOpt

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


@@ -539,8 +557,10 @@ LexNoFunction
     : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
     ;
 
     : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
     ;
 

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

     ;
 
 LexSetStatement
     ;
 
 LexSetStatement


@@ -705,7 +725,7 @@ TerminatorOpt
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical

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

     ;
 
 ParentheticalOpt
     ;
 
 ParentheticalOpt


@@ -713,9 +733,13 @@ 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; }


@@ -726,7 +750,7 @@ PrimaryExpression
 /* }}} */
 /* 11.1.4.1 Array Initialiser {{{ */
 ArrayLiteral
 /* }}} */
 /* 11.1.4.1 Array Initialiser {{{ */
 ArrayLiteral

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

     ;
 
 Element
     ;
 
 Element


@@ -750,7 +774,7 @@ ElementListOpt
 /* }}} */
 /* 11.1.4.2 Array Comprehension {{{ */
 PrimaryExpression
 /* }}} */
 /* 11.1.4.2 Array Comprehension {{{ */
 PrimaryExpression

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

     ;
 
 ComprehensionForList
     ;
 
 ComprehensionForList


@@ -766,12 +790,12 @@ ComprehensionForListOpt
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral

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

     ;
 
 PropertyDefinitionList_
     : "," PropertyDefinitionList { $$ = $2; }
     ;
 
 PropertyDefinitionList_
     : "," PropertyDefinitionList { $$ = $2; }

-    | "," { $$ = NULL; }
+    | "," LexSetRegExp { $$ = NULL; }

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


@@ -781,7 +805,7 @@ PropertyDefinitionList
 
 PropertyDefinitionListOpt
     : PropertyDefinitionList { $$ = $1; }
 
 PropertyDefinitionListOpt
     : PropertyDefinitionList { $$ = $1; }

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

     ;
 
 PropertyDefinition
     ;
 
 PropertyDefinition


@@ -804,7 +828,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; }
     ;


@@ -836,7 +860,7 @@ CallExpression
     ;
 
 Arguments
     ;
 
 Arguments

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

     ;
 
 ArgumentList_
     ;
 
 ArgumentList_


@@ -958,7 +982,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 {{{ */


@@ -1157,7 +1181,7 @@ 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
     ;
 
 ForStatementInitialiser


@@ -1167,8 +1191,8 @@ ForStatementInitialiser
 /* }}} */
 /* 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
     ;
 
 ForInStatementInitialiser


@@ -1191,7 +1215,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); }
     ;
 /* }}} */


@@ -1231,7 +1255,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); }
     ;
 /* }}} */


@@ -1262,7 +1286,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_


@@ -1304,7 +1328,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 {{{ */


@@ -1323,6 +1347,47 @@ ProgramBodyOpt
 /* }}} */
 
 @begin ObjectiveC
 /* }}} */
 
 @begin ObjectiveC

+/* Cycript (Objective-C): Type Encoding {{{ */
+SuffixedType
+    : IdentifierOpt { $$ = CYNew CYTypedIdentifier($1); }
+    | "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; }
+    | SuffixedType "[" NumericLiteral "]" { CYSetLast($1->type_) = CYNew CYTypeArrayOf($3); $$ = $1; }
+    ;
+
+PrefixedType
+    : SuffixedType { $$ = $1; }
+    | "const" PrefixedType { CYSetLast($2->type_) = CYNew CYTypeConstant(); $$ = $2; }
+    | "*" PrefixedType { CYSetLast($2->type_) = CYNew CYTypePointerTo(); $$ = $2; }
+    ;
+
+PrimitiveType
+    : Variable { $$ = $1; }
+    | "void" { $$  = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); }
+    ;
+
+QualifiedType
+    : PrimitiveType { $$ = CYNew CYTypeVariable($1); }
+    | "const" QualifiedType { $$ = CYNew CYTypeConstant($2); }
+    ;
+
+ModifiedType
+    : QualifiedType { $$ = $1; }
+    | QualifiedType "*" { $$ = CYNew CYTypePointerTo($1); }
+    | QualifiedType "const" { $$ = CYNew CYTypeConstant($1); }
+    ;
+
+TypedIdentifier
+    : QualifiedType PrefixedType { CYSetLast($2->type_) = $1; $$ = $2;}
+    ;
+
+EncodedType
+    : TypedIdentifier { $$ = CYNew CYEncodedType($1->type_); }
+    ;
+
+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? */


@@ -1332,7 +1397,7 @@ ClassSuperOpt
 
 ClassFieldListOpt
     : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
 
 ClassFieldListOpt
     : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }

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

     ;
 
 ClassFields
     ;
 
 ClassFields


@@ -1345,8 +1410,7 @@ MessageScope
     ;
 
 TypeOpt
     ;
 
 TypeOpt

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

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


@@ -1404,7 +1468,7 @@ ClassProtocolListOpt
     ;
 
 ClassExpression
     ;
 
 ClassExpression

-    : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields 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


@@ -1454,8 +1518,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_


@@ -1474,7 +1538,7 @@ 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 {{{ */


@@ -1509,6 +1573,25 @@ PrimaryExpression
     : "@" BoxableExpression { $$ = CYNew CYBox($2); }
     ;
 /* }}} */
     : "@" BoxableExpression { $$ = CYNew CYBox($2); }
     ;
 /* }}} */

+/* Cycript (Objective-C): Block Expressions {{{ */
+TypedParameterList_
+    : "," TypedParameterList { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+TypedParameterList
+    : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); }
+    ;
+
+TypedParameterListOpt
+    : TypedParameterList { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+PrimaryExpression
+    : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }
+    ;
+/* }}} */

 @end
 
 @begin C
 @end
 
 @begin C


@@ -1607,7 +1690,7 @@ AttributeIdentifier
 
 PropertySelector_
     : PropertySelector { $$ = $1; }
 
 PropertySelector_
     : PropertySelector { $$ = $1; }

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

     ;
 
 PropertySelector
     ;
 
 PropertySelector


@@ -1637,8 +1720,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


@@ -1687,7 +1770,7 @@ 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); }

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


@@ -1735,12 +1818,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 {{{ */


@@ -1779,7 +1862,7 @@ RubyProcExpression
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

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

     ;
 
 CallExpression
     ;
 
 CallExpression