Mostly fixed the unary star problem.

diff --git a/Cycript.y.in b/Cycript.y.in
index 37e76112ae5255b83faa780a4e82a77a0bd42b40..37b9203a65973d5a817dd0fc78373e8be8ec2fbd 100644 (file)
--- a/Cycript.y.in
+++ b/Cycript.y.in
@@ -309,6 +309,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 
 %type <expression_> AdditiveExpression
 %type <expression_> AdditiveExpressionNoBF
 
 %type <expression_> AdditiveExpression
 %type <expression_> AdditiveExpressionNoBF

+%type <expression_> AdditiveExpressionNoWC

 %type <argument_> ArgumentList
 %type <argument_> ArgumentList_
 %type <argument_> ArgumentListOpt
 %type <argument_> ArgumentList
 %type <argument_> ArgumentList_
 %type <argument_> ArgumentListOpt


@@ -316,22 +317,27 @@ 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_> AssigneeExpressionNoWC

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

+%type <expression_> AssignmentExpressionNoWC

 %type <expression_> BitwiseANDExpression
 %type <expression_> BitwiseANDExpressionNoBF
 %type <expression_> BitwiseANDExpressionNoIn
 %type <expression_> BitwiseANDExpression
 %type <expression_> BitwiseANDExpressionNoBF
 %type <expression_> BitwiseANDExpressionNoIn

+%type <expression_> BitwiseANDExpressionNoWC

 %type <statement_> Block
 %type <statement_> Block_
 %type <boolean_> BooleanLiteral
 %type <expression_> BitwiseORExpression
 %type <expression_> BitwiseORExpressionNoBF
 %type <expression_> BitwiseORExpressionNoIn
 %type <statement_> Block
 %type <statement_> Block_
 %type <boolean_> BooleanLiteral
 %type <expression_> BitwiseORExpression
 %type <expression_> BitwiseORExpressionNoBF
 %type <expression_> BitwiseORExpressionNoIn

+%type <expression_> BitwiseORExpressionNoWC

 %type <expression_> BitwiseXORExpression
 %type <expression_> BitwiseXORExpressionNoBF
 %type <expression_> BitwiseXORExpressionNoIn
 %type <expression_> BitwiseXORExpression
 %type <expression_> BitwiseXORExpressionNoBF
 %type <expression_> BitwiseXORExpressionNoIn

+%type <expression_> BitwiseXORExpressionNoWC

 %type <statement_> BreakStatement
 %type <expression_> CallExpression
 %type <expression_> CallExpressionNoBF
 %type <statement_> BreakStatement
 %type <expression_> CallExpression
 %type <expression_> CallExpressionNoBF


@@ -344,6 +350,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> ConditionalExpression
 %type <expression_> ConditionalExpressionNoBF
 %type <expression_> ConditionalExpressionNoIn
 %type <expression_> ConditionalExpression
 %type <expression_> ConditionalExpressionNoBF
 %type <expression_> ConditionalExpressionNoIn

+%type <expression_> ConditionalExpressionNoWC

 %type <statement_> ContinueStatement
 %type <clause_> DefaultClause
 %type <statement_> DoWhileStatement
 %type <statement_> ContinueStatement
 %type <clause_> DefaultClause
 %type <statement_> DoWhileStatement


@@ -356,6 +363,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> EqualityExpression
 %type <expression_> EqualityExpressionNoBF
 %type <expression_> EqualityExpressionNoIn
 %type <expression_> EqualityExpression
 %type <expression_> EqualityExpressionNoBF
 %type <expression_> EqualityExpressionNoIn

+%type <expression_> EqualityExpressionNoWC

 %type <expression_> Expression
 %type <expression_> ExpressionOpt
 %type <compound_> Expression_
 %type <expression_> Expression
 %type <expression_> ExpressionOpt
 %type <compound_> Expression_


@@ -375,6 +383,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <statement_> FunctionBody
 %type <statement_> FunctionDeclaration
 %type <expression_> FunctionExpression
 %type <statement_> FunctionBody
 %type <statement_> FunctionDeclaration
 %type <expression_> FunctionExpression

+%type <expression_> FunctionExpression_

 %type <identifier_> Identifier
 %type <identifier_> IdentifierOpt
 %type <comprehension_> IfComprehension
 %type <identifier_> Identifier
 %type <identifier_> IdentifierOpt
 %type <comprehension_> IfComprehension


@@ -387,31 +396,45 @@ 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_> LeftHandSideExpressionNoWC

 //%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

+%type <expression_> LogicalANDExpressionNoWC

 %type <expression_> LogicalORExpression
 %type <expression_> LogicalORExpressionNoBF
 %type <expression_> LogicalORExpressionNoIn
 %type <expression_> LogicalORExpression
 %type <expression_> LogicalORExpressionNoBF
 %type <expression_> LogicalORExpressionNoIn

+%type <expression_> LogicalORExpressionNoWC

 %type <member_> MemberAccess
 %type <expression_> MemberExpression
 %type <expression_> MemberExpression_
 %type <expression_> MemberExpressionNoBF
 %type <member_> MemberAccess
 %type <expression_> MemberExpression
 %type <expression_> MemberExpression_
 %type <expression_> MemberExpressionNoBF

+%type <expression_> MemberExpressionNoWC

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

+%type <expression_> MultiplicativeExpressionNoWC

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

+%type <expression_> NewExpressionNoWC

 %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_> PostfixExpressionNoWC

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

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

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

-%type <expression_> PrimaryExpressionNoBF_
+%type <expression_> PrimaryExpressionNoWC
+%type <expression_> PrimaryExpressionNoWC_
+@begin E4X
+%type <expression_> PrimaryExpressionWC
+@end
+%type <expression_> PrimaryExpressionBF

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


@@ -421,10 +444,12 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <infix_> RelationalExpression_
 %type <expression_> RelationalExpressionNoBF
 %type <expression_> RelationalExpressionNoIn
 %type <infix_> RelationalExpression_
 %type <expression_> RelationalExpressionNoBF
 %type <expression_> RelationalExpressionNoIn

+%type <expression_> RelationalExpressionNoWC

 %type <infix_> RelationalExpressionNoIn_
 %type <statement_> ReturnStatement
 %type <expression_> ShiftExpression
 %type <expression_> ShiftExpressionNoBF
 %type <infix_> RelationalExpressionNoIn_
 %type <statement_> ReturnStatement
 %type <expression_> ShiftExpression
 %type <expression_> ShiftExpressionNoBF

+%type <expression_> ShiftExpressionNoWC

 %type <statement_> SourceElement
 %type <statement_> SourceElement_
 %type <statement_> SourceElements
 %type <statement_> SourceElement
 %type <statement_> SourceElement_
 %type <statement_> SourceElements


@@ -439,6 +464,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_> UnaryExpressionNoWC

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


@@ -579,7 +605,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 +667,20 @@ IdentifierOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-Literal
+LiteralNoRE

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

-    | RegularExpressionLiteral { $$ = $1; }
+    ;
+
+LiteralRE
+    : RegularExpressionLiteral { $$ = $1; }
+    ;
+
+Literal
+    : LiteralNoRE { $$ = $1; }
+    | LiteralRE { $$ = $1; }

     ;
 
 NullLiteral
     ;
 
 NullLiteral


@@ -659,12 +693,30 @@ BooleanLiteral
     ;
 
 /* 11.1 Primary Expressions {{{ */
     ;
 
 /* 11.1 Primary Expressions {{{ */

-PrimaryExpression_
-    : ObjectLiteral { $$ = $1; }
-    | PrimaryExpressionNoBF_ { $$ = $1; }
+PrimaryExpression
+    : PrimaryExpressionNoWC { $$ = $1; }
+@begin E4X
+    | LexSetRegExp PrimaryExpressionWC { $$ = $1; }
+@end

     ;
 
     ;
 

-PrimaryExpressionNoBF_
+PrimaryExpressionNoBF
+    : PrimaryExpressionNo { $$ = $1; }
+@begin E4X
+    | PrimaryExpressionWC { $$ = $1; }
+@end
+    ;
+
+PrimaryExpressionNoWC_
+    : PrimaryExpressionBF { $$ = $1; }
+    | PrimaryExpressionNo { $$ = $1; }
+    ;
+
+PrimaryExpressionNoWC
+    : LexSetRegExp PrimaryExpressionNoWC_ { $$ = $2; }
+    ;
+
+PrimaryExpressionNo

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


@@ -672,12 +724,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 {{{ */


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

+MemberExpressionNoWC
+    : PrimaryExpressionNoWC { $$ = $1; }
+    | FunctionExpression { $$ = $1; }
+    | MemberExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
+    | LexSetRegExp MemberExpression_ { $$ = $2; }
+    ;
+

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


@@ -767,8 +822,13 @@ NewExpressionNoBF
     | NewExpression_ { $$ = $1; }
     ;
 
     | NewExpression_ { $$ = $1; }
     ;
 

+NewExpressionNoWC
+    : MemberExpressionNoWC { $$ = $1; }
+    | LexSetRegExp NewExpression_ { $$ = $2; }
+    ;
+

 CallExpression
 CallExpression

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

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


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

+
+LeftHandSideExpressionNoWC
+    : NewExpressionNoWC { $$ = $1; }
+    | CallExpression { $$ = $1; }
+    ;

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


@@ -819,6 +884,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); }
     ;

+
+PostfixExpressionNoWC
+    : AssigneeExpressionNoWC { $$ = $1; }
+    | LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
+    | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+    ;

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


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

+
+UnaryExpressionNoWC
+    : PostfixExpressionNoWC { $$ = $1; }
+    | LexSetRegExp UnaryExpression_ { $$ = $2; }
+    ;

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


@@ -859,6 +935,13 @@ MultiplicativeExpressionNoBF
     | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
     | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
     ;
     | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
     | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
     ;

+
+MultiplicativeExpressionNoWC
+    : UnaryExpressionNoWC { $$ = $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); }
+    ;

 /* }}} */
 /* 11.6 Additive Operators {{{ */
 AdditiveExpression
 /* }}} */
 /* 11.6 Additive Operators {{{ */
 AdditiveExpression


@@ -872,6 +955,12 @@ AdditiveExpressionNoBF
     | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
     | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
     ;
     | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
     | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
     ;

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

 /* }}} */
 /* 11.7 Bitwise Shift Operators {{{ */
 ShiftExpression
 /* }}} */
 /* 11.7 Bitwise Shift Operators {{{ */
 ShiftExpression


@@ -887,6 +976,13 @@ ShiftExpressionNoBF
     | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
     | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
     ;
     | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
     | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
     ;

+
+ShiftExpressionNoWC
+    : AdditiveExpressionNoWC { $$ = $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); }
+    ;

 /* }}} */
 /* 11.8 Relational Operators {{{ */
 RelationalExpressionNoIn_
 /* }}} */
 /* 11.8 Relational Operators {{{ */
 RelationalExpressionNoIn_


@@ -916,6 +1012,11 @@ RelationalExpressionNoBF
     : ShiftExpressionNoBF { $$ = $1; }
     | RelationalExpressionNoBF RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
     ;
     : ShiftExpressionNoBF { $$ = $1; }
     | RelationalExpressionNoBF RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
     ;

+
+RelationalExpressionNoWC
+    : ShiftExpressionNoWC { $$ = $1; }
+    | RelationalExpression RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
+    ;

 /* }}} */
 /* 11.9 Equality Operators {{{ */
 EqualityExpression
 /* }}} */
 /* 11.9 Equality Operators {{{ */
 EqualityExpression


@@ -941,6 +1042,14 @@ EqualityExpressionNoBF
     | EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
     | EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
     ;
     | EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
     | EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
     ;

+
+EqualityExpressionNoWC
+    : RelationalExpressionNoWC { $$ = $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); }
+    ;

 /* }}} */
 /* 11.10 Binary Bitwise Operators {{{ */
 BitwiseANDExpression
 /* }}} */
 /* 11.10 Binary Bitwise Operators {{{ */
 BitwiseANDExpression


@@ -958,6 +1067,11 @@ BitwiseANDExpressionNoBF
     | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
     ;
 
     | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
     ;
 

+BitwiseANDExpressionNoWC
+    : EqualityExpressionNoWC { $$ = $1; }
+    | BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+    ;
+

 BitwiseXORExpression
     : BitwiseANDExpression { $$ = $1; }
     | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
 BitwiseXORExpression
     : BitwiseANDExpression { $$ = $1; }
     | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }


@@ -973,6 +1087,11 @@ BitwiseXORExpressionNoBF
     | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
     ;
 
     | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
     ;
 

+BitwiseXORExpressionNoWC
+    : BitwiseANDExpressionNoWC { $$ = $1; }
+    | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+    ;
+

 BitwiseORExpression
     : BitwiseXORExpression { $$ = $1; }
     | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
 BitwiseORExpression
     : BitwiseXORExpression { $$ = $1; }
     | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }


@@ -987,6 +1106,11 @@ BitwiseORExpressionNoBF
     : BitwiseXORExpressionNoBF { $$ = $1; }
     | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
     ;
     : BitwiseXORExpressionNoBF { $$ = $1; }
     | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
     ;

+
+BitwiseORExpressionNoWC
+    : BitwiseXORExpressionNoWC { $$ = $1; }
+    | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+    ;

 /* }}} */
 /* 11.11 Binary Logical Operators {{{ */
 LogicalANDExpression
 /* }}} */
 /* 11.11 Binary Logical Operators {{{ */
 LogicalANDExpression


@@ -1004,6 +1128,11 @@ LogicalANDExpressionNoBF
     | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
     ;
 
     | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
     ;
 

+LogicalANDExpressionNoWC
+    : BitwiseORExpressionNoWC { $$ = $1; }
+    | LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+    ;
+

 LogicalORExpression
     : LogicalANDExpression { $$ = $1; }
     | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
 LogicalORExpression
     : LogicalANDExpression { $$ = $1; }
     | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }


@@ -1018,6 +1147,11 @@ LogicalORExpressionNoBF
     : LogicalANDExpressionNoBF { $$ = $1; }
     | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
     ;
     : LogicalANDExpressionNoBF { $$ = $1; }
     | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
     ;

+
+LogicalORExpressionNoWC
+    : LogicalANDExpressionNoWC { $$ = $1; }
+    | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+    ;

 /* }}} */
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression
 /* }}} */
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression


@@ -1034,6 +1168,11 @@ ConditionalExpressionNoBF
     : LogicalORExpressionNoBF { $$ = $1; }
     | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
     ;
     : LogicalORExpressionNoBF { $$ = $1; }
     | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
     ;

+
+ConditionalExpressionNoWC
+    : LogicalORExpressionNoWC { $$ = $1; }
+    | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+    ;

 /* }}} */
 /* 11.13 Assignment Operators {{{ */
 AssignmentExpression_
 /* }}} */
 /* 11.13 Assignment Operators {{{ */
 AssignmentExpression_


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

+AssigneeExpressionNoWC
+    : LeftHandSideExpressionNoWC { $$ = $1; }
+    | LexSetRegExp UnaryAssigneeExpression { $$ = $2; }
+    ;
+

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


@@ -1086,6 +1230,11 @@ AssignmentExpressionNoBF
     : ConditionalExpressionNoBF { $$ = $1; }
     | AssigneeExpressionNoBF AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
     ;
     : ConditionalExpressionNoBF { $$ = $1; }
     | AssigneeExpressionNoBF AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
     ;

+
+AssignmentExpressionNoWC
+    : ConditionalExpressionNoWC { $$ = $1; }
+    | AssigneeExpression AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
+    ;

 /* }}} */
 /* 11.14 Comma Operator {{{ */
 Expression_
 /* }}} */
 /* 11.14 Comma Operator {{{ */
 Expression_


@@ -1345,8 +1494,12 @@ FunctionDeclaration
     : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionStatement($2, $4, $7); }
     ;
 
     : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionStatement($2, $4, $7); }
     ;
 

+FunctionExpression_
+    : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($2, $4, $7); }
+    ;
+

 FunctionExpression
 FunctionExpression

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

     ;
 
 FormalParameterList_
     ;
 
 FormalParameterList_


@@ -1454,7 +1607,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; }
     ;
 


@@ -1484,7 +1637,7 @@ SelectorList
     ;
 
 MessageExpression
     ;
 
 MessageExpression

-    : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYSendDirect($2, $3); }
+    : "[" AssignmentExpressionNoWC SelectorList "]" { $$ = new(driver.pool_) CYSendDirect($2, $3); }

     | "[" LexSetRegExp "super" SelectorList "]" { $$ = new(driver.pool_) CYSendSuper($4); }
     ;
 
     | "[" LexSetRegExp "super" SelectorList "]" { $$ = new(driver.pool_) CYSendSuper($4); }
     ;
 


@@ -1502,7 +1655,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 +1665,7 @@ PrimaryExpressionNoBF_
 @begin C
 /* Cycript (C): Pointer Indirection/Addressing {{{ */
 UnaryAssigneeExpression
 @begin C
 /* Cycript (C): Pointer Indirection/Addressing {{{ */
 UnaryAssigneeExpression

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

     ;
 
 UnaryExpression_
     ;
 
 UnaryExpression_


@@ -1572,7 +1725,7 @@ XMLMarkup
     ;
 /* }}} */
 /* 11.1 Primary Expressions {{{ */
     ;
 /* }}} */
 /* 11.1 Primary Expressions {{{ */

-PrimaryExpressionNoBF_
+PrimaryExpressionWC

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


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

diff --git a/Parser.hpp b/Parser.hpp
index c094018e8471c62a26b8012146965787bad16ec5..600e3bbfb911a4ca12349022d691da8426ea6b04 100644 (file)
--- a/Parser.hpp
+++ b/Parser.hpp
@@ -1484,7 +1484,7 @@ struct CYIndirect :
     }
 
     virtual const char *Operator() const {
     }
 
     virtual const char *Operator() const {

-        return "^";
+        return "*";

     }
 
     CYAlphabetic(false)
     }
 
     CYAlphabetic(false)

diff --git a/todo.txt b/todo.txt
index 2308e3da8c6f34a0eb0b8f8af7ed5e4197f440da..0528bbb023d3245a15c680c9a8d62d10a3980017 100644 (file)
--- a/todo.txt
+++ b/todo.txt
@@ -6,3 +6,4 @@ look into what String is, and whether to bridge it
 the console frontend's error handling, well, doesn't
 setup a default hook mechanism for ffi_call passthrough
 some JS callbacks don't use exception pointers at all...
 the console frontend's error handling, well, doesn't
 setup a default hook mechanism for ffi_call passthrough
 some JS callbacks don't use exception pointers at all...

+PropertyName may need a LexSetRegExp before it