Half fixed (at least it doesn't throw an exception anymore) NSDictionaries that have...

[cycript.git] / Cycript.y.in

diff --git a/Cycript.y.in b/Cycript.y.in
index 37e76112ae5255b83faa780a4e82a77a0bd42b40..79d277da4a7b96580f1fc94fab50cd41a45ddb92 100644 (file)
--- a/Cycript.y.in
+++ b/Cycript.y.in
@@ -51,7 +51,7 @@
 @end
 
 @begin E4X
 @end
 
 @begin E4X

-#include "E4X.hpp"
+#include "E4X/Syntax.hpp"

 @end
 
 typedef struct {
 @end
 
 typedef struct {


@@ -103,6 +103,8 @@ typedef struct {
 
 @begin E4X
         CYAttribute *attribute_;
 
 @begin E4X
         CYAttribute *attribute_;

+        CYPropertyIdentifier *propertyIdentifier_;
+        CYSelector *selector_;

 @end
     };
 } YYSTYPE;
 @end
     };
 } YYSTYPE;


@@ -151,11 +153,14 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %token SlashRight "/>"
 %token LeftSlash "</"
 
 %token SlashRight "/>"
 %token LeftSlash "</"
 

-%token At "@"

 %token ColonColon "::"
 %token PeriodPeriod ".."
 @end
 
 %token ColonColon "::"
 %token PeriodPeriod ".."
 @end
 

+@begin E4X ObjectiveC
+%token At "@"
+@end
+

 %token Ampersand "&"
 %token AmpersandAmpersand "&&"
 %token AmpersandEqual "&="
 %token Ampersand "&"
 %token AmpersandAmpersand "&&"
 %token AmpersandEqual "&="


@@ -316,6 +321,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <literal_> ArrayLiteral
 %type <expression_> AssigneeExpression
 %type <expression_> AssigneeExpressionNoBF
 %type <literal_> ArrayLiteral
 %type <expression_> AssigneeExpression
 %type <expression_> AssigneeExpressionNoBF

+%type <expression_> AssigneeExpressionNoRE

 %type <expression_> AssignmentExpression
 %type <assignment_> AssignmentExpression_
 %type <expression_> AssignmentExpressionNoBF
 %type <expression_> AssignmentExpression
 %type <assignment_> AssignmentExpression_
 %type <expression_> AssignmentExpressionNoBF


@@ -335,6 +341,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <statement_> BreakStatement
 %type <expression_> CallExpression
 %type <expression_> CallExpressionNoBF
 %type <statement_> BreakStatement
 %type <expression_> CallExpression
 %type <expression_> CallExpressionNoBF

+%type <expression_> CallExpressionNoRE

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


@@ -387,8 +394,11 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <statement_> LabelledStatement
 %type <expression_> LeftHandSideExpression
 %type <expression_> LeftHandSideExpressionNoBF
 %type <statement_> LabelledStatement
 %type <expression_> LeftHandSideExpression
 %type <expression_> LeftHandSideExpressionNoBF

+%type <expression_> LeftHandSideExpressionNoRE

 //%type <statement_> LetStatement
 %type <literal_> Literal
 //%type <statement_> LetStatement
 %type <literal_> Literal

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

 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalANDExpressionNoBF
 %type <expression_> LogicalANDExpressionNoIn
 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalANDExpressionNoBF
 %type <expression_> LogicalANDExpressionNoIn


@@ -399,21 +409,26 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> MemberExpression
 %type <expression_> MemberExpression_
 %type <expression_> MemberExpressionNoBF
 %type <expression_> MemberExpression
 %type <expression_> MemberExpression_
 %type <expression_> MemberExpressionNoBF

+%type <expression_> MemberExpressionNoRE

 %type <expression_> MultiplicativeExpression
 %type <expression_> MultiplicativeExpressionNoBF
 %type <expression_> NewExpression
 %type <expression_> NewExpression_
 %type <expression_> NewExpressionNoBF
 %type <expression_> MultiplicativeExpression
 %type <expression_> MultiplicativeExpressionNoBF
 %type <expression_> NewExpression
 %type <expression_> NewExpression_
 %type <expression_> NewExpressionNoBF

+%type <expression_> NewExpressionNoRE

 %type <null_> NullLiteral
 %type <literal_> ObjectLiteral
 %type <expression_> PostfixExpression
 %type <expression_> PostfixExpressionNoBF
 %type <null_> NullLiteral
 %type <literal_> ObjectLiteral
 %type <expression_> PostfixExpression
 %type <expression_> PostfixExpressionNoBF

+%type <expression_> PostfixExpressionNoRE

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

-%type <expression_> PrimaryExpression_
+%type <expression_> PrimaryExpressionNo

 %type <expression_> PrimaryExpressionNoBF
 %type <expression_> PrimaryExpressionNoBF

-%type <expression_> PrimaryExpressionNoBF_
+%type <expression_> PrimaryExpressionNoRE
+%type <expression_> PrimaryExpressionBF

 %type <statement_> Program
 %type <propertyName_> PropertyName
 %type <statement_> Program
 %type <propertyName_> PropertyName

+%type <propertyName_> PropertyName_

 %type <property_> PropertyNameAndValueList
 %type <property_> PropertyNameAndValueList_
 %type <property_> PropertyNameAndValueListOpt
 %type <property_> PropertyNameAndValueList
 %type <property_> PropertyNameAndValueList_
 %type <property_> PropertyNameAndValueListOpt


@@ -439,6 +454,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> UnaryExpression
 %type <expression_> UnaryExpression_
 %type <expression_> UnaryExpressionNoBF
 %type <expression_> UnaryExpression
 %type <expression_> UnaryExpression_
 %type <expression_> UnaryExpressionNoBF

+%type <expression_> UnaryExpressionNoRE

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


@@ -478,9 +494,9 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 @end
 
 @begin E4X
 @end
 
 @begin E4X

-%type <identifier_> PropertyIdentifier_
-%type <identifier_> PropertySelector
-%type <identifier_> PropertySelector_
+%type <propertyIdentifier_> PropertyIdentifier_
+%type <selector_> PropertySelector
+%type <selector_> PropertySelector_

 %type <identifier_> QualifiedIdentifier
 %type <identifier_> QualifiedIdentifier_
 %type <identifier_> WildcardIdentifier
 %type <identifier_> QualifiedIdentifier
 %type <identifier_> QualifiedIdentifier_
 %type <identifier_> WildcardIdentifier


@@ -492,13 +508,20 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <identifier_> XMLPI
 
 %type <attribute_> AttributeIdentifier
 %type <identifier_> XMLPI
 
 %type <attribute_> AttributeIdentifier

-%type <statement_> DefaultXMLNamespaceStatement
+/* XXX: %type <statement_> DefaultXMLNamespaceStatement */

 %type <expression_> PropertyIdentifier
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end
 
 %type <expression_> PropertyIdentifier
 %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"
+
+%nonassoc "if"
+%nonassoc "else"
+
+%nonassoc "++" "--"
+%nonassoc "(" "["
+

 %left "*" "/" "%"
 %left "+" "-"
 %left "<<" ">>" ">>>"
 %left "*" "/" "%"
 %left "+" "-"
 %left "<<" ">>" ">>>"


@@ -511,10 +534,6 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %left "||"
 
 %right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="
 %left "||"
 
 %right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="

-*/
-
-%nonassoc "if"
-%nonassoc "else"

 
 %start Program
 
 
 %start Program
 


@@ -579,7 +598,7 @@ Word
     | "extends" { $$ = $1; }
     | "false" { $$ = $1; }
     | "finally" { $$ = $1; }
     | "extends" { $$ = $1; }
     | "false" { $$ = $1; }
     | "finally" { $$ = $1; }

-    | "for" { $$ = $1; }
+    /* XXX: | "for" { $$ = $1; } */

     | "function" { $$ = $1; }
     | "if" { $$ = $1; }
     | "import" { $$ = $1; }
     | "function" { $$ = $1; }
     | "if" { $$ = $1; }
     | "import" { $$ = $1; }


@@ -641,12 +660,21 @@ IdentifierOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-Literal
+LiteralNoRE

     : NullLiteral { $$ = $1; }
     | BooleanLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }
     : NullLiteral { $$ = $1; }
     | BooleanLiteral { $$ = $1; }
     | NumericLiteral { $$ = $1; }
     | StringLiteral { $$ = $1; }

-    | RegularExpressionLiteral { $$ = $1; }
+    | "@" StringLiteral { $$ = $2; }
+    ;
+
+LiteralRE
+    : RegularExpressionLiteral { $$ = $1; }
+    ;
+
+Literal
+    : LiteralNoRE { $$ = $1; }
+    | LiteralRE { $$ = $1; }

     ;
 
 NullLiteral
     ;
 
 NullLiteral


@@ -659,12 +687,20 @@ BooleanLiteral
     ;
 
 /* 11.1 Primary Expressions {{{ */
     ;
 
 /* 11.1 Primary Expressions {{{ */

-PrimaryExpression_
-    : ObjectLiteral { $$ = $1; }
-    | PrimaryExpressionNoBF_ { $$ = $1; }
+PrimaryExpression
+    : LexSetRegExp PrimaryExpressionNoRE { $$ = $2; }
+    ;
+
+PrimaryExpressionNoBF
+    : PrimaryExpressionNo { $$ = $1; }
+    ;
+
+PrimaryExpressionNoRE
+    : PrimaryExpressionBF { $$ = $1; }
+    | PrimaryExpressionNo { $$ = $1; }

     ;
 
     ;
 

-PrimaryExpressionNoBF_
+PrimaryExpressionNo

     : "this" { $$ = $1; }
     | Identifier { $$ = new(driver.pool_) CYVariable($1); }
     | Literal { $$ = $1; }
     : "this" { $$ = $1; }
     | Identifier { $$ = new(driver.pool_) CYVariable($1); }
     | Literal { $$ = $1; }


@@ -672,12 +708,8 @@ PrimaryExpressionNoBF_
     | "(" Expression ")" { $$ = $2; }
     ;
 
     | "(" Expression ")" { $$ = $2; }
     ;
 

-PrimaryExpression
-    : LexSetRegExp PrimaryExpression_ { $$ = $2; }
-    ;
-
-PrimaryExpressionNoBF
-    : PrimaryExpressionNoBF_ { $$ = $1; }
+PrimaryExpressionBF
+    : ObjectLiteral { $$ = $1; }

     ;
 /* }}} */
 /* 11.1.4 Array Initialiser {{{ */
     ;
 /* }}} */
 /* 11.1.4 Array Initialiser {{{ */


@@ -723,11 +755,15 @@ PropertyNameAndValueList
     : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
     ;
 
     : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
     ;
 

-PropertyName
+PropertyName_

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

+
+PropertyName
+    : LexSetRegExp PropertyName_ { $$ = $2; }
+    ;

 /* }}} */
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 /* }}} */
 
 /* 11.2 Left-Hand-Side Expressions {{{ */


@@ -742,7 +778,7 @@ MemberAccess
 
 MemberExpression
     : PrimaryExpression { $$ = $1; }
 
 MemberExpression
     : PrimaryExpression { $$ = $1; }

-    | FunctionExpression { $$ = $1; }
+    | LexSetRegExp FunctionExpression { $$ = $2; }

     | MemberExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
     | LexSetRegExp MemberExpression_ { $$ = $2; }
     ;
     | MemberExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
     | LexSetRegExp MemberExpression_ { $$ = $2; }
     ;


@@ -753,6 +789,13 @@ MemberExpressionNoBF
     | MemberExpression_ { $$ = $1; }
     ;
 
     | MemberExpression_ { $$ = $1; }
     ;
 

+MemberExpressionNoRE
+    : PrimaryExpressionNoRE { $$ = $1; }
+    | FunctionExpression { $$ = $1; }
+    | MemberExpressionNoRE MemberAccess { $2->SetLeft($1); $$ = $2; }
+    | MemberExpression_ { $$ = $1; }
+    ;
+

 NewExpression_
     : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); }
     ;
 NewExpression_
     : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); }
     ;


@@ -767,6 +810,11 @@ NewExpressionNoBF
     | NewExpression_ { $$ = $1; }
     ;
 
     | NewExpression_ { $$ = $1; }
     ;
 

+NewExpressionNoRE
+    : MemberExpressionNoRE { $$ = $1; }
+    | NewExpression_ { $$ = $1; }
+    ;
+

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


@@ -779,6 +827,12 @@ CallExpressionNoBF
     | CallExpressionNoBF MemberAccess { $2->SetLeft($1); $$ = $2; }
     ;
 
     | CallExpressionNoBF MemberAccess { $2->SetLeft($1); $$ = $2; }
     ;
 

+CallExpressionNoRE
+    : MemberExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    | CallExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    | CallExpressionNoRE MemberAccess { $2->SetLeft($1); $$ = $2; }
+    ;
+

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


@@ -806,6 +860,11 @@ LeftHandSideExpressionNoBF
     : NewExpressionNoBF { $$ = $1; }
     | CallExpressionNoBF { $$ = $1; }
     ;
     : NewExpressionNoBF { $$ = $1; }
     | CallExpressionNoBF { $$ = $1; }
     ;

+
+LeftHandSideExpressionNoRE
+    : NewExpressionNoRE { $$ = $1; }
+    | CallExpressionNoRE { $$ = $1; }
+    ;

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


@@ -819,6 +878,12 @@ PostfixExpressionNoBF
     | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
     | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
     ;
     | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
     | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
     ;

+
+PostfixExpressionNoRE
+    : AssigneeExpressionNoRE { $$ = $1; }
+    | LeftHandSideExpressionNoRE "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
+    | LeftHandSideExpressionNoRE "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+    ;

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


@@ -844,6 +909,11 @@ UnaryExpressionNoBF
     : PostfixExpressionNoBF { $$ = $1; }
     | UnaryExpression_ { $$ = $1; }
     ;
     : PostfixExpressionNoBF { $$ = $1; }
     | UnaryExpression_ { $$ = $1; }
     ;

+
+UnaryExpressionNoRE
+    : PostfixExpressionNoRE { $$ = $1; }
+    | UnaryExpression_ { $$ = $1; }
+    ;

 /* }}} */
 /* 11.5 Multiplicative Operators {{{ */
 MultiplicativeExpression
 /* }}} */
 /* 11.5 Multiplicative Operators {{{ */
 MultiplicativeExpression


@@ -1061,6 +1131,11 @@ AssigneeExpressionNoBF
     | UnaryAssigneeExpression { $$ = $1; }
     ;
 
     | UnaryAssigneeExpression { $$ = $1; }
     ;
 

+AssigneeExpressionNoRE
+    : LeftHandSideExpressionNoRE { $$ = $1; }
+    | UnaryAssigneeExpression { $$ = $1; }
+    ;
+

 AssignmentExpression
     : ConditionalExpression { $$ = $1; }
     | AssigneeExpression AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
 AssignmentExpression
     : ConditionalExpression { $$ = $1; }
     | AssigneeExpression AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }


@@ -1346,7 +1421,7 @@ FunctionDeclaration
     ;
 
 FunctionExpression
     ;
 
 FunctionExpression

-    : LexSetRegExp "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($3, $5, $8); }
+    : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($2, $4, $7); }

     ;
 
 FormalParameterList_
     ;
 
 FormalParameterList_


@@ -1454,7 +1529,7 @@ CategoryStatement
     : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYCategory($2, $3); }
     ;
 
     : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYCategory($2, $3); }
     ;
 

-PrimaryExpression_
+PrimaryExpressionBF

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


@@ -1502,7 +1577,7 @@ SelectorExpression
     | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
     ;
 
     | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
     ;
 

-PrimaryExpressionNoBF_
+PrimaryExpressionNo

     : MessageExpression { $$ = $1; }
     | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); }
     ;
     : MessageExpression { $$ = $1; }
     | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); }
     ;


@@ -1512,7 +1587,7 @@ PrimaryExpressionNoBF_
 @begin C
 /* Cycript (C): Pointer Indirection/Addressing {{{ */
 UnaryAssigneeExpression
 @begin C
 /* Cycript (C): Pointer Indirection/Addressing {{{ */
 UnaryAssigneeExpression

-    : "^" UnaryExpression { $$ = new(driver.pool_) CYIndirect($2); }
+    : "*" UnaryExpressionNoRE { $$ = new(driver.pool_) CYIndirect($2); }

     ;
 
 UnaryExpression_
     ;
 
 UnaryExpression_


@@ -1572,8 +1647,8 @@ XMLMarkup
     ;
 /* }}} */
 /* 11.1 Primary Expressions {{{ */
     ;
 /* }}} */
 /* 11.1 Primary Expressions {{{ */

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

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


@@ -1590,23 +1665,23 @@ AttributeIdentifier
     ;
 
 PropertySelector_
     ;
 
 PropertySelector_

-    : PropertySelector
-    | "[" Expression "]"
+    : PropertySelector { $$ = $1; }
+    | "[" Expression "]" { $$ = new(driver.pool_) CYSelector($2); }

     ;
 
 PropertySelector
     ;
 
 PropertySelector

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

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

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

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

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

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


@@ -1621,16 +1696,12 @@ XMLInitialiser
     ;
 
 XMLElement
     ;
 
 XMLElement

-    : "<" XMLTagContent_ "/>" LexPop
-    | "<" XMLTagContent_ ">" LexSetXMLContent XMLElementContentOpt "</" LexSetXMLTag XMLTagName XMLWhitespaceOpt ">" LexPop
-    ;
-
-XMLTagContent_
-    : LexPushXMLTag XMLTagContent XMLWhitespaceOpt
+    : "<" XMLTagContent "/>" LexPop
+    | "<" XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "</" LexSetXMLTag XMLTagName XMLWhitespaceOpt ">" LexPop

     ;
 
 XMLTagContent
     ;
 
 XMLTagContent

-    : XMLTagName XMLAttributesOpt
+    : LexPushXMLTag XMLTagName XMLAttributes

     ;
 
 XMLExpression
     ;
 
 XMLExpression


@@ -1642,14 +1713,14 @@ XMLTagName
     | XMLName
     ;
 
     | XMLName
     ;
 

-XMLAttributes
-    : XMLWhitespace XMLExpression
-    | XMLAttributeOpt XMLAttributes
+XMLAttributes_
+    : XMLAttributes_ XMLAttribute
+    |

     ;
 
     ;
 

-XMLAttributesOpt
-    : XMLAttributes
-    |
+XMLAttributes
+    : XMLAttributes_ XMLWhitespace XMLExpression XMLWhitespaceOpt
+    | XMLAttributes_ XMLWhitespaceOpt

     ;
 
 XMLAttributeValue_
     ;
 
 XMLAttributeValue_


@@ -1661,11 +1732,6 @@ XMLAttribute
     : XMLWhitespace XMLName XMLWhitespaceOpt "=" XMLWhitespaceOpt XMLAttributeValue_
     ;
 
     : XMLWhitespace XMLName XMLWhitespaceOpt "=" XMLWhitespaceOpt XMLAttributeValue_
     ;
 

-XMLAttributeOpt
-    : XMLAttribute
-    |
-    ;
-

 XMLElementContent
     : XMLExpression XMLElementContentOpt
     | XMLMarkup XMLElementContentOpt
 XMLElementContent
     : XMLExpression XMLElementContentOpt
     | XMLMarkup XMLElementContentOpt


@@ -1685,7 +1751,7 @@ XMLListInitialiser
 /* }}} */
 /* 11.2 Left-Hand-Side Expressions {{{ */
 PropertyIdentifier_
 /* }}} */
 /* 11.2 Left-Hand-Side Expressions {{{ */
 PropertyIdentifier_

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

     | PropertyIdentifier { $$ = $1; }
     ;
 
     | PropertyIdentifier { $$ = $1; }
     ;
 


@@ -1696,13 +1762,13 @@ MemberAccess
     ;
 /* }}} */
 /* 12.1 The default xml namespace Statement {{{ */
     ;
 /* }}} */
 /* 12.1 The default xml namespace Statement {{{ */

-DefaultXMLNamespaceStatement
+/* XXX: DefaultXMLNamespaceStatement

     : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); }
     ;
 
 Statement_
     : DefaultXMLNamespaceStatement { $$ = $1; }
     : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); }
     ;
 
 Statement_
     : DefaultXMLNamespaceStatement { $$ = $1; }

-    ;
+    ; */

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


@@ -1731,7 +1797,7 @@ ComprehensionList
     : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; }
     ;
 
     : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; }
     ;
 

-PrimaryExpressionNoBF_
+PrimaryExpressionNo

     : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); }
     ;
 /* }}} */
     : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); }
     ;
 /* }}} */