%code top {
#include "Cycript.tab.hh"
-int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *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_;
+ CYCompound *compound_;
+ 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_;
+ CYSelectorPart *selector_;
+ CYSource *source_;
+ CYStatement *statement_;
+ CYString *string_;
+ CYThis *this_;
+ CYTrue *true_;
+ CYWord *word_;
+ };
+} YYSTYPE;
+
}
-%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_;
- CYSource *source_;
- CYStatement *statement_;
- CYString *string_;
- CYThis *this_;
- CYTrue *true_;
- CYWord *word_;
+%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_;
%token Hyphen "-"
%token HyphenEqual "-="
%token HyphenHyphen "--"
+%token HyphenHyphen_ "\n--"
%token HyphenRight "->"
%token Left "<"
%token LeftEqual "<="
%token Plus "+"
%token PlusEqual "+="
%token PlusPlus "++"
+%token PlusPlus_ "\n++"
%token Right ">"
%token RightEqual ">="
%token RightRight ">>"
%token Comma ","
%token Question "?"
%token SemiColon ";"
+%token NewLine "\n"
%token OpenParen "("
%token CloseParen ")"
%token OpenBracket "["
%token CloseBracket "]"
+%token AtSelector "@selector"
+%token AtImplementation "@implementation"
+%token AtEnd "@end"
+
%token <word_> Break "break"
%token <word_> Case "case"
%token <word_> Catch "catch"
%token <word_> While "while"
%token <word_> With "with"
+%token <word_> Abstract "abstract"
+%token <word_> Boolean "boolean"
+%token <word_> Byte "byte"
+%token <word_> Char "char"
+%token <word_> Class "class"
+%token <word_> Const "const"
+%token <word_> Debugger "debugger"
+%token <word_> Double "double"
+%token <word_> Enum "enum"
+%token <word_> Export "export"
+%token <word_> Extends "extends"
+%token <word_> Final "final"
+%token <word_> Float "float"
+%token <word_> Goto "goto"
+%token <word_> Implements "implements"
+%token <word_> Import "import"
+%token <word_> Int "int"
+%token <word_> Interface "interface"
+%token <word_> Long "long"
+%token <word_> Native "native"
+%token <word_> Package "package"
+%token <word_> Private "private"
+%token <word_> Protected "protected"
+%token <word_> Public "public"
+%token <word_> Short "short"
+%token <word_> Static "static"
+%token <word_> Super "super"
+%token <word_> Synchronized "synchronized"
+%token <word_> Throws "throws"
+%token <word_> Transient "transient"
+%token <word_> Volatile "volatile"
+
%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_> ElementList_
+%type <element_> ElementListOpt
%type <statement_> ElseStatementOpt
%type <statement_> EmptyStatement
%type <expression_> EqualityExpression
+%type <expression_> EqualityExpressionNoBF
+%type <expression_> EqualityExpressionNoIn
%type <expression_> Expression
-%type <expression_> Expression_
%type <expression_> ExpressionOpt
+%type <compound_> Expression_
+%type <expression_> ExpressionNoBF
+%type <expression_> ExpressionNoIn
+%type <compound_> ExpressionNoIn_
+%type <expression_> ExpressionNoInOpt
%type <statement_> ExpressionStatement
%type <statement_> FinallyOpt
%type <statement_> ForStatement
%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_> MessageExpression
%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 <argument_> SelectorCall
-%type <argument_> SelectorCall_
-%type <argument_> SelectorList
+%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 <argument_> VariadicCall
%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;
+TerminatorOpt
+ : ";"
+ | "\n"
+ | error { yyerrok; driver.errors_.pop_back(); }
+ ;
+
+Terminator
+ : ";"
+ | "\n"
+ | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } }
+ ;
+
+CommaOpt
+ : ","
+ |
+ ;
+
+NewLineOpt
+ : "\n"
+ |
+ ;
WordOpt
: Word { $$ = $1; }
Word
: Identifier { $$ = $1; }
- | "break" { $$ = $1; }
+ | "abstract" { $$ = $1; }
+ | "boolean" { $$ = $1; }
+ | "break" NewLineOpt { $$ = $1; }
+ | "byte" { $$ = $1; }
| "case" { $$ = $1; }
| "catch" { $$ = $1; }
- | "continue" { $$ = $1; }
+ | "char" { $$ = $1; }
+ | "class" { $$ = $1; }
+ | "const" { $$ = $1; }
+ | "continue" NewLineOpt { $$ = $1; }
+ | "debugger" { $$ = $1; }
| "default" { $$ = $1; }
| "delete" { $$ = $1; }
| "do" { $$ = $1; }
+ | "double" { $$ = $1; }
| "else" { $$ = $1; }
+ | "enum" { $$ = $1; }
+ | "export" { $$ = $1; }
+ | "extends" { $$ = $1; }
| "false" { $$ = $1; }
+ | "final" { $$ = $1; }
| "finally" { $$ = $1; }
+ | "float" { $$ = $1; }
| "for" { $$ = $1; }
| "function" { $$ = $1; }
+ | "goto" { $$ = $1; }
| "if" { $$ = $1; }
- | "in" { $$ = $1; }
- | "instanceof" { $$ = $1; }
+ | "implements" { $$ = $1; }
+ | "import" { $$ = $1; }
+ /* XXX: | "in" { $$ = $1; } */
+ /* XXX: | "instanceof" { $$ = $1; } */
+ | "int" { $$ = $1; }
+ | "interface" { $$ = $1; }
+ | "long" { $$ = $1; }
+ | "native" { $$ = $1; }
| "new" { $$ = $1; }
| "null" { $$ = $1; }
- | "return" { $$ = $1; }
+ | "package" { $$ = $1; }
+ | "private" { $$ = $1; }
+ | "protected" { $$ = $1; }
+ | "public" { $$ = $1; }
+ | "return" NewLineOpt { $$ = $1; }
+ | "short" { $$ = $1; }
+ | "static" { $$ = $1; }
+ | "super" { $$ = $1; }
| "switch" { $$ = $1; }
+ | "synchronized" { $$ = $1; }
| "this" { $$ = $1; }
- | "throw" { $$ = $1; }
+ | "throw" NewLineOpt { $$ = $1; }
+ | "throws" { $$ = $1; }
+ | "transient" { $$ = $1; }
| "true" { $$ = $1; }
| "try" { $$ = $1; }
| "typeof" { $$ = $1; }
| "var" { $$ = $1; }
| "void" { $$ = $1; }
+ | "volatile" { $$ = $1; }
| "while" { $$ = $1; }
| "with" { $$ = $1; }
;
| "false" { $$ = $1; }
;
-/* Objective-C Extensions {{{ */
-VariadicCall
- : "," AssignmentExpression VariadicCall { $$ = new CYArgument(NULL, $2, $3); }
- | { $$ = NULL; }
- ;
-
-SelectorCall_
- : SelectorCall { $$ = $1; }
- | VariadicCall { $$ = $1; }
- ;
-
-SelectorCall
- : WordOpt ":" AssignmentExpression SelectorCall_ { $$ = new CYArgument($1 ?: new CYBlank(), $3, $4); }
- ;
-
-SelectorList
- : SelectorCall { $$ = $1; }
- | Word { $$ = new CYArgument($1, NULL); }
- ;
-
-MessageExpression
- : "[" AssignmentExpression SelectorList "]" { $$ = new CYMessage($2, $3); }
- ;
-/* }}} */
-
/* 11.1 Primary Expressions {{{ */
-PrimaryExpression
+PrimaryExpression_
: "this" { $$ = $1; }
- | Identifier { $$ = new CYVariable($1); }
+ | Identifier { $$ = new(driver.pool_) CYVariable($1); }
| Literal { $$ = $1; }
| ArrayLiteral { $$ = $1; }
- | ObjectLiteral { $$ = $1; }
| "(" Expression ")" { $$ = $2; }
- | MessageExpression { $$ = $1; }
+ ;
+
+PrimaryExpression
+ : ObjectLiteral { $$ = $1; }
+ | PrimaryExpression_ { $$ = $1; }
+ ;
+
+PrimaryExpressionNoBF
+ : PrimaryExpression_ { $$ = $1; }
;
/* }}} */
/* 11.1.4 Array Initialiser {{{ */
ArrayLiteral
- : "[" ElementList "]" { $$ = $2; }
+ : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); }
;
Element
: AssignmentExpression { $$ = $1; }
+ ;
+
+ElementOpt
+ : Element { $$ = $1; }
| { $$ = NULL; }
;
-ElementList_
- : "," ElementList { $$ = $2; }
+ElementListOpt
+ : ElementList { $$ = $1; }
| { $$ = NULL; }
;
ElementList
- : Element ElementList_ { $$ = new CYElement($1, $2); }
+ : ElementOpt "," ElementListOpt { $$ = new(driver.pool_) CYElement($1, $3); }
+ | Element { $$ = new(driver.pool_) CYElement($1, NULL); }
;
/* }}} */
/* 11.1.5 Object Initialiser {{{ */
ObjectLiteral
- : "{" PropertyNameAndValueListOpt "}" { $$ = $2; }
+ : "{" PropertyNameAndValueListOpt "}" { $$ = new(driver.pool_) CYObject($2); }
;
PropertyNameAndValueList_
: "," PropertyNameAndValueList { $$ = $2; }
- | { $$ = NULL; }
+ | CommaOpt { $$ = NULL; }
;
PropertyNameAndValueListOpt
;
PropertyNameAndValueList
- : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new CYProperty($1, $3, $4); }
+ : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
;
PropertyName
;
/* }}} */
+MemberExpression_
+ : "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); }
+ ;
+
MemberExpression
: PrimaryExpression { $$ = $1; }
| FunctionExpression { $$ = $1; }
- | MemberExpression "[" Expression "]" { $$ = new CYMember($1, $3); }
- | MemberExpression "." Identifier { $$ = new CYMember($1, new CYString($3)); }
- | "new" MemberExpression Arguments { $$ = new CYNew($2, $3); }
+ | 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 { $$ = $1; }
- | "new" NewExpression { $$ = new CYNew($2, NULL); }
+ | NewExpression_ { $$ = $1; }
+ ;
+
+NewExpressionNoBF
+ : MemberExpressionNoBF { $$ = $1; }
+ | NewExpression_ { $$ = $1; }
;
CallExpression
- : MemberExpression Arguments { $$ = new CYCall($1, $2); }
- | CallExpression Arguments { $$ = new CYCall($1, $2); }
- | CallExpression "[" Expression "]" { $$ = new CYMember($1, $3); }
- | CallExpression "." Identifier { $$ = new CYMember($1, new CYString($3)); }
+ : 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
- : AssignmentExpression ArgumentList_ { $$ = new CYArgument(NULL, $1, $2); }
+ : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); }
;
Arguments
LeftHandSideExpression
: NewExpression { $$ = $1; }
| CallExpression { $$ = $1; }
- | "*" LeftHandSideExpression { $$ = new CYIndirect($2); }
+ | LeftHandSideExpression_ { $$ = $1; }
+ ;
+
+LeftHandSideExpressionNoBF
+ : NewExpressionNoBF { $$ = $1; }
+ | CallExpressionNoBF { $$ = $1; }
+ | LeftHandSideExpression_ { $$ = $1; }
;
PostfixExpression
: LeftHandSideExpression { $$ = $1; }
- | LeftHandSideExpression "++" { $$ = new CYPostIncrement($1); }
- | LeftHandSideExpression "--" { $$ = new CYPostDecrement($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 { $$ = $1; }
- | "delete" UnaryExpression { $$ = new CYDelete($2); }
- | "void" UnaryExpression { $$ = new CYVoid($2); }
- | "typeof" UnaryExpression { $$ = new CYTypeOf($2); }
- | "++" UnaryExpression { $$ = new CYPreIncrement($2); }
- | "--" UnaryExpression { $$ = new CYPreDecrement($2); }
- | "+" UnaryExpression { $$ = $2; }
- | "-" UnaryExpression { $$ = new CYNegate($2); }
- | "~" UnaryExpression { $$ = new CYBitwiseNot($2); }
- | "!" UnaryExpression { $$ = new CYLogicalNot($2); }
- | "&" UnaryExpression { $$ = new CYAddressOf($2); }
+ | UnaryExpression_ { $$ = $1; }
+ ;
+
+UnaryExpressionNoBF
+ : PostfixExpressionNoBF { $$ = $1; }
+ | UnaryExpression_ { $$ = $1; }
;
MultiplicativeExpression
: UnaryExpression { $$ = $1; }
- | MultiplicativeExpression "*" UnaryExpression { $$ = new CYMultiply($1, $3); }
- | MultiplicativeExpression "/" UnaryExpression { $$ = new CYDivide($1, $3); }
- | MultiplicativeExpression "%" UnaryExpression { $$ = new CYModulus($1, $3); }
+ | 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 { $$ = $1; }
- | AdditiveExpression "+" MultiplicativeExpression { $$ = new CYAdd($1, $3); }
- | AdditiveExpression "-" MultiplicativeExpression { $$ = new CYSubtract($1, $3); }
+ | 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 { $$ = $1; }
- | ShiftExpression "<<" AdditiveExpression { $$ = new CYShiftLeft($1, $3); }
- | ShiftExpression ">>" AdditiveExpression { $$ = new CYShiftRightSigned($1, $3); }
- | ShiftExpression ">>>" AdditiveExpression { $$ = new CYShiftRightUnsigned($1, $3); }
+ | 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 { $$ = $1; }
- | RelationalExpression "<" ShiftExpression { $$ = new CYLess($1, $3); }
- | RelationalExpression ">" ShiftExpression { $$ = new CYGreater($1, $3); }
- | RelationalExpression "<=" ShiftExpression { $$ = new CYLessOrEqual($1, $3); }
- | RelationalExpression ">=" ShiftExpression { $$ = new CYGreaterOrEqual($1, $3); }
- | RelationalExpression "instanceof" ShiftExpression { $$ = new CYInstanceOf($1, $3); }
- | RelationalExpression "in" ShiftExpression { $$ = new CYIn($1, $3); }
+ | 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 { $$ = $1; }
- | EqualityExpression "==" RelationalExpression { $$ = new CYEqual($1, $3); }
- | EqualityExpression "!=" RelationalExpression { $$ = new CYNotEqual($1, $3); }
- | EqualityExpression "===" RelationalExpression { $$ = new CYIdentical($1, $3); }
- | EqualityExpression "!==" RelationalExpression { $$ = new CYNotIdentical($1, $3); }
+ | 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 { $$ = $1; }
- | BitwiseANDExpression "&" EqualityExpression { $$ = new CYBitwiseAnd($1, $3); }
+ | 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 { $$ = $1; }
- | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new CYBitwiseXOr($1, $3); }
+ | 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 { $$ = $1; }
- | BitwiseORExpression "|" BitwiseXORExpression { $$ = new CYBitwiseOr($1, $3); }
+ | 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 { $$ = $1; }
- | LogicalANDExpression "&&" BitwiseORExpression { $$ = new CYLogicalAnd($1, $3); }
+ | 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 { $$ = $1; }
- | LogicalORExpression "||" LogicalANDExpression { $$ = new CYLogicalOr($1, $3); }
+ | 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 { $$ = $1; }
- | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new CYCondition($1, $3, $5); }
+ | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ ;
+
+ConditionalExpressionNoIn
+ : LogicalORExpressionNoIn { $$ = $1; }
+ | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ ;
+
+ConditionalExpressionNoBF
+ : LogicalORExpressionNoBF { $$ = $1; }
+ | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
;
AssignmentExpression
: ConditionalExpression { $$ = $1; }
- | LeftHandSideExpression "=" AssignmentExpression { $$ = new CYAssign($1, $3); }
- | LeftHandSideExpression "*=" AssignmentExpression { $$ = new CYMultiplyAssign($1, $3); }
- | LeftHandSideExpression "/=" AssignmentExpression { $$ = new CYDivideAssign($1, $3); }
- | LeftHandSideExpression "%=" AssignmentExpression { $$ = new CYModulusAssign($1, $3); }
- | LeftHandSideExpression "+=" AssignmentExpression { $$ = new CYAddAssign($1, $3); }
- | LeftHandSideExpression "-=" AssignmentExpression { $$ = new CYSubtractAssign($1, $3); }
- | LeftHandSideExpression "<<=" AssignmentExpression { $$ = new CYShiftLeftAssign($1, $3); }
- | LeftHandSideExpression ">>=" AssignmentExpression { $$ = new CYShiftRightSignedAssign($1, $3); }
- | LeftHandSideExpression ">>>=" AssignmentExpression { $$ = new CYShiftRightUnsignedAssign($1, $3); }
- | LeftHandSideExpression "&=" AssignmentExpression { $$ = new CYBitwiseAndAssign($1, $3); }
- | LeftHandSideExpression "^=" AssignmentExpression { $$ = new CYBitwiseXOrAssign($1, $3); }
- | LeftHandSideExpression "|=" AssignmentExpression { $$ = new CYBitwiseOrAssign($1, $3); }
+ | 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 { $$ = $2; }
+ : "," Expression { $$ = new(driver.pool_) CYCompound($2); }
+ | { $$ = NULL; }
+ ;
+
+ExpressionNoIn_
+ : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); }
| { $$ = NULL; }
;
| { $$ = NULL; }
;
+ExpressionNoInOpt
+ : ExpressionNoIn { $$ = $1; }
+ | { $$ = NULL; }
+ ;
+
Expression
- : AssignmentExpression Expression_ { if ($1 == NULL) $$ = $2; else { $1->SetNext($2); $$ = $1; } }
+ : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
+ ;
+
+ExpressionNoIn
+ : AssignmentExpressionNoIn ExpressionNoIn_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
+ ;
+
+ExpressionNoBF
+ : AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
Statement
;
Block
- : "{" StatementListOpt "}" { $$ = $2 ?: new CYEmpty(); }
+ : "{" StatementListOpt "}" { $$ = $2 ?: new(driver.pool_) CYEmpty(); }
;
-StatementListOpt
+StatementList
: Statement StatementListOpt { $1->SetNext($2); $$ = $1; }
+ ;
+
+StatementListOpt
+ : StatementList { $$ = $1; }
| { $$ = NULL; }
;
VariableStatement
- : "var" VariableDeclarationList ";" { $$ = $2; }
+ : "var" VariableDeclarationList Terminator { $$ = $2; }
;
VariableDeclarationList_
| { $$ = NULL; }
;
+VariableDeclarationListNoIn_
+ : "," VariableDeclarationListNoIn { $$ = $2; }
+ | { $$ = NULL; }
+ ;
+
VariableDeclarationList
- : VariableDeclaration VariableDeclarationList_ { $$ = new CYDeclarations($1, $2); }
+ : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
+ ;
+
+VariableDeclarationListNoIn
+ : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
;
VariableDeclaration
- : Identifier InitialiserOpt { $$ = new CYDeclaration($1, $2); }
+ : Identifier InitialiserOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
+ ;
+
+VariableDeclarationNoIn
+ : Identifier InitialiserNoInOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
;
InitialiserOpt
| { $$ = NULL; }
;
+InitialiserNoInOpt
+ : InitialiserNoIn { $$ = $1; }
+ | { $$ = NULL; }
+ ;
+
Initialiser
: "=" AssignmentExpression { $$ = $2; }
;
+InitialiserNoIn
+ : "=" AssignmentExpressionNoIn { $$ = $2; }
+ ;
+
EmptyStatement
- : ";" { $$ = new CYEmpty(); }
+ : ";" { $$ = new(driver.pool_) CYEmpty(); }
;
ExpressionStatement
- : Expression ";" { $$ = new CYExpress($1); }
+ : ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); }
;
ElseStatementOpt
: "else" Statement { $$ = $2; }
- | { $$ = NULL; }
+ | %prec "if" { $$ = NULL; }
;
IfStatement
- : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new CYIf($3, $5, $6); }
+ : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); }
;
IterationStatement
;
DoWhileStatement
- : "do" Statement "while" "(" Expression ")" ";" { $$ = new CYDoWhile($5, $2); }
+ : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); }
;
WhileStatement
- : "while" "(" Expression ")" Statement { $$ = new CYWhile($3, $5); }
+ : "while" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWhile($3, $5); }
;
ForStatement
- : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new CYFor($3, $5, $7, $9); }
+ : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new(driver.pool_) CYFor($3, $5, $7, $9); }
;
ForStatementInitialiser
- : ExpressionOpt { $$ = $1; }
- | "var" VariableDeclarationList { $$ = $2; }
+ : ExpressionNoInOpt { $$ = $1; }
+ | "var" VariableDeclarationListNoIn { $$ = $2; }
;
ForInStatement
- : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new CYForIn($3, $5, $7); }
+ : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); }
;
ForInStatementInitialiser
: LeftHandSideExpression { $$ = $1; }
- | "var" VariableDeclaration { $$ = $2; }
+ | "var" VariableDeclarationNoIn { $$ = $2; }
;
ContinueStatement
- : "continue" IdentifierOpt ";" { $$ = new CYContinue($2); }
+ : "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); }
;
BreakStatement
- : "break" IdentifierOpt ";" { $$ = new CYBreak($2); }
+ : "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); }
;
ReturnStatement
- : "return" ExpressionOpt ";" { $$ = new CYReturn($2); }
+ : "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); }
;
WithStatement
- : "with" "(" Expression ")" Statement { $$ = new CYWith($3, $5); }
+ : "with" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWith($3, $5); }
;
SwitchStatement
- : "switch" "(" Expression ")" CaseBlock { $$ = new CYSwitch($3, $5); }
+ : "switch" "(" Expression ")" CaseBlock { $$ = new(driver.pool_) CYSwitch($3, $5); }
;
CaseBlock
;
CaseClause
- : "case" Expression ":" StatementListOpt { $$ = new CYClause($2, $4); }
+ : "case" Expression ":" StatementListOpt { $$ = new(driver.pool_) CYClause($2, $4); }
;
DefaultClause
- : "default" ":" StatementListOpt { $$ = new CYClause(NULL, $3); }
+ : "default" ":" StatementListOpt { $$ = new(driver.pool_) CYClause(NULL, $3); }
;
LabelledStatement
;
ThrowStatement
- : "throw" Expression ";" { $$ = new CYThrow($2); }
+ : "throw" Expression Terminator { $$ = new(driver.pool_) CYThrow($2); }
;
TryStatement
- : "try" Block CatchOpt FinallyOpt { $$ = new CYTry($2, $3, $4); }
+ : "try" Block CatchOpt FinallyOpt { $$ = new(driver.pool_) CYTry($2, $3, $4); }
;
CatchOpt
- : "catch" "(" Identifier ")" Block { $$ = new CYCatch($3, $5); }
+ : "catch" "(" Identifier ")" Block { $$ = new(driver.pool_) CYCatch($3, $5); }
| { $$ = NULL; }
;
;
FunctionDeclaration
- : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new CYFunction($2, $4, $7); }
+ : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunction($2, $4, $7); }
;
FunctionExpression
- : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new CYLambda($2, $4, $7); }
+ : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYLambda($2, $4, $7); }
;
FormalParameterList_
;
FormalParameterList
- : Identifier FormalParameterList_ { $$ = new CYParameter($1, $2); }
+ : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYParameter($1, $2); }
| { $$ = NULL; }
;
;
Program
- : SourceElements { driver.source_ = $1; $$ = $1; }
+ : SourceElements { driver.source_ = $1; }
;
SourceElements
| 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_) CYSelectorPart($1, true, $3); }
+ ;
+
+SelectorExpression
+ : SelectorExpression_ { $$ = $1; }
+ | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
+ ;
+
+PrimaryExpression_
+ : MessageExpression { $$ = $1; }
+ | "@selector" "(" SelectorExpression ")" { $$ = new CYSelector($3); }
+ ;
+/* }}} */
+
+LeftHandSideExpression_
+ : "*" LeftHandSideExpression { $$ = new(driver.pool_) CYIndirect($2); }
+ ;
+
+UnaryExpression_
+ : "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); }
+ ;
+
%%