X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/2bf24581b3e1b6e085f041476c59b65ef6d9019a..94d55b5c2b4cd5c317891dfbdd6c6186e1759101:/Cycript.y

diff --git a/Cycript.y b/Cycript.y
index 0cfbe6e..46e81a4 100644
--- a/Cycript.y
+++ b/Cycript.y
@@ -1,32 +1,65 @@
 %code top {
 #include "Cycript.tab.hh"
-int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
-#define scanner driver->scanner_
+#define scanner driver.scanner_
+#define YYSTACKEXPANDABLE 1
 }
 
 %code requires {
 #include "Parser.hpp"
+
+typedef struct {
+    bool newline_;
+
+    union {
+        CYArgument *argument_;
+        CYBoolean *boolean_;
+        CYClause *clause_;
+        CYCatch *catch_;
+        CYDeclaration *declaration_;
+        CYDeclarations *declarations_;
+        CYElement *element_;
+        CYExpression *expression_;
+        CYFalse *false_;
+        CYForInitialiser *for_;
+        CYForInInitialiser *forin_;
+        CYIdentifier *identifier_;
+        CYLiteral *literal_;
+        CYName *name_;
+        CYNull *null_;
+        CYNumber *number_;
+        CYParameter *parameter_;
+        CYProperty *property_;
+        CYSelector *selector_;
+        CYSource *source_;
+        CYStatement *statement_;
+        CYString *string_;
+        CYThis *this_;
+        CYTrue *true_;
+        CYWord *word_;
+    };
+} YYSTYPE;
+
 }
 
-%union {
-    CYExpression *expression_;
-    CYTokenIdentifier *identifier_;
-    CYTokenNumber *number_;
-    CYTokenString *string_;
+%code provides {
+int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 }
 
 %name-prefix "cy"
 
 %language "C++"
 %locations
-%glr-parser
+
+%initial-action {
+    @$.begin.filename = @$.end.filename = &driver.filename_;
+};
 
 %defines
 
 %debug
 %error-verbose
 
-%parse-param { CYParser *driver }
+%parse-param { CYDriver &driver }
 %lex-param { void *scanner }
 
 %token Ampersand "&"
@@ -43,6 +76,7 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
 %token Hyphen "-"
 %token HyphenEqual "-="
 %token HyphenHyphen "--"
+%token HyphenHyphen_ "\n--"
 %token HyphenRight "->"
 %token Left "<"
 %token LeftEqual "<="
@@ -57,6 +91,7 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
 %token Plus "+"
 %token PlusEqual "+="
 %token PlusPlus "++"
+%token PlusPlus_ "\n++"
 %token Right ">"
 %token RightEqual ">="
 %token RightRight ">>"
@@ -73,6 +108,7 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
 %token Comma ","
 %token Question "?"
 %token SemiColon ";"
+%token NewLine "\n"
 
 %token OpenParen "("
 %token CloseParen ")"
@@ -83,544 +119,983 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner);
 %token OpenBracket "["
 %token CloseBracket "]"
 
-%token Break "break"
-%token Case "case"
-%token Catch "catch"
-%token Continue "continue"
-%token Default "default"
-%token Delete "delete"
-%token Do "do"
-%token Else "else"
-%token False "false"
-%token Finally "finally"
-%token For "for"
-%token Function "function"
-%token If "if"
-%token In "in"
-%token InstanceOf "instanceof"
-%token New "new"
-%token Null "null"
-%token Return "return"
-%token Switch "switch"
-%token This "this"
-%token Throw "throw"
-%token True "true"
-%token Try "try"
-%token TypeOf "typeof"
-%token Var "var"
-%token Void "void"
-%token While "while"
-%token With "with"
+%token AtSelector "@selector"
+
+%token <word_> Break "break"
+%token <word_> Case "case"
+%token <word_> Catch "catch"
+%token <word_> Continue "continue"
+%token <word_> Default "default"
+%token <word_> Delete "delete"
+%token <word_> Do "do"
+%token <word_> Else "else"
+%token <false_> False "false"
+%token <word_> Finally "finally"
+%token <word_> For "for"
+%token <word_> Function "function"
+%token <word_> If "if"
+%token <word_> In "in"
+%token <word_> InstanceOf "instanceof"
+%token <word_> New "new"
+%token <null_> Null "null"
+%token <word_> Return "return"
+%token <word_> Switch "switch"
+%token <this_> This "this"
+%token <word_> Throw "throw"
+%token <true_> True "true"
+%token <word_> Try "try"
+%token <word_> TypeOf "typeof"
+%token <word_> Var "var"
+%token <word_> Void "void"
+%token <word_> While "while"
+%token <word_> With "with"
 
 %token <identifier_> Identifier
 %token <number_> NumericLiteral
 %token <string_> StringLiteral
 
-%%
+%type <expression_> AdditiveExpression
+%type <expression_> AdditiveExpressionNoBF
+%type <argument_> ArgumentList
+%type <argument_> ArgumentList_
+%type <argument_> ArgumentListOpt
+%type <argument_> Arguments
+%type <literal_> ArrayLiteral
+%type <expression_> AssignmentExpression
+%type <expression_> AssignmentExpressionNoBF
+%type <expression_> AssignmentExpressionNoIn
+%type <expression_> BitwiseANDExpression
+%type <expression_> BitwiseANDExpressionNoBF
+%type <expression_> BitwiseANDExpressionNoIn
+%type <statement_> Block
+%type <boolean_> BooleanLiteral
+%type <expression_> BitwiseORExpression
+%type <expression_> BitwiseORExpressionNoBF
+%type <expression_> BitwiseORExpressionNoIn
+%type <expression_> BitwiseXORExpression
+%type <expression_> BitwiseXORExpressionNoBF
+%type <expression_> BitwiseXORExpressionNoIn
+%type <statement_> BreakStatement
+%type <expression_> CallExpression
+%type <expression_> CallExpressionNoBF
+%type <clause_> CaseBlock
+%type <clause_> CaseClause
+%type <clause_> CaseClausesOpt
+%type <catch_> CatchOpt
+%type <expression_> ConditionalExpression
+%type <expression_> ConditionalExpressionNoBF
+%type <expression_> ConditionalExpressionNoIn
+%type <statement_> ContinueStatement
+%type <clause_> DefaultClause
+%type <statement_> DoWhileStatement
+%type <expression_> Element
+%type <expression_> ElementOpt
+%type <element_> ElementList
+%type <element_> ElementListOpt
+%type <statement_> ElseStatementOpt
+%type <statement_> EmptyStatement
+%type <expression_> EqualityExpression
+%type <expression_> EqualityExpressionNoBF
+%type <expression_> EqualityExpressionNoIn
+%type <expression_> Expression
+%type <expression_> ExpressionOpt
+%type <expression_> Expression_
+%type <expression_> ExpressionNoBF
+%type <expression_> ExpressionNoIn
+%type <expression_> ExpressionNoIn_
+%type <expression_> ExpressionNoInOpt
+%type <statement_> ExpressionStatement
+%type <statement_> FinallyOpt
+%type <statement_> ForStatement
+%type <for_> ForStatementInitialiser
+%type <statement_> ForInStatement
+%type <forin_> ForInStatementInitialiser
+%type <parameter_> FormalParameterList
+%type <parameter_> FormalParameterList_
+%type <source_> FunctionBody
+%type <source_> FunctionDeclaration
+%type <expression_> FunctionExpression
+%type <identifier_> IdentifierOpt
+%type <statement_> IfStatement
+%type <expression_> Initialiser
+%type <expression_> InitialiserOpt
+%type <expression_> InitialiserNoIn
+%type <expression_> InitialiserNoInOpt
+%type <statement_> IterationStatement
+%type <statement_> LabelledStatement
+%type <expression_> LeftHandSideExpression
+%type <expression_> LeftHandSideExpression_
+%type <expression_> LeftHandSideExpressionNoBF
+%type <literal_> Literal
+%type <expression_> LogicalANDExpression
+%type <expression_> LogicalANDExpressionNoBF
+%type <expression_> LogicalANDExpressionNoIn
+%type <expression_> LogicalORExpression
+%type <expression_> LogicalORExpressionNoBF
+%type <expression_> LogicalORExpressionNoIn
+%type <expression_> MemberExpression
+%type <expression_> MemberExpression_
+%type <expression_> MemberExpressionNoBF
+%type <expression_> MultiplicativeExpression
+%type <expression_> MultiplicativeExpressionNoBF
+%type <expression_> NewExpression
+%type <expression_> NewExpression_
+%type <expression_> NewExpressionNoBF
+%type <null_> NullLiteral
+%type <literal_> ObjectLiteral
+%type <expression_> PostfixExpression
+%type <expression_> PostfixExpressionNoBF
+%type <expression_> PrimaryExpression
+%type <expression_> PrimaryExpression_
+%type <expression_> PrimaryExpressionNoBF
+%type <source_> Program
+%type <name_> PropertyName
+%type <property_> PropertyNameAndValueList
+%type <property_> PropertyNameAndValueList_
+%type <property_> PropertyNameAndValueListOpt
+%type <expression_> RelationalExpression
+%type <expression_> RelationalExpressionNoBF
+%type <expression_> RelationalExpressionNoIn
+%type <statement_> ReturnStatement
+%type <selector_> SelectorExpression
+%type <selector_> SelectorExpression_
+%type <selector_> SelectorExpressionOpt
+%type <expression_> ShiftExpression
+%type <expression_> ShiftExpressionNoBF
+%type <source_> SourceElement
+%type <source_> SourceElements
+%type <statement_> Statement
+%type <statement_> StatementList
+%type <statement_> StatementListOpt
+%type <statement_> SwitchStatement
+%type <statement_> ThrowStatement
+%type <statement_> TryStatement
+%type <expression_> UnaryExpression
+%type <expression_> UnaryExpression_
+%type <expression_> UnaryExpressionNoBF
+%type <declaration_> VariableDeclaration
+%type <declaration_> VariableDeclarationNoIn
+%type <declarations_> VariableDeclarationList
+%type <declarations_> VariableDeclarationList_
+%type <declarations_> VariableDeclarationListNoIn
+%type <declarations_> VariableDeclarationListNoIn_
+%type <statement_> VariableStatement
+%type <statement_> WhileStatement
+%type <statement_> WithStatement
+%type <word_> Word
+%type <word_> WordOpt
+
+%type <expression_> MessageExpression
+%type <argument_> SelectorCall
+%type <argument_> SelectorCall_
+%type <argument_> SelectorList
+%type <argument_> VariadicCall
+
+%nonassoc "if"
+%nonassoc "else"
+
+%start Program
 
-%start Program;
+%%
 
-WordOpt
-    : Word
-    |
+TerminatorOpt
+    : ";"
+    | "\n"
+    | error { yyerrok; driver.errors_.pop_back(); }
     ;
 
-Word
-    : Identifier
-    | "break"
-    | "case"
-    | "catch"
-    | "continue"
-    | "default"
-    | "delete"
-    | "do"
-    | "else"
-    | "false"
-    | "finally"
-    | "for"
-    | "function"
-    | "if"
-    | "in"
-    | "instanceof"
-    | "new"
-    | "null"
-    | "return"
-    | "switch"
-    | "this"
-    | "throw"
-    | "true"
-    | "try"
-    | "typeof"
-    | "var"
-    | "void"
-    | "while"
-    | "with"
+Terminator
+    : ";"
+    | "\n"
+    | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } }
     ;
 
-IdentifierOpt
-    : Identifier
+CommaOpt
+    : ","
     |
     ;
 
-Literal
-    : NullLiteral
-    | BooleanLiteral
-    | NumericLiteral
-    | StringLiteral
+NewLineOpt
+    : "\n"
+    |
     ;
 
-NullLiteral
-    : "null"
+WordOpt
+    : Word { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
-BooleanLiteral
-    : "true"
-    | "false"
+Word
+    : Identifier { $$ = $1; }
+    | "break" NewLineOpt { $$ = $1; }
+    | "case" { $$ = $1; }
+    | "catch" { $$ = $1; }
+    | "continue" NewLineOpt { $$ = $1; }
+    | "default" { $$ = $1; }
+    | "delete" { $$ = $1; }
+    | "do" { $$ = $1; }
+    | "else" { $$ = $1; }
+    | "false" { $$ = $1; }
+    | "finally" { $$ = $1; }
+    | "for" { $$ = $1; }
+    | "function" { $$ = $1; }
+    | "if" { $$ = $1; }
+    /* XXX: | "in" { $$ = $1; } */
+    /* XXX: | "instanceof" { $$ = $1; } */
+    | "new" { $$ = $1; }
+    | "null" { $$ = $1; }
+    | "return" NewLineOpt { $$ = $1; }
+    | "switch" { $$ = $1; }
+    | "this" { $$ = $1; }
+    | "throw" NewLineOpt { $$ = $1; }
+    | "true" { $$ = $1; }
+    | "try" { $$ = $1; }
+    | "typeof" { $$ = $1; }
+    | "var" { $$ = $1; }
+    | "void" { $$ = $1; }
+    | "while" { $$ = $1; }
+    | "with" { $$ = $1; }
     ;
 
-/* Objective-C Extensions {{{ */
-VariadicCall
-    : "," AssignmentExpression VariadicCall
-    |
+IdentifierOpt
+    : Identifier { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
-SelectorCall_
-    : SelectorCall
-    | VariadicCall
+Literal
+    : NullLiteral { $$ = $1; }
+    | BooleanLiteral { $$ = $1; }
+    | NumericLiteral { $$ = $1; }
+    | StringLiteral { $$ = $1; }
     ;
 
-SelectorCall
-    : WordOpt ":" AssignmentExpression SelectorCall_
+NullLiteral
+    : "null" { $$ = $1; }
     ;
 
-SelectorList
-    : SelectorCall
-    | Word
+BooleanLiteral
+    : "true" { $$ = $1; }
+    | "false" { $$ = $1; }
     ;
 
-ObjectiveCall
-    : "[" AssignmentExpression SelectorList "]"
+/* 11.1 Primary Expressions {{{ */
+PrimaryExpression_
+    : "this" { $$ = $1; }
+    | Identifier { $$ = new(driver.pool_) CYVariable($1); }
+    | Literal { $$ = $1; }
+    | ArrayLiteral { $$ = $1; }
+    | "(" Expression ")" { $$ = $2; }
     ;
-/* }}} */
 
-/* 11.1 Primary Expressions {{{ */
 PrimaryExpression
-    : "this"
-    | Identifier
-    | Literal
-    | ArrayLiteral
-    | ObjectLiteral
-    | "(" Expression ")"
-    | ObjectiveCall
+    : ObjectLiteral { $$ = $1; }
+    | PrimaryExpression_ { $$ = $1; }
+    ;
+
+PrimaryExpressionNoBF
+    : PrimaryExpression_ { $$ = $1; }
     ;
 /* }}} */
 /* 11.1.4 Array Initialiser {{{ */
 ArrayLiteral
-    : "[" ElementList "]"
+    : "[" ElementList "]" { $$ = new(driver.pool_) CYArray($2); }
     ;
 
 Element
-    : AssignmentExpression
-    |
+    : AssignmentExpression { $$ = $1; }
     ;
 
-ElementList_
-    : "," ElementList
-    |
+ElementOpt
+    : Element { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+ElementListOpt
+    : ElementList { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 ElementList
-    : Element ElementList_
+    : ElementOpt "," ElementListOpt { $$ = new(driver.pool_) CYElement($1, $3); }
+    | Element { $$ = new(driver.pool_) CYElement($1, NULL); }
     ;
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral
-    : "{" PropertyNameAndValueListOpt "}"
+    : "{" PropertyNameAndValueListOpt "}" { $$ = new(driver.pool_) CYObject($2); }
     ;
 
 PropertyNameAndValueList_
-    : "," PropertyNameAndValueList
-    |
+    : "," PropertyNameAndValueList { $$ = $2; }
+    | CommaOpt { $$ = NULL; }
     ;
 
 PropertyNameAndValueListOpt
-    : PropertyNameAndValueList
-    |
+    : PropertyNameAndValueList { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 PropertyNameAndValueList
-    : PropertyName ":" AssignmentExpression PropertyNameAndValueList_
+    : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
     ;
 
 PropertyName
-    : Identifier
-    | StringLiteral
-    | NumericLiteral
+    : Identifier { $$ = $1; }
+    | StringLiteral { $$ = $1; }
+    | NumericLiteral { $$ = $1; }
     ;
 /* }}} */
 
+MemberExpression_
+    : "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); }
+    ;
+
 MemberExpression
-    : PrimaryExpression
-    | FunctionExpression
-    | MemberExpression "[" Expression "]"
-    | MemberExpression "." Identifier
-    | "new" MemberExpression Arguments
+    : PrimaryExpression { $$ = $1; }
+    | FunctionExpression { $$ = $1; }
+    | MemberExpression "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); }
+    | MemberExpression "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); }
+    | MemberExpression_ { $$ = $1; }
+    ;
+
+MemberExpressionNoBF
+    : PrimaryExpressionNoBF { $$ = $1; }
+    | MemberExpressionNoBF "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); }
+    | MemberExpressionNoBF "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); }
+    | MemberExpression_ { $$ = $1; }
+    ;
+
+NewExpression_
+    : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); }
     ;
 
 NewExpression
-    : MemberExpression
-    | "new" NewExpression
+    : MemberExpression { $$ = $1; }
+    | NewExpression_ { $$ = $1; }
+    ;
+
+NewExpressionNoBF
+    : MemberExpressionNoBF { $$ = $1; }
+    | NewExpression_ { $$ = $1; }
     ;
 
 CallExpression
-    : MemberExpression Arguments
-    | CallExpression Arguments
-    | CallExpression "[" Expression "]"
-    | CallExpression "." Identifier
+    : MemberExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    | CallExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    | CallExpression "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); }
+    | CallExpression "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); }
+    ;
+
+CallExpressionNoBF
+    : MemberExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    | CallExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+    | CallExpressionNoBF "[" Expression "]" { $$ = new(driver.pool_) CYMember($1, $3); }
+    | CallExpressionNoBF "." Identifier { $$ = new(driver.pool_) CYMember($1, new(driver.pool_) CYString($3)); }
     ;
 
 ArgumentList_
-    : "," ArgumentList
-    |
+    : "," ArgumentList { $$ = $2; }
+    | { $$ = NULL; }
     ;
 
 ArgumentListOpt
-    : ArgumentList
-    |
+    : ArgumentList { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 ArgumentList
-    : AssignmentExpression ArgumentList_
+    : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); }
     ;
 
 Arguments
-    : "(" ArgumentListOpt ")"
+    : "(" ArgumentListOpt ")" { $$ = $2; }
     ;
 
 LeftHandSideExpression
-    : NewExpression
-    | CallExpression
+    : NewExpression { $$ = $1; }
+    | CallExpression { $$ = $1; }
+    | LeftHandSideExpression_ { $$ = $1; }
+    ;
+
+LeftHandSideExpressionNoBF
+    : NewExpressionNoBF { $$ = $1; }
+    | CallExpressionNoBF { $$ = $1; }
+    | LeftHandSideExpression_ { $$ = $1; }
     ;
 
 PostfixExpression
-    : LeftHandSideExpression
-    | LeftHandSideExpression "++"
-    | LeftHandSideExpression "--"
+    : LeftHandSideExpression { $$ = $1; }
+    | LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
+    | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+    ;
+
+PostfixExpressionNoBF
+    : LeftHandSideExpressionNoBF { $$ = $1; }
+    | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
+    | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+    ;
+
+UnaryExpression_
+    : "delete" UnaryExpression { $$ = new(driver.pool_) CYDelete($2); }
+    | "void" UnaryExpression { $$ = new(driver.pool_) CYVoid($2); }
+    | "typeof" UnaryExpression { $$ = new(driver.pool_) CYTypeOf($2); }
+    | "++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); }
+    | "\n++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); }
+    | "--" UnaryExpression { $$ = new(driver.pool_) CYPreDecrement($2); }
+    | "\n--" UnaryExpression { $$ = new(driver.pool_) CYPreDecrement($2); }
+    | "+" UnaryExpression { $$ = $2; }
+    | "-" UnaryExpression { $$ = new(driver.pool_) CYNegate($2); }
+    | "~" UnaryExpression { $$ = new(driver.pool_) CYBitwiseNot($2); }
+    | "!" UnaryExpression { $$ = new(driver.pool_) CYLogicalNot($2); }
     ;
 
 UnaryExpression
-    : PostfixExpression
-    | "delete" UnaryExpression
-    | "void" UnaryExpression
-    | "typeof" UnaryExpression
-    | "++" UnaryExpression
-    | "--" UnaryExpression
-    | "+" UnaryExpression
-    | "-" UnaryExpression
-    | "~" UnaryExpression
-    | "!" UnaryExpression
-    | "*" UnaryExpression
-    | "&" UnaryExpression
+    : PostfixExpression { $$ = $1; }
+    | UnaryExpression_ { $$ = $1; }
+    ;
+
+UnaryExpressionNoBF
+    : PostfixExpressionNoBF { $$ = $1; }
+    | UnaryExpression_ { $$ = $1; }
     ;
 
 MultiplicativeExpression
-    : UnaryExpression
-    | MultiplicativeExpression "*" UnaryExpression
-    | MultiplicativeExpression "/" UnaryExpression
-    | MultiplicativeExpression "%" UnaryExpression
+    : UnaryExpression { $$ = $1; }
+    | MultiplicativeExpression "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
+    | MultiplicativeExpression "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
+    | MultiplicativeExpression "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
+    ;
+
+MultiplicativeExpressionNoBF
+    : UnaryExpressionNoBF { $$ = $1; }
+    | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
+    | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
+    | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
     ;
 
 AdditiveExpression
-    : MultiplicativeExpression
-    | AdditiveExpression "+" MultiplicativeExpression
-    | AdditiveExpression "-" MultiplicativeExpression
+    : MultiplicativeExpression { $$ = $1; }
+    | AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
+    | AdditiveExpression "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
+    ;
+
+AdditiveExpressionNoBF
+    : MultiplicativeExpressionNoBF { $$ = $1; }
+    | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
+    | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
     ;
 
 ShiftExpression
-    : AdditiveExpression
-    | ShiftExpression "<<" AdditiveExpression
-    | ShiftExpression ">>" AdditiveExpression
-    | ShiftExpression ">>>" AdditiveExpression
+    : AdditiveExpression { $$ = $1; }
+    | ShiftExpression "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
+    | ShiftExpression ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
+    | ShiftExpression ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
+    ;
+
+ShiftExpressionNoBF
+    : AdditiveExpressionNoBF { $$ = $1; }
+    | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
+    | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
+    | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
     ;
 
 RelationalExpression
-    : ShiftExpression
-    | RelationalExpression "<" ShiftExpression
-    | RelationalExpression ">" ShiftExpression
-    | RelationalExpression "<=" ShiftExpression
-    | RelationalExpression ">=" ShiftExpression
-    | RelationalExpression "instanceof" ShiftExpression
-    | RelationalExpression "in" ShiftExpression
+    : ShiftExpression { $$ = $1; }
+    | RelationalExpression "<" ShiftExpression { $$ = new(driver.pool_) CYLess($1, $3); }
+    | RelationalExpression ">" ShiftExpression { $$ = new(driver.pool_) CYGreater($1, $3); }
+    | RelationalExpression "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual($1, $3); }
+    | RelationalExpression ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual($1, $3); }
+    | RelationalExpression "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf($1, $3); }
+    | RelationalExpression "in" ShiftExpression { $$ = new(driver.pool_) CYIn($1, $3); }
+    ;
+
+RelationalExpressionNoIn
+    : ShiftExpression { $$ = $1; }
+    | RelationalExpressionNoIn "<" ShiftExpression { $$ = new(driver.pool_) CYLess($1, $3); }
+    | RelationalExpressionNoIn ">" ShiftExpression { $$ = new(driver.pool_) CYGreater($1, $3); }
+    | RelationalExpressionNoIn "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual($1, $3); }
+    | RelationalExpressionNoIn ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual($1, $3); }
+    | RelationalExpressionNoIn "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf($1, $3); }
+    ;
+
+RelationalExpressionNoBF
+    : ShiftExpressionNoBF { $$ = $1; }
+    | RelationalExpressionNoBF "<" ShiftExpression { $$ = new(driver.pool_) CYLess($1, $3); }
+    | RelationalExpressionNoBF ">" ShiftExpression { $$ = new(driver.pool_) CYGreater($1, $3); }
+    | RelationalExpressionNoBF "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual($1, $3); }
+    | RelationalExpressionNoBF ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual($1, $3); }
+    | RelationalExpressionNoBF "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf($1, $3); }
+    | RelationalExpressionNoBF "in" ShiftExpression { $$ = new(driver.pool_) CYIn($1, $3); }
     ;
 
 EqualityExpression
-    : RelationalExpression
-    | EqualityExpression "==" RelationalExpression
-    | EqualityExpression "!=" RelationalExpression
-    | EqualityExpression "===" RelationalExpression
-    | EqualityExpression "!==" RelationalExpression
+    : RelationalExpression { $$ = $1; }
+    | EqualityExpression "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
+    | EqualityExpression "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); }
+    | EqualityExpression "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
+    | EqualityExpression "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
+    ;
+
+EqualityExpressionNoIn
+    : RelationalExpressionNoIn { $$ = $1; }
+    | EqualityExpressionNoIn "==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYEqual($1, $3); }
+    | EqualityExpressionNoIn "!=" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotEqual($1, $3); }
+    | EqualityExpressionNoIn "===" RelationalExpressionNoIn { $$ = new(driver.pool_) CYIdentical($1, $3); }
+    | EqualityExpressionNoIn "!==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
+    ;
+
+EqualityExpressionNoBF
+    : RelationalExpressionNoBF { $$ = $1; }
+    | EqualityExpressionNoBF "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
+    | EqualityExpressionNoBF "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); }
+    | EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
+    | EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
     ;
 
 BitwiseANDExpression
-    : EqualityExpression
-    | BitwiseANDExpression "&" EqualityExpression
+    : EqualityExpression { $$ = $1; }
+    | BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+    ;
+
+BitwiseANDExpressionNoIn
+    : EqualityExpressionNoIn { $$ = $1; }
+    | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+    ;
+
+BitwiseANDExpressionNoBF
+    : EqualityExpressionNoBF { $$ = $1; }
+    | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
     ;
 
 BitwiseXORExpression
-    : BitwiseANDExpression
-    | BitwiseXORExpression "^" BitwiseANDExpression
+    : BitwiseANDExpression { $$ = $1; }
+    | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+    ;
+
+BitwiseXORExpressionNoIn
+    : BitwiseANDExpressionNoIn { $$ = $1; }
+    | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+    ;
+
+BitwiseXORExpressionNoBF
+    : BitwiseANDExpressionNoBF { $$ = $1; }
+    | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
     ;
 
 BitwiseORExpression
-    : BitwiseXORExpression
-    | BitwiseORExpression "|" BitwiseXORExpression
+    : BitwiseXORExpression { $$ = $1; }
+    | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+    ;
+
+BitwiseORExpressionNoIn
+    : BitwiseXORExpressionNoIn { $$ = $1; }
+    | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+    ;
+
+BitwiseORExpressionNoBF
+    : BitwiseXORExpressionNoBF { $$ = $1; }
+    | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
     ;
 
 LogicalANDExpression
-    : BitwiseORExpression
-    | LogicalANDExpression "&&" BitwiseORExpression
+    : BitwiseORExpression { $$ = $1; }
+    | LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+    ;
+
+LogicalANDExpressionNoIn
+    : BitwiseORExpressionNoIn { $$ = $1; }
+    | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+    ;
+
+LogicalANDExpressionNoBF
+    : BitwiseORExpressionNoBF { $$ = $1; }
+    | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
     ;
 
 LogicalORExpression
-    : LogicalANDExpression
-    | LogicalORExpression "||" LogicalANDExpression
+    : LogicalANDExpression { $$ = $1; }
+    | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+    ;
+
+LogicalORExpressionNoIn
+    : LogicalANDExpressionNoIn { $$ = $1; }
+    | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+    ;
+
+LogicalORExpressionNoBF
+    : LogicalANDExpressionNoBF { $$ = $1; }
+    | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
     ;
 
 ConditionalExpression
-    : LogicalORExpression
-    | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression
+    : LogicalORExpression { $$ = $1; }
+    | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
     ;
 
-AssignmentExpression
-    : ConditionalExpression
-    | LeftHandSideExpression AssignmentOperator AssignmentExpression
+ConditionalExpressionNoIn
+    : LogicalORExpressionNoIn { $$ = $1; }
+    | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
     ;
 
-AssignmentOperator
-    : "="
-    | "*="
-    | "/="
-    | "%="
-    | "+="
-    | "-="
-    | "<<="
-    | ">>="
-    | ">>>="
-    | "&="
-    | "^="
-    | "|="
+ConditionalExpressionNoBF
+    : LogicalORExpressionNoBF { $$ = $1; }
+    | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+    ;
+
+AssignmentExpression
+    : ConditionalExpression { $$ = $1; }
+    | LeftHandSideExpression "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign($1, $3); }
+    | LeftHandSideExpression "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); }
+    | LeftHandSideExpression "/=" AssignmentExpression { $$ = new(driver.pool_) CYDivideAssign($1, $3); }
+    | LeftHandSideExpression "%=" AssignmentExpression { $$ = new(driver.pool_) CYModulusAssign($1, $3); }
+    | LeftHandSideExpression "+=" AssignmentExpression { $$ = new(driver.pool_) CYAddAssign($1, $3); }
+    | LeftHandSideExpression "-=" AssignmentExpression { $$ = new(driver.pool_) CYSubtractAssign($1, $3); }
+    | LeftHandSideExpression "<<=" AssignmentExpression { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); }
+    | LeftHandSideExpression ">>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); }
+    | LeftHandSideExpression ">>>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); }
+    | LeftHandSideExpression "&=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); }
+    | LeftHandSideExpression "^=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); }
+    | LeftHandSideExpression "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); }
+    ;
+
+AssignmentExpressionNoIn
+    : ConditionalExpressionNoIn { $$ = $1; }
+    | LeftHandSideExpression "=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAssign($1, $3); }
+    | LeftHandSideExpression "*=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); }
+    | LeftHandSideExpression "/=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYDivideAssign($1, $3); }
+    | LeftHandSideExpression "%=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYModulusAssign($1, $3); }
+    | LeftHandSideExpression "+=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAddAssign($1, $3); }
+    | LeftHandSideExpression "-=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYSubtractAssign($1, $3); }
+    | LeftHandSideExpression "<<=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); }
+    | LeftHandSideExpression ">>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); }
+    | LeftHandSideExpression ">>>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); }
+    | LeftHandSideExpression "&=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); }
+    | LeftHandSideExpression "^=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); }
+    | LeftHandSideExpression "|=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); }
+    ;
+
+AssignmentExpressionNoBF
+    : ConditionalExpressionNoBF { $$ = $1; }
+    | LeftHandSideExpressionNoBF "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "/=" AssignmentExpression { $$ = new(driver.pool_) CYDivideAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "%=" AssignmentExpression { $$ = new(driver.pool_) CYModulusAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "+=" AssignmentExpression { $$ = new(driver.pool_) CYAddAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "-=" AssignmentExpression { $$ = new(driver.pool_) CYSubtractAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "<<=" AssignmentExpression { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); }
+    | LeftHandSideExpressionNoBF ">>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); }
+    | LeftHandSideExpressionNoBF ">>>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "&=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "^=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); }
+    | LeftHandSideExpressionNoBF "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); }
     ;
 
 Expression_
-    : "," Expression
-    |
+    : "," Expression { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+ExpressionNoIn_
+    : "," ExpressionNoIn { $$ = $2; }
+    | { $$ = NULL; }
     ;
 
 ExpressionOpt
-    : Expression
-    |
+    : Expression { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+ExpressionNoInOpt
+    : ExpressionNoIn { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 Expression
-    : AssignmentExpression Expression_
+    : AssignmentExpression Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+    ;
+
+ExpressionNoIn
+    : AssignmentExpressionNoIn ExpressionNoIn_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+    ;
+
+ExpressionNoBF
+    : AssignmentExpressionNoBF Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
     ;
 
 Statement
-    : Block
-    | VariableStatement
-    | EmptyStatement
-    | ExpressionStatement
-    | IfStatement
-    | IterationStatement
-    | ContinueStatement
-    | BreakStatement
-    | ReturnStatement
-    | WithStatement
-    | LabelledStatement
-    | SwitchStatement
-    | ThrowStatement
-    | TryStatement
+    : Block { $$ = $1; }
+    | VariableStatement { $$ = $1; }
+    | EmptyStatement { $$ = $1; }
+    | ExpressionStatement { $$ = $1; }
+    | IfStatement { $$ = $1; }
+    | IterationStatement { $$ = $1; }
+    | ContinueStatement { $$ = $1; }
+    | BreakStatement { $$ = $1; }
+    | ReturnStatement { $$ = $1; }
+    | WithStatement { $$ = $1; }
+    | LabelledStatement { $$ = $1; }
+    | SwitchStatement { $$ = $1; }
+    | ThrowStatement { $$ = $1; }
+    | TryStatement { $$ = $1; }
     ;
 
 Block
-    : "{" StatementListOpt "}"
+    : "{" StatementListOpt "}" { $$ = $2 ?: new(driver.pool_) CYEmpty(); }
+    ;
+
+StatementList
+    : Statement StatementListOpt { $1->SetNext($2); $$ = $1; }
     ;
 
 StatementListOpt
-    : Statement StatementListOpt
-    |
+    : StatementList { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 VariableStatement
-    : "var" VariableDeclarationList ";"
+    : "var" VariableDeclarationList Terminator { $$ = $2; }
     ;
 
 VariableDeclarationList_
-    : "," VariableDeclarationList
-    |
+    : "," VariableDeclarationList { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+VariableDeclarationListNoIn_
+    : "," VariableDeclarationListNoIn { $$ = $2; }
+    | { $$ = NULL; }
     ;
 
 VariableDeclarationList
-    : VariableDeclaration VariableDeclarationList_
+    : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
+    ;
+
+VariableDeclarationListNoIn
+    : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
     ;
 
 VariableDeclaration
-    : Identifier InitialiserOpt
+    : Identifier InitialiserOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
+    ;
+
+VariableDeclarationNoIn
+    : Identifier InitialiserNoInOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
     ;
 
 InitialiserOpt
-    : Initialiser
-    |
+    : Initialiser { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+InitialiserNoInOpt
+    : InitialiserNoIn { $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 Initialiser
-    : "=" AssignmentExpression
+    : "=" AssignmentExpression { $$ = $2; }
+    ;
+
+InitialiserNoIn
+    : "=" AssignmentExpressionNoIn { $$ = $2; }
     ;
 
 EmptyStatement
-    : ";"
+    : ";" { $$ = new(driver.pool_) CYEmpty(); }
     ;
 
 ExpressionStatement
-    : Expression ";"
+    : ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); }
     ;
 
 ElseStatementOpt
-    : "else" Statement
-    |
+    : "else" Statement { $$ = $2; }
+    | %prec "if" { $$ = NULL; }
     ;
 
 IfStatement
-    : "if" "(" Expression ")" Statement ElseStatementOpt
+    : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); }
     ;
 
 IterationStatement
-    : DoWhileStatement
-    | WhileStatement
-    | ForStatement
-    | ForInStatement
+    : DoWhileStatement { $$ = $1; }
+    | WhileStatement { $$ = $1; }
+    | ForStatement { $$ = $1; }
+    | ForInStatement { $$ = $1; }
     ;
 
 DoWhileStatement
-    : "do" Statement "while" "(" Expression ")" ";"
+    : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); }
     ;
 
 WhileStatement
-    : "while" "(" Expression ")" Statement
+    : "while" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWhile($3, $5); }
     ;
 
 ForStatement
-    : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement
+    : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new(driver.pool_) CYFor($3, $5, $7, $9); }
     ;
 
 ForStatementInitialiser
-    : ExpressionOpt
-    | "var" VariableDeclarationList
+    : ExpressionNoInOpt { $$ = $1; }
+    | "var" VariableDeclarationListNoIn { $$ = $2; }
     ;
 
 ForInStatement
-    : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement
+    : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); }
     ;
 
 ForInStatementInitialiser
-    : LeftHandSideExpression
-    | "var" VariableDeclaration
+    : LeftHandSideExpression { $$ = $1; }
+    | "var" VariableDeclarationNoIn { $$ = $2; }
     ;
 
 ContinueStatement
-    : "continue" IdentifierOpt ";"
+    : "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); }
     ;
 
 BreakStatement
-    : "break" IdentifierOpt ";"
+    : "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); }
     ;
 
 ReturnStatement
-    : "return" ExpressionOpt ";"
+    : "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); }
     ;
 
 WithStatement
-    : "with" "(" Expression ")" Statement
+    : "with" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWith($3, $5); }
     ;
 
 SwitchStatement
-    : "switch" "(" Expression ")" CaseBlock
+    : "switch" "(" Expression ")" CaseBlock { $$ = new(driver.pool_) CYSwitch($3, $5); }
     ;
 
 CaseBlock
-    : "{" CaseClausesOpt "}"
+    : "{" CaseClausesOpt "}" { $$ = $2; }
     ;
 
 CaseClausesOpt
-    : CaseClause CaseClausesOpt
-    | DefaultClause CaseClausesOpt
-    |
+    : CaseClause CaseClausesOpt { $1->SetNext($2); $$ = $1; }
+    | DefaultClause CaseClausesOpt { $1->SetNext($2); $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 CaseClause
-    : "case" Expression ":" StatementListOpt
+    : "case" Expression ":" StatementListOpt { $$ = new(driver.pool_) CYClause($2, $4); }
     ;
 
 DefaultClause
-    : "default" ":" StatementListOpt
+    : "default" ":" StatementListOpt { $$ = new(driver.pool_) CYClause(NULL, $3); }
     ;
 
 LabelledStatement
-    : Identifier ":" Statement
+    : Identifier ":" Statement { $3->AddLabel($1); $$ = $3; }
     ;
 
 ThrowStatement
-    : "throw" Expression ";"
+    : "throw" Expression Terminator { $$ = new(driver.pool_) CYThrow($2); }
     ;
 
 TryStatement
-    : "try" Block CatchOpt FinallyOpt
+    : "try" Block CatchOpt FinallyOpt { $$ = new(driver.pool_) CYTry($2, $3, $4); }
     ;
 
 CatchOpt
-    : "catch" "(" Identifier ")" Block
-    |
+    : "catch" "(" Identifier ")" Block { $$ = new(driver.pool_) CYCatch($3, $5); }
+    | { $$ = NULL; }
     ;
 
 FinallyOpt
-    : "finally" Block
-    |
+    : "finally" Block { $$ = $2; }
+    | { $$ = NULL; }
     ;
 
 FunctionDeclaration
-    : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}"
+    : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunction($2, $4, $7); }
     ;
 
 FunctionExpression
-    : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}"
+    : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYLambda($2, $4, $7); }
     ;
 
 FormalParameterList_
-    : "," FormalParameterList
-    |
+    : "," FormalParameterList { $$ = $2; }
+    | { $$ = NULL; }
     ;
 
 FormalParameterList
-    : Identifier FormalParameterList_
-    |
+    : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYParameter($1, $2); }
+    | { $$ = NULL; }
     ;
 
 FunctionBody
-    : SourceElements
+    : SourceElements { $$ = $1; }
     ;
 
 Program
-    : SourceElements
+    : SourceElements { driver.source_ = $1; }
     ;
 
 SourceElements
-    : SourceElement SourceElements
-    |
+    : SourceElement SourceElements { $1->SetNext($2); $$ = $1; }
+    | { $$ = NULL; }
     ;
 
 SourceElement
-    : Statement
-    | FunctionDeclaration
+    : Statement { $$ = $1; }
+    | FunctionDeclaration { $$ = $1; }
+    ;
+
+/* Objective-C Extensions {{{ */
+VariadicCall
+    : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
+    | { $$ = NULL; }
+    ;
+
+SelectorCall_
+    : SelectorCall { $$ = $1; }
+    | VariadicCall { $$ = $1; }
+    ;
+
+SelectorCall
+    : WordOpt ":" AssignmentExpression SelectorCall_ { $$ = new(driver.pool_) CYArgument($1 ?: new(driver.pool_) CYBlank(), $3, $4); }
+    ;
+
+SelectorList
+    : SelectorCall { $$ = $1; }
+    | Word { $$ = new(driver.pool_) CYArgument($1, NULL); }
+    ;
+
+MessageExpression
+    : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYMessage($2, $3); }
+    ;
+
+SelectorExpressionOpt
+    : SelectorExpression_ { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+SelectorExpression_
+    : WordOpt ":" SelectorExpressionOpt { $$ = new(driver.pool_) CYSelector($1, true, $3); }
+    ;
+
+SelectorExpression
+    : SelectorExpression_ { $$ = $1; }
+    | Word { $$ = new(driver.pool_) CYSelector($1, false, NULL); }
+    ;
+
+PrimaryExpression_
+    : MessageExpression { $$ = $1; }
+    | "@selector" "(" SelectorExpression ")" { $$ = $3; }
+    ;
+/* }}} */
+
+LeftHandSideExpression_
+    : "*" LeftHandSideExpression { $$ = new(driver.pool_) CYIndirect($2); }
+    ;
+
+UnaryExpression_
+    : "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); }
     ;
 
 %%