X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/5999c31517bb72b55257d25f482edc566adec045..bce8339b629582dd04df0570468ac746adc0fcf7:/Cycript.y diff --git a/Cycript.y b/Cycript.y index c7084b5..a82e7f8 100644 --- a/Cycript.y +++ b/Cycript.y @@ -1,45 +1,99 @@ +/* Cycript - Remove Execution Server and Disassembler + * Copyright (C) 2009 Jay Freeman (saurik) +*/ + +/* Modified BSD License {{{ */ +/* + * Redistribution and use in source and binary + * forms, with or without modification, are permitted + * provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the + * above copyright notice, this list of conditions + * and the following disclaimer. + * 2. Redistributions in binary form must reproduce the + * above copyright notice, this list of conditions + * and the following disclaimer in the documentation + * and/or other materials provided with the + * distribution. + * 3. The name of the author may not be used to endorse + * or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, + * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF + * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR + * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR + * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +*/ +/* }}} */ + %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 { + bool bool_; + + CYArgument *argument_; + CYBoolean *boolean_; + CYClause *clause_; + CYCatch *catch_; + CYCompound *compound_; + CYDeclaration *declaration_; + CYDeclarations *declarations_; + CYElement *element_; + CYExpression *expression_; + CYFalse *false_; + CYField *field_; + CYForInitialiser *for_; + CYForInInitialiser *forin_; + CYFunctionParameter *functionParameter_; + CYIdentifier *identifier_; + CYLiteral *literal_; + CYMessage *message_; + CYMessageParameter *messageParameter_; + CYName *name_; + CYNull *null_; + CYNumber *number_; + 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_; @@ -67,6 +121,7 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); %token Hyphen "-" %token HyphenEqual "-=" %token HyphenHyphen "--" +%token HyphenHyphen_ "\n--" %token HyphenRight "->" %token Left "<" %token LeftEqual "<=" @@ -81,6 +136,7 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); %token Plus "+" %token PlusEqual "+=" %token PlusPlus "++" +%token PlusPlus_ "\n++" %token Right ">" %token RightEqual ">=" %token RightRight ">>" @@ -97,6 +153,7 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); %token Comma "," %token Question "?" %token SemiColon ";" +%token NewLine "\n" %token OpenParen "(" %token CloseParen ")" @@ -107,6 +164,10 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); %token OpenBracket "[" %token CloseBracket "]" +%token AtClass "@class" +%token AtSelector "@selector" +%token AtEnd "@end" + %token Break "break" %token Case "case" %token Catch "catch" @@ -136,49 +197,105 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); %token While "while" %token With "with" +%token Abstract "abstract" +%token Boolean "boolean" +%token Byte "byte" +%token Char "char" +%token Class "class" +%token Const "const" +%token Debugger "debugger" +%token Double "double" +%token Enum "enum" +%token Export "export" +%token Extends "extends" +%token Final "final" +%token Float "float" +%token Goto "goto" +%token Implements "implements" +%token Import "import" +%token Int "int" +%token Interface "interface" +%token Long "long" +%token Native "native" +%token Package "package" +%token Private "private" +%token Protected "protected" +%token Public "public" +%token Short "short" +%token Static "static" +%token Super "super" +%token Synchronized "synchronized" +%token Throws "throws" +%token Transient "transient" +%token Volatile "volatile" + %token Identifier %token NumericLiteral %token StringLiteral %type AdditiveExpression +%type AdditiveExpressionNoBF %type ArgumentList %type ArgumentList_ %type ArgumentListOpt %type Arguments %type ArrayLiteral %type AssignmentExpression +%type AssignmentExpressionNoBF +%type AssignmentExpressionNoIn %type BitwiseANDExpression +%type BitwiseANDExpressionNoBF +%type BitwiseANDExpressionNoIn %type Block %type BooleanLiteral %type BitwiseORExpression +%type BitwiseORExpressionNoBF +%type BitwiseORExpressionNoIn %type BitwiseXORExpression +%type BitwiseXORExpressionNoBF +%type BitwiseXORExpressionNoIn %type BreakStatement %type CallExpression +%type CallExpressionNoBF %type CaseBlock %type CaseClause %type CaseClausesOpt %type CatchOpt +%type ClassDeclaration +%type ClassMessageDeclaration +%type ClassMessageDeclarationListOpt +%type ClassSuperOpt +%type ClassFieldList %type ConditionalExpression +%type ConditionalExpressionNoBF +%type ConditionalExpressionNoIn %type ContinueStatement %type DefaultClause %type DoWhileStatement %type Element +%type ElementOpt %type ElementList -%type ElementList_ +%type ElementListOpt %type ElseStatementOpt %type EmptyStatement %type EqualityExpression +%type EqualityExpressionNoBF +%type EqualityExpressionNoIn %type Expression -%type Expression_ %type ExpressionOpt +%type Expression_ +%type ExpressionNoBF +%type ExpressionNoIn +%type ExpressionNoIn_ +%type ExpressionNoInOpt %type ExpressionStatement %type FinallyOpt %type ForStatement %type ForStatementInitialiser %type ForInStatement %type ForInStatementInitialiser -%type FormalParameterList -%type FormalParameterList_ +%type FormalParameterList +%type FormalParameterList_ %type FunctionBody %type FunctionDeclaration %type FunctionExpression @@ -186,52 +303,125 @@ int cylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); %type IfStatement %type Initialiser %type InitialiserOpt +%type InitialiserNoIn +%type InitialiserNoInOpt %type IterationStatement %type LabelledStatement %type LeftHandSideExpression +%type LeftHandSideExpression_ +%type LeftHandSideExpressionNoBF %type Literal %type LogicalANDExpression +%type LogicalANDExpressionNoBF +%type LogicalANDExpressionNoIn %type LogicalORExpression +%type LogicalORExpressionNoBF +%type LogicalORExpressionNoIn %type MemberExpression +%type MemberExpression_ +%type MemberExpressionNoBF +%type MessageParameter +%type MessageParameters +%type MessageParameterList +%type MessageParameterListOpt +%type MessageScope %type MultiplicativeExpression +%type MultiplicativeExpressionNoBF %type NewExpression +%type NewExpression_ +%type NewExpressionNoBF %type NullLiteral %type ObjectLiteral -%type MessageExpression %type PostfixExpression +%type PostfixExpressionNoBF %type PrimaryExpression +%type PrimaryExpression_ +%type PrimaryExpressionNoBF %type Program %type PropertyName %type PropertyNameAndValueList %type PropertyNameAndValueList_ %type PropertyNameAndValueListOpt %type RelationalExpression +%type RelationalExpressionNoBF +%type RelationalExpressionNoIn %type ReturnStatement -%type SelectorCall -%type SelectorCall_ -%type SelectorList +%type SelectorExpression +%type SelectorExpression_ +%type SelectorExpressionOpt %type ShiftExpression +%type ShiftExpressionNoBF %type SourceElement %type SourceElements %type Statement +%type StatementList %type StatementListOpt %type SwitchStatement %type ThrowStatement %type TryStatement +%type TypeOpt %type UnaryExpression +%type UnaryExpression_ +%type UnaryExpressionNoBF %type VariableDeclaration +%type VariableDeclarationNoIn %type VariableDeclarationList %type VariableDeclarationList_ +%type VariableDeclarationListNoIn +%type VariableDeclarationListNoIn_ %type VariableStatement -%type VariadicCall %type WhileStatement %type WithStatement %type Word %type WordOpt +%type MessageExpression +%type SelectorCall +%type SelectorCall_ +%type SelectorList +%type VariadicCall + +%left "*" "/" "%" +%left "+" "-" +%left "<<" ">>" ">>>" +%left "<" ">" "<=" ">=" "instanceof" "in" +%left "==" "!=" "===" "!==" +%left "&" +%left "^" +%left "|" +%left "&&" +%left "||" + +%right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|=" + +%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; } @@ -240,32 +430,63 @@ WordOpt 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; } ; @@ -291,69 +512,56 @@ BooleanLiteral | "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 @@ -362,7 +570,7 @@ PropertyNameAndValueListOpt ; PropertyNameAndValueList - : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new CYProperty($1, $3, $4); } + : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); } ; PropertyName @@ -372,24 +580,51 @@ 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_ @@ -403,7 +638,7 @@ ArgumentListOpt ; ArgumentList - : AssignmentExpression ArgumentList_ { $$ = new CYArgument(NULL, $1, $2); } + : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); } ; Arguments @@ -413,115 +648,289 @@ 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; } ; @@ -530,8 +939,21 @@ ExpressionOpt | { $$ = 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 @@ -552,16 +974,20 @@ 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_ @@ -569,12 +995,25 @@ 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 @@ -582,25 +1021,34 @@ 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 @@ -611,49 +1059,49 @@ 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 @@ -667,11 +1115,11 @@ CaseClausesOpt ; 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 @@ -679,15 +1127,15 @@ 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; } ; @@ -697,11 +1145,11 @@ FinallyOpt ; 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_ @@ -710,7 +1158,7 @@ FormalParameterList_ ; FormalParameterList - : Identifier FormalParameterList_ { $$ = new CYParameter($1, $2); } + : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYFunctionParameter($1, $2); } | { $$ = NULL; } ; @@ -719,7 +1167,7 @@ FunctionBody ; Program - : SourceElements { driver.source_ = $1; $$ = $1; } + : SourceElements { driver.source_ = $1; } ; SourceElements @@ -732,4 +1180,110 @@ SourceElement | FunctionDeclaration { $$ = $1; } ; +/* Objective-C Extensions {{{ */ +ClassSuperOpt + : ":" MemberExpressionNoBF { $$ = $2; } + | { $$ = NULL; } + ; + +ClassFieldList + : "{" "}" { $$ = NULL; } + ; + +MessageScope + : "+" { $$ = false; } + | "-" { $$ = true; } + ; + +TypeOpt + : "(" Expression ")" { $$ = $2; } + | { $$ = NULL; } + ; + +MessageParameter + : Word ":" TypeOpt Identifier { $$ = new CYMessageParameter($1, $3, $4); } + ; + +MessageParameterListOpt + : MessageParameterList { $$ = $1; } + | { $$ = NULL; } + ; + +MessageParameterList + : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } + ; + +MessageParameters + : MessageParameterList { $$ = $1; } + | Word { $$ = new CYMessageParameter($1, NULL, NULL); } + ; + +ClassMessageDeclaration + : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new CYMessage($1, $2, $3, $5); } + ; + +ClassMessageDeclarationListOpt + : ClassMessageDeclarationListOpt ClassMessageDeclaration { $2->SetNext($1); $$ = $2; } + | { $$ = NULL; } + ; + +ClassDeclaration + : "@class" Identifier ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new CYClass($2, $3, $4, $5); } + ; + +SourceElement + : ClassDeclaration { $$ = $1; } + ; + +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_) CYSend($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); } + ; + %%