X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/4e11a430b3f7d66b06eaf76035834b55ec4f976b..dedb352cc79448a3ba75c7d39629a0dd9772825a:/Cycript.yy.in?ds=sidebyside diff --git a/Cycript.yy.in b/Cycript.yy.in index 103deb7..8efb228 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -1,40 +1,22 @@ -/* Cycript - Inlining/Optimizing JavaScript Compiler - * Copyright (C) 2009 Jay Freeman (saurik) +/* Cycript - Optimizing JavaScript Compiler/Runtime + * Copyright (C) 2009-2012 Jay Freeman (saurik) */ -/* Modified BSD License {{{ */ +/* GNU Lesser General Public License, Version 3 {{{ */ /* - * Redistribution and use in source and binary - * forms, with or without modification, are permitted - * provided that the following conditions are met: + * Cycript is free software: you can redistribute it and/or modify it under + * the terms of the GNU Lesser General Public License as published by the + * Free Software Foundation, either version 3 of the License, or (at your + * option) any later version. * - * 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. + * Cycript is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public + * License for more details. * - * 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. -*/ + * You should have received a copy of the GNU Lesser General Public License + * along with Cycript. If not, see . +**/ /* }}} */ @if Bison23 %{ @@ -47,6 +29,7 @@ @if Bison24 %code requires { #include "Parser.hpp" +#define CYNew new($pool) @begin ObjectiveC #include "ObjectiveC/Syntax.hpp" @@ -90,6 +73,7 @@ typedef struct { CYProgram *program_; CYProperty *property_; CYPropertyName *propertyName_; + CYRubyProc *rubyProc_; CYStatement *statement_; CYString *string_; CYThis *this_; @@ -142,6 +126,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %parse-param { CYDriver &driver } %lex-param { void *cyscanner } +/* Token Declarations {{{ */ @begin E4X %token XMLCDATA %token XMLComment @@ -177,6 +162,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Equal "=" %token EqualEqual "==" %token EqualEqualEqual "===" +%token EqualRight "=>" %token Exclamation "!" %token ExclamationEqual "!=" %token ExclamationEqualEqual "!==" @@ -192,6 +178,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Percent "%" %token PercentEqual "%=" %token Period "." +%token PeriodPeriodPeriod "..." %token Pipe "|" %token PipeEqual "|=" %token PipePipe "||" @@ -223,14 +210,24 @@ int cylex(YYSTYPE *, cy::location *, void *); %token CloseParen ")" %token OpenBrace "{" +%token OpenBrace_ "\n{" +%token OpenBrace__ ";{" %token CloseBrace "}" %token OpenBracket "[" %token CloseBracket "]" +@begin Java %token AtClass "@class" -%token AtSelector "@selector" +@end + +@begin ObjectiveC +%token AtImplementation "@implementation" +%token AtImplementation_ ";@implementation" +%token AtImport "@import" %token AtEnd "@end" +%token AtSelector "@selector" +@end %token False "false" %token Null "null" @@ -248,8 +245,10 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Finally "finally" %token For "for" %token Function "function" +%token Function_ ";function" %token If "if" %token In "in" +%token In_ "!in" %token InstanceOf "instanceof" %token New "new" %token Return "return" @@ -310,6 +309,7 @@ int cylex(YYSTYPE *, cy::location *, void *); // Woah?! %token Each "each" +%token Of "of" @begin E4X // E4X Conditional @@ -325,33 +325,26 @@ int cylex(YYSTYPE *, cy::location *, void *); %token RegularExpressionLiteral %type AdditiveExpression -%type AdditiveExpressionNoBF -%type ArgumentList %type ArgumentList_ +%type ArgumentList %type ArgumentListOpt %type Arguments %type ArrayLiteral -%type AssigneeExpression -%type AssigneeExpressionNoBF +%type ArrowFunction +%type ArrowParameters %type AssignmentExpression -%type AssignmentExpression_ -%type AssignmentExpressionNoBF -%type AssignmentExpressionNoIn +%type BindingIdentifier %type BitwiseANDExpression -%type BitwiseANDExpressionNoBF -%type BitwiseANDExpressionNoIn -%type Block %type Block_ +%type Block %type BooleanLiteral +%type BindingElement %type BitwiseORExpression -%type BitwiseORExpressionNoBF -%type BitwiseORExpressionNoIn %type BitwiseXORExpression -%type BitwiseXORExpressionNoBF -%type BitwiseXORExpressionNoIn %type BreakStatement +%type BreakableStatement +%type CallExpression_ %type CallExpression -%type CallExpressionNoBF %type CaseBlock %type CaseClause %type CaseClausesOpt @@ -359,11 +352,13 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ComprehensionList %type ComprehensionListOpt %type ConditionalExpression -%type ConditionalExpressionNoBF -%type ConditionalExpressionNoIn %type ContinueStatement +%type ConciseBody +%type DebuggerStatement +%type Declaration__ +%type Declaration_ +%type Declaration %type DefaultClause -%type DoWhileStatement %type Element %type ElementOpt %type ElementList @@ -371,116 +366,87 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ElseStatementOpt %type EmptyStatement %type EqualityExpression -%type EqualityExpressionNoBF -%type EqualityExpressionNoIn -%type Expression -%type ExpressionOpt %type Expression_ -%type ExpressionNoBF -%type ExpressionNoIn -%type ExpressionNoIn_ -%type ExpressionNoInOpt +%type Expression +%type ExpressionOpt %type ExpressionStatement %type FinallyOpt %type ForComprehension -%type ForStatement %type ForStatementInitialiser -%type ForInStatement %type ForInStatementInitialiser -%type FormalParameterList +%type FormalParameter %type FormalParameterList_ +%type FormalParameterList +%type FormalParameterListOpt %type FunctionBody %type FunctionDeclaration %type FunctionExpression %type Identifier %type IdentifierOpt +%type IdentifierName %type IfComprehension %type IfStatement %type Initialiser %type InitialiserOpt -%type InitialiserNoIn -%type InitialiserNoInOpt %type IterationStatement %type LabelledStatement %type LeftHandSideExpression -%type LeftHandSideExpressionNoBF -//%type LetStatement +%type LetStatement +%type LexicalDeclaration %type Literal -%type LiteralNoRE -%type LiteralRE +%type ValueLiteral %type LogicalANDExpression -%type LogicalANDExpressionNoBF -%type LogicalANDExpressionNoIn %type LogicalORExpression -%type LogicalORExpressionNoBF -%type LogicalORExpressionNoIn %type MemberAccess -%type MemberExpression %type MemberExpression_ -%type MemberExpressionNoBF +%type MemberExpression %type MultiplicativeExpression -%type MultiplicativeExpressionNoBF %type NewExpression -%type NewExpression_ -%type NewExpressionNoBF %type NullLiteral %type ObjectLiteral +%type Parenthetical +%type ParentheticalOpt %type PostfixExpression -%type PostfixExpressionNoBF %type PrimaryExpression -%type PrimaryExpressionNo -%type PrimaryExpressionNoBF -%type PrimaryExpressionNoRE -%type PrimaryExpressionBF %type Program -%type PropertyName +%type ProgramBody +%type ProgramBodyOpt %type PropertyName_ -%type PropertyNameAndValueList -%type PropertyNameAndValueList_ -%type PropertyNameAndValueListOpt +%type PropertyName +%type PropertyDefinition +%type PropertyDefinitionList_ +%type PropertyDefinitionList +%type PropertyDefinitionListOpt %type RelationalExpression -%type RelationalExpression_ -%type RelationalExpressionNoBF -%type RelationalExpressionNoIn -%type RelationalExpressionNoIn_ %type ReturnStatement +%type RubyProcExpression +%type RubyProcParameterList_ +%type RubyProcParameterList +%type RubyProcParameters +%type RubyProcParametersOpt %type ShiftExpression -%type ShiftExpressionNoBF -%type SourceElement -%type SourceElement_ -%type SourceElements -%type Statement +%type SingleNameBinding +%type Statement__ %type Statement_ +%type Statement %type StatementList %type StatementListOpt +%type StatementListItem %type SwitchStatement %type ThrowStatement %type TryStatement -%type UnaryExpression %type UnaryExpression_ -%type UnaryExpressionNoBF +%type UnaryExpression %type VariableDeclaration -%type VariableDeclarationNoIn -%type VariableDeclarationList %type VariableDeclarationList_ -%type VariableDeclarationListNoIn -%type VariableDeclarationListNoIn_ +%type VariableDeclarationList %type VariableStatement -%type WhileStatement %type WithStatement - -@begin C -%type AssigneeExpressionNoRE -%type CallExpressionNoRE -%type LeftHandSideExpressionNoRE -%type MemberExpressionNoRE -%type NewExpressionNoRE -%type PostfixExpressionNoRE -%type UnaryAssigneeExpression -%type UnaryExpressionNoRE -@end +%type Word +%type WordOpt @begin ObjectiveC +%type BoxableExpression %type CategoryStatement %type ClassExpression %type ClassStatement @@ -499,25 +465,23 @@ int cylex(YYSTYPE *, cy::location *, void *); %type MessageParameterList %type MessageParameterListOpt %type MessageScope -%type SelectorCall %type SelectorCall_ -%type SelectorExpression +%type SelectorCall %type SelectorExpression_ +%type SelectorExpression %type SelectorExpressionOpt %type SelectorList %type SelectorWordOpt %type TypeOpt %type VariadicCall -%type Word -%type WordOpt @end @begin E4X %type PropertyIdentifier_ -%type PropertySelector %type PropertySelector_ -%type QualifiedIdentifier +%type PropertySelector %type QualifiedIdentifier_ +%type QualifiedIdentifier %type WildcardIdentifier %type XMLComment %type XMLCDATA @@ -532,73 +496,69 @@ int cylex(YYSTYPE *, cy::location *, void *); %type XMLListInitialiser %type XMLInitialiser @end - -%nonassoc Identifier_ "abstract" "boolean" "break" "byte" "case" "catch" "char" "class" "const" "continue" "debugger" "default" "delete" "do" "double" "each" "enum" "export" "extends" "false" "final" "finally" "float" /*"for"*/ "function" "goto" "implements" "import" /*"in"*/ /*"instanceof"*/ "int" "interface" "let" "long" "namespace" "native" "new" "null" "package" "private" "protected" "public" "return" "short" "super" "static" "switch" "synchronized" "this" "throw" "throws" "transient" "true" "try" "typeof" "var" "void" "volatile" "while" "with" "xml" "yield" +/* }}} */ +/* Token Priorities {{{ */ +%nonassoc "" +%left "++" "--" %nonassoc "if" %nonassoc "else" - -%nonassoc "++" "--" -%nonassoc "(" "[" - -%left "*" "/" "%" -%left "+" "-" -%left "<<" ">>" ">>>" -%left "<" ">" "<=" ">=" "instanceof" "in" -%left "==" "!=" "===" "!==" -%left "&" -%left "^" -%left "|" -%left "&&" -%left "||" - -%right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|=" +/* }}} */ %start Program %% /* Lexer State {{{ */ +LexPushInOn + : { driver.in_.push(true); } + ; + +LexPushInOff + : { driver.in_.push(false); } + ; + +LexPopIn + : { driver.in_.pop(); } + ; + LexSetRegExp : { driver.SetCondition(CYDriver::RegExpCondition); } ; -/* }}} */ -StrictSemi - : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); } +LexNoBrace + : { if (yychar == yyempty_) driver.nobrace_ = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; } ; -Terminator_ - : ";" - | "\n" StrictSemi +LexNoFunction + : { if (yychar == token::Function) yychar = token::Function_; } ; -TerminatorOpt - : Terminator_ - | error { yyerrok; driver.errors_.pop_back(); } StrictSemi +LexNoAtImplementation + : { if (yychar == token::AtImplementation) yychar = token::AtImplementation_; } ; -Terminator - : Terminator_ - | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi +LexSetStatement + : LexNoBrace LexNoFunction LexNoAtImplementation ; +/* }}} */ +/* Virtual Tokens {{{ */ +BRACE + : "{" + | "\n{" + ; +/* }}} */ -/*CommaOpt - : "," - | - ;*/ +/* 7.6 Identifier Names and Identifiers {{{ */ +IdentifierName + : Word { $$ = $1; } + ; -@begin ObjectiveC NewLineOpt : "\n" | ; -WordOpt - : Word { $$ = $1; } - | { $$ = NULL; } - ; - Word : Identifier { $$ = $1; } | "break" NewLineOpt { $$ = $1; } @@ -622,7 +582,12 @@ Word | "if" { $$ = $1; } | "import" { $$ = $1; } /* XXX: | "in" { $$ = $1; } */ + | "!in" { $$ = $1; } /* XXX: | "instanceof" { $$ = $1; } */ + + // XXX: as it currently is not an Identifier + | "let" { $$ = $1; } + | "new" { $$ = $1; } | "null" { $$ = $1; } | "return" NewLineOpt { $$ = $1; } @@ -638,7 +603,11 @@ Word | "while" { $$ = $1; } | "with" { $$ = $1; } ; -@end + +WordOpt + : Word { $$ = $1; } + | { $$ = NULL; } + ; Identifier : Identifier_ { $$ = $1; } @@ -668,73 +637,86 @@ Identifier | "transient" { $$ = $1; } | "volatile" { $$ = $1; } - | "let" { $$ = $1; } + // XXX: currently I only have this as Word + // | "let" { $$ = $1; } + | "yield" { $$ = $1; } | "each" { $$ = $1; } + | "of" { $$ = $1; } ; IdentifierOpt : Identifier { $$ = $1; } | { $$ = NULL; } ; +/* }}} */ -LiteralNoRE +/* 7.8 Literals {{{ */ +Literal : NullLiteral { $$ = $1; } - | BooleanLiteral { $$ = $1; } - | NumericLiteral { $$ = $1; } - | StringLiteral { $$ = $1; } - | "@" StringLiteral { $$ = $2; } - ; - -LiteralRE - : RegularExpressionLiteral { $$ = $1; } + | ValueLiteral { $$ = $1; } ; -Literal - : LiteralNoRE { $$ = $1; } - | LiteralRE { $$ = $1; } +ValueLiteral + : BooleanLiteral { $$ = $1; } + | NumericLiteral { $$ = $1; } + | StringLiteral { $$ = $1; } + | RegularExpressionLiteral { $$ = $1; } ; - +/* }}} */ +/* 7.8.1 Null Literals {{{ */ NullLiteral : "null" { $$ = $1; } ; - +/* }}} */ +/* 7.8.2 Boolean Literals {{{ */ BooleanLiteral : "true" { $$ = $1; } | "false" { $$ = $1; } ; +/* }}} */ -/* 11.1 Primary Expressions {{{ */ -PrimaryExpression - : LexSetRegExp PrimaryExpressionNoRE { $$ = $2; } +/* 7.9 Automatic Semicolon Insertion {{{ */ +StrictSemi + : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); } + ; + +Terminator + : ";" + | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi ; -PrimaryExpressionNoBF - : PrimaryExpressionNo { $$ = $1; } +TerminatorOpt + : ";" + | error { yyerrok; driver.errors_.pop_back(); } StrictSemi + ; +/* }}} */ + +/* 11.1 Primary Expressions {{{ */ +Parenthetical + : "(" LexPushInOff Expression LexPopIn ")" { $$ = $3; } ; -PrimaryExpressionNoRE - : PrimaryExpressionBF { $$ = $1; } - | PrimaryExpressionNo { $$ = $1; } +ParentheticalOpt + : Parenthetical { $$ = $1; } + | { $$ = NULL; } ; -PrimaryExpressionNo +PrimaryExpression : "this" { $$ = $1; } - | Identifier { $$ = new(driver.pool_) CYVariable($1); } - | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; } + | Identifier { $$ = CYNew CYVariable($1); } | Literal { $$ = $1; } | ArrayLiteral { $$ = $1; } - | "(" Expression ")" { $$ = $2; } - ; - -PrimaryExpressionBF - : ObjectLiteral { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | FunctionExpression { $$ = $1; } + | Parenthetical { $$ = $1; } + | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; } ; /* }}} */ -/* 11.1.4 Array Initialiser {{{ */ +/* 11.1.4.1 Array Initialiser {{{ */ ArrayLiteral - : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); } + : "[" LexPushInOff ElementListOpt LexPopIn "]" { $$ = CYNew CYArray($3); } ; Element @@ -746,37 +728,45 @@ ElementOpt | LexSetRegExp { $$ = NULL; } ; +ElementList + : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); } + | Element { $$ = CYNew CYElement($1, NULL); } + ; + ElementListOpt : ElementList { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; - -ElementList - : ElementOpt "," ElementListOpt { $$ = new(driver.pool_) CYElement($1, $3); } - | Element { $$ = new(driver.pool_) CYElement($1, NULL); } - ; /* }}} */ /* 11.1.5 Object Initialiser {{{ */ ObjectLiteral - : "{" PropertyNameAndValueListOpt "}" { $$ = new(driver.pool_) CYObject($2); } + : BRACE LexPushInOff PropertyDefinitionListOpt LexPopIn "}" { $$ = CYNew CYObject($3); } ; -PropertyNameAndValueList_ - : "," PropertyNameAndValueList { $$ = $2; } +PropertyDefinitionList_ + : "," PropertyDefinitionList { $$ = $2; } + | "," { $$ = NULL; } | { $$ = NULL; } ; -PropertyNameAndValueListOpt - : PropertyNameAndValueList { $$ = $1; } +PropertyDefinitionList + : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; } + ; + +PropertyDefinitionListOpt + : PropertyDefinitionList { $$ = $1; } | { $$ = NULL; } ; -PropertyNameAndValueList - : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); } +PropertyDefinition + // XXX: this should be IdentifierName + : LexSetRegExp Identifier { $$ = CYNew CYProperty($2, CYNew CYVariable($2)); } + | PropertyName ":" AssignmentExpression { $$ = CYNew CYProperty($1, $3); } + //| MethodDefinition ; PropertyName_ - : Identifier { $$ = $1; } + : IdentifierName { $$ = $1; } | StringLiteral { $$ = $1; } | NumericLiteral { $$ = $1; } ; @@ -787,497 +777,286 @@ PropertyName /* }}} */ /* 11.2 Left-Hand-Side Expressions {{{ */ -MemberExpression_ - : "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); } - ; - MemberAccess - : "[" Expression "]" { $$ = new(driver.pool_) CYDirectMember(NULL, $2); } - | "." Identifier { $$ = new(driver.pool_) CYDirectMember(NULL, new(driver.pool_) CYString($2)); } + : "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYDirectMember(NULL, $3); } + | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); } | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; } ; -MemberExpression - : PrimaryExpression { $$ = $1; } - | LexSetRegExp FunctionExpression { $$ = $2; } - | MemberExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - | LexSetRegExp MemberExpression_ { $$ = $2; } - ; - -MemberExpressionNoBF - : PrimaryExpressionNoBF { $$ = $1; } - | MemberExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - | MemberExpression_ { $$ = $1; } - ; - -@begin C -MemberExpressionNoRE - : PrimaryExpressionNoRE { $$ = $1; } - | FunctionExpression { $$ = $1; } - | MemberExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - | MemberExpression_ { $$ = $1; } +MemberExpression_ + : MemberExpression { $$ = $1; } + //| "super" { $$ = $1; } ; -@end -NewExpression_ - : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); } +MemberExpression + : LexSetRegExp PrimaryExpression { $$ = $2; } + | MemberExpression_ { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } + | LexSetRegExp "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($3, $4); } ; NewExpression : MemberExpression { $$ = $1; } - | LexSetRegExp NewExpression_ { $$ = $2; } - ; - -NewExpressionNoBF - : MemberExpressionNoBF { $$ = $1; } - | NewExpression_ { $$ = $1; } + | LexSetRegExp "new" NewExpression { $$ = CYNew cy::Syntax::New($3, NULL); } ; -@begin C -NewExpressionNoRE - : MemberExpressionNoRE { $$ = $1; } - | NewExpression_ { $$ = $1; } +CallExpression_ + : MemberExpression_ + | CallExpression ; -@end CallExpression - : MemberExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); } - | CallExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); } + : CallExpression_ Arguments { $$ = CYNew CYCall($1, $2); } | CallExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } ; -CallExpressionNoBF - : MemberExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); } - | CallExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); } - | CallExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - ; - -@begin C -CallExpressionNoRE - : MemberExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); } - | CallExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); } - | CallExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } +Arguments + : "(" LexPushInOff ArgumentListOpt LexPopIn ")" { $$ = $3; } ; -@end ArgumentList_ : "," ArgumentList { $$ = $2; } | { $$ = NULL; } ; -ArgumentListOpt - : ArgumentList { $$ = $1; } - | LexSetRegExp { $$ = NULL; } - ; - ArgumentList - : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); } + : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); } ; -Arguments - : "(" ArgumentListOpt ")" { $$ = $2; } +ArgumentListOpt + : ArgumentList { $$ = $1; } + | LexSetRegExp { $$ = NULL; } ; LeftHandSideExpression : NewExpression { $$ = $1; } | CallExpression { $$ = $1; } ; - -LeftHandSideExpressionNoBF - : NewExpressionNoBF { $$ = $1; } - | CallExpressionNoBF { $$ = $1; } - ; - -@begin C -LeftHandSideExpressionNoRE - : NewExpressionNoRE { $$ = $1; } - | CallExpressionNoRE { $$ = $1; } - ; -@end /* }}} */ /* 11.3 Postfix Expressions {{{ */ PostfixExpression - : AssigneeExpression { $$ = $1; } - | LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); } - | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); } - ; - -PostfixExpressionNoBF - : AssigneeExpressionNoBF { $$ = $1; } - | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); } - | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); } - ; - -@begin C -PostfixExpressionNoRE - : AssigneeExpressionNoRE { $$ = $1; } - | LeftHandSideExpressionNoRE "++" { $$ = new(driver.pool_) CYPostIncrement($1); } - | LeftHandSideExpressionNoRE "--" { $$ = new(driver.pool_) CYPostDecrement($1); } + : %prec "" LeftHandSideExpression { $$ = $1; } + | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); } + | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); } ; -@end /* }}} */ /* 11.4 Unary Operators {{{ */ 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 { $$ = new(driver.pool_) CYAffirm($2); } - | "-" UnaryExpression { $$ = new(driver.pool_) CYNegate($2); } - | "~" UnaryExpression { $$ = new(driver.pool_) CYBitwiseNot($2); } - | "!" UnaryExpression { $$ = new(driver.pool_) CYLogicalNot($2); } + : "delete" UnaryExpression { $$ = CYNew CYDelete($2); } + | "void" UnaryExpression { $$ = CYNew CYVoid($2); } + | "typeof" UnaryExpression { $$ = CYNew CYTypeOf($2); } + | "++" UnaryExpression { $$ = CYNew CYPreIncrement($2); } + | "\n++" UnaryExpression { $$ = CYNew CYPreIncrement($2); } + | "--" UnaryExpression { $$ = CYNew CYPreDecrement($2); } + | "\n--" UnaryExpression { $$ = CYNew CYPreDecrement($2); } + | "+" UnaryExpression { $$ = CYNew CYAffirm($2); } + | "-" UnaryExpression { $$ = CYNew CYNegate($2); } + | "~" UnaryExpression { $$ = CYNew CYBitwiseNot($2); } + | "!" UnaryExpression { $$ = CYNew CYLogicalNot($2); } ; UnaryExpression : PostfixExpression { $$ = $1; } | LexSetRegExp UnaryExpression_ { $$ = $2; } ; - -UnaryExpressionNoBF - : PostfixExpressionNoBF { $$ = $1; } - | UnaryExpression_ { $$ = $1; } - ; - -@begin C -UnaryExpressionNoRE - : PostfixExpressionNoRE { $$ = $1; } - | UnaryExpression_ { $$ = $1; } - ; -@end /* }}} */ /* 11.5 Multiplicative Operators {{{ */ MultiplicativeExpression : 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); } + | MultiplicativeExpression "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); } + | MultiplicativeExpression "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); } + | MultiplicativeExpression "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); } ; /* }}} */ /* 11.6 Additive Operators {{{ */ AdditiveExpression : 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); } + | AdditiveExpression "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); } + | AdditiveExpression "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); } ; /* }}} */ /* 11.7 Bitwise Shift Operators {{{ */ ShiftExpression : 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); } + | ShiftExpression "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); } + | ShiftExpression ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); } + | ShiftExpression ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); } ; /* }}} */ /* 11.8 Relational Operators {{{ */ -RelationalExpressionNoIn_ - : "<" ShiftExpression { $$ = new(driver.pool_) CYLess(NULL, $2); } - | ">" ShiftExpression { $$ = new(driver.pool_) CYGreater(NULL, $2); } - | "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual(NULL, $2); } - | ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual(NULL, $2); } - | "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf(NULL, $2); } - ; - -RelationalExpression_ - : RelationalExpressionNoIn_ { $$ = $1; } - | "in" ShiftExpression { $$ = new(driver.pool_) CYIn(NULL, $2); } - ; - RelationalExpression : ShiftExpression { $$ = $1; } - | RelationalExpression RelationalExpression_ { $2->SetLeft($1); $$ = $2; } - ; - -RelationalExpressionNoIn - : ShiftExpression { $$ = $1; } - | RelationalExpressionNoIn RelationalExpressionNoIn_ { $2->SetLeft($1); $$ = $2; } - ; - -RelationalExpressionNoBF - : ShiftExpressionNoBF { $$ = $1; } - | RelationalExpressionNoBF RelationalExpression_ { $2->SetLeft($1); $$ = $2; } + | RelationalExpression "<" ShiftExpression { $$ = CYNew CYLess($1, $3); } + | RelationalExpression ">" ShiftExpression { $$ = CYNew CYGreater($1, $3); } + | RelationalExpression "<=" ShiftExpression { $$ = CYNew CYLessOrEqual($1, $3); } + | RelationalExpression ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual($1, $3); } + | RelationalExpression "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf($1, $3); } + | RelationalExpression "in" ShiftExpression { $$ = CYNew CYIn($1, $3); } ; /* }}} */ /* 11.9 Equality Operators {{{ */ EqualityExpression : 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); } + | EqualityExpression "==" RelationalExpression { $$ = CYNew CYEqual($1, $3); } + | EqualityExpression "!=" RelationalExpression { $$ = CYNew CYNotEqual($1, $3); } + | EqualityExpression "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); } + | EqualityExpression "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); } ; /* }}} */ /* 11.10 Binary Bitwise Operators {{{ */ BitwiseANDExpression : 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); } + | BitwiseANDExpression "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); } ; BitwiseXORExpression : 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); } + | BitwiseXORExpression "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); } ; BitwiseORExpression : 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); } + | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); } ; /* }}} */ /* 11.11 Binary Logical Operators {{{ */ LogicalANDExpression : 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); } + | LogicalANDExpression "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); } ; LogicalORExpression : 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); } + | LogicalORExpression "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); } ; /* }}} */ /* 11.12 Conditional Operator ( ? : ) {{{ */ ConditionalExpression : LogicalORExpression { $$ = $1; } - | 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); } + | LogicalORExpression "?" LexPushInOff AssignmentExpression LexPopIn ":" AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); } ; /* }}} */ /* 11.13 Assignment Operators {{{ */ -AssignmentExpression_ - : "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign(NULL, $2); } - | "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign(NULL, $2); } - | "/=" AssignmentExpression { $$ = new(driver.pool_) CYDivideAssign(NULL, $2); } - | "%=" AssignmentExpression { $$ = new(driver.pool_) CYModulusAssign(NULL, $2); } - | "+=" AssignmentExpression { $$ = new(driver.pool_) CYAddAssign(NULL, $2); } - | "-=" AssignmentExpression { $$ = new(driver.pool_) CYSubtractAssign(NULL, $2); } - | "<<=" AssignmentExpression { $$ = new(driver.pool_) CYShiftLeftAssign(NULL, $2); } - | ">>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightSignedAssign(NULL, $2); } - | ">>>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightUnsignedAssign(NULL, $2); } - | "&=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseAndAssign(NULL, $2); } - | "^=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseXOrAssign(NULL, $2); } - | "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign(NULL, $2); } - ; - -AssigneeExpression - : LeftHandSideExpression { $$ = $1; } -@begin C - | LexSetRegExp UnaryAssigneeExpression { $$ = $2; } -@end - ; - -AssigneeExpressionNoBF - : LeftHandSideExpressionNoBF { $$ = $1; } -@begin C - | UnaryAssigneeExpression { $$ = $1; } -@end - ; - -@begin C -AssigneeExpressionNoRE - : LeftHandSideExpressionNoRE { $$ = $1; } - | UnaryAssigneeExpression { $$ = $1; } - ; -@end - AssignmentExpression : ConditionalExpression { $$ = $1; } - | AssigneeExpression AssignmentExpression_ { $2->SetLeft($1); $$ = $2; } - ; - -AssignmentExpressionNoIn - : ConditionalExpressionNoIn { $$ = $1; } - | AssigneeExpression "=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAssign($1, $3); } - | AssigneeExpression "*=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); } - | AssigneeExpression "/=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYDivideAssign($1, $3); } - | AssigneeExpression "%=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYModulusAssign($1, $3); } - | AssigneeExpression "+=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAddAssign($1, $3); } - | AssigneeExpression "-=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYSubtractAssign($1, $3); } - | AssigneeExpression "<<=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); } - | AssigneeExpression ">>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); } - | AssigneeExpression ">>>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); } - | AssigneeExpression "&=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); } - | AssigneeExpression "^=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); } - | AssigneeExpression "|=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); } - ; - -AssignmentExpressionNoBF - : ConditionalExpressionNoBF { $$ = $1; } - | AssigneeExpressionNoBF AssignmentExpression_ { $2->SetLeft($1); $$ = $2; } + | ArrowFunction { $$ = $1; } + | LeftHandSideExpression "=" AssignmentExpression { $$ = CYNew CYAssign($1, $3); } + | LeftHandSideExpression "*=" AssignmentExpression { $$ = CYNew CYMultiplyAssign($1, $3); } + | LeftHandSideExpression "/=" AssignmentExpression { $$ = CYNew CYDivideAssign($1, $3); } + | LeftHandSideExpression "%=" AssignmentExpression { $$ = CYNew CYModulusAssign($1, $3); } + | LeftHandSideExpression "+=" AssignmentExpression { $$ = CYNew CYAddAssign($1, $3); } + | LeftHandSideExpression "-=" AssignmentExpression { $$ = CYNew CYSubtractAssign($1, $3); } + | LeftHandSideExpression "<<=" AssignmentExpression { $$ = CYNew CYShiftLeftAssign($1, $3); } + | LeftHandSideExpression ">>=" AssignmentExpression { $$ = CYNew CYShiftRightSignedAssign($1, $3); } + | LeftHandSideExpression ">>>=" AssignmentExpression { $$ = CYNew CYShiftRightUnsignedAssign($1, $3); } + | LeftHandSideExpression "&=" AssignmentExpression { $$ = CYNew CYBitwiseAndAssign($1, $3); } + | LeftHandSideExpression "^=" AssignmentExpression { $$ = CYNew CYBitwiseXOrAssign($1, $3); } + | LeftHandSideExpression "|=" AssignmentExpression { $$ = CYNew CYBitwiseOrAssign($1, $3); } ; /* }}} */ /* 11.14 Comma Operator {{{ */ Expression_ - : "," Expression { $$ = new(driver.pool_) CYCompound($2); } - | { $$ = NULL; } + : "," Expression { $$ = $2; } + | { $$ = CYNew CYCompound(); } ; -ExpressionNoIn_ - : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); } - | { $$ = NULL; } +Expression + : AssignmentExpression Expression_ { $2->AddPrev($1); $$ = $2; } ; ExpressionOpt : Expression { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; - -ExpressionNoInOpt - : ExpressionNoIn { $$ = $1; } - | LexSetRegExp { $$ = NULL; } - ; - -Expression - : 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; } - ; /* }}} */ /* 12 Statements {{{ */ -Statement_ +Statement__ : Block { $$ = $1; } | VariableStatement { $$ = $1; } | EmptyStatement { $$ = $1; } - | ExpressionStatement { $$ = $1; } | IfStatement { $$ = $1; } - | IterationStatement { $$ = $1; } + | BreakableStatement { $$ = $1; } | ContinueStatement { $$ = $1; } | BreakStatement { $$ = $1; } | ReturnStatement { $$ = $1; } | WithStatement { $$ = $1; } | LabelledStatement { $$ = $1; } - | SwitchStatement { $$ = $1; } | ThrowStatement { $$ = $1; } | TryStatement { $$ = $1; } + | DebuggerStatement { $$ = $1; } + ; + +Statement_ + : LexSetRegExp Statement__ { $$ = $2; } + | ExpressionStatement { $$ = $1; } ; Statement - : LexSetRegExp Statement_ { $$ = $2; } + : LexSetStatement Statement_ { $$ = $2; } + ; + +Declaration__ + : FunctionDeclaration { $$ = $1; } + | LexicalDeclaration { $$ = $1; } + ; + +Declaration_ + : LexSetRegExp Declaration__ { $$ = $2; } + ; + +Declaration + : LexSetStatement Declaration_ { $$ = $2; } + ; + +BreakableStatement + : IterationStatement { $$ = $1; } + | SwitchStatement { $$ = $1; } ; /* }}} */ /* 12.1 Block {{{ */ Block_ - : "{" StatementListOpt "}" { $$ = $2; } + : BRACE StatementListOpt "}" { $$ = $2; } ; Block - : Block_ { if ($1) $$ = new(driver.pool_) CYBlock($1); else $$ = new(driver.pool_) CYEmpty(); } + : ";{" StatementListOpt "}" { $$ = CYNew CYBlock($2); } ; StatementList - : Statement StatementListOpt { $1->SetNext($2); $$ = $1; } + : StatementListItem StatementListOpt { $1->SetNext($2); $$ = $1; } ; StatementListOpt : StatementList { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; + +StatementListItem + : Statement { $$ = $1; } + | Declaration { $$ = $1; } + ; +/* }}} */ + +/* 12.2 Declarations {{{ */ +BindingIdentifier + : Identifier { $$ = $1; } + ; + +// XXX: BindingPattern +/* }}} */ +/* 12.2.1 Let and Const Declarations {{{ */ +LexicalDeclaration + : LetOrConst VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } + ; + +LetOrConst + : "let" + | "const" + ; /* }}} */ -/* 12.2 Variable Statement {{{ */ +/* 12.2.2 Variable Statement {{{ */ VariableStatement - : "var" VariableDeclarationList Terminator { $$ = new(driver.pool_) CYVar($2); } + : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } ; VariableDeclarationList_ @@ -1285,53 +1064,44 @@ VariableDeclarationList_ | { $$ = NULL; } ; -VariableDeclarationListNoIn_ - : "," VariableDeclarationListNoIn { $$ = $2; } - | { $$ = NULL; } - ; - VariableDeclarationList - : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); } - ; - -VariableDeclarationListNoIn - : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); } + : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); } ; VariableDeclaration - : Identifier InitialiserOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); } + : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } + // XXX: | BindingPattern Initialiser { $$ = CYNew CYDeclaration($1, $2); } ; -VariableDeclarationNoIn - : Identifier InitialiserNoInOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); } +Initialiser + : "=" AssignmentExpression { $$ = $2; } ; InitialiserOpt : Initialiser { $$ = $1; } | { $$ = NULL; } ; +/* }}} */ +/* 12.2.4 Destructuring Binding Patterns {{{ */ +// XXX: * -InitialiserNoInOpt - : InitialiserNoIn { $$ = $1; } - | { $$ = NULL; } - ; - -Initialiser - : "=" AssignmentExpression { $$ = $2; } +BindingElement + : SingleNameBinding { $$ = $1; } ; -InitialiserNoIn - : "=" AssignmentExpressionNoIn { $$ = $2; } +SingleNameBinding + : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } ; /* }}} */ + /* 12.3 Empty Statement {{{ */ EmptyStatement - : ";" { $$ = new(driver.pool_) CYEmpty(); } + : ";" { $$ = CYNew CYEmpty(); } ; /* }}} */ /* 12.4 Expression Statement {{{ */ ExpressionStatement - : ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); } + : Expression Terminator { $$ = CYNew CYExpress($1); } ; /* }}} */ /* 12.5 The if Statement {{{ */ @@ -1341,77 +1111,77 @@ ElseStatementOpt ; IfStatement - : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); } + : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = CYNew CYIf($3, $5, $6); } ; /* }}} */ -/* 12.6 Iteration Statements {{{ */ -IterationStatement - : DoWhileStatement { $$ = $1; } - | WhileStatement { $$ = $1; } - | ForStatement { $$ = $1; } - | ForInStatement { $$ = $1; } - ; -/* }}} */ /* 12.6.1 The do-while Statement {{{ */ -DoWhileStatement - : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); } +IterationStatement + : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); } ; /* }}} */ /* 12.6.2 The while Statement {{{ */ -WhileStatement - : "while" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWhile($3, $5); } +IterationStatement + : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); } ; /* }}} */ /* 12.6.3 The for Statement {{{ */ -ForStatement - : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new(driver.pool_) CYFor($3, $5, $7, $9); } +IterationStatement + : "for" "(" LexPushInOn ForStatementInitialiser LexPopIn ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); } ; ForStatementInitialiser - : ExpressionNoInOpt { $$ = $1; } - | LexSetRegExp "var" VariableDeclarationListNoIn { $$ = $3; } + : ExpressionOpt { $$ = $1; } + | LexSetRegExp "var" VariableDeclarationList { $$ = CYNew CYForDeclarations($3); } ; /* }}} */ -/* 12.6.4 The for-in Statement {{{ */ -ForInStatement - : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); } +/* 12.6.4 The for-in and for-of Statements {{{ */ +IterationStatement + : "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); } + | "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "of" Expression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); } ; ForInStatementInitialiser : LeftHandSideExpression { $$ = $1; } - | LexSetRegExp "var" VariableDeclarationNoIn { $$ = $3; } + | LexSetRegExp "var" VariableDeclaration { $$ = $3; } ; /* }}} */ /* 12.7 The continue Statement {{{ */ ContinueStatement - : "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); } + : "continue" "\n" StrictSemi { $$ = CYNew CYContinue(NULL); } + | "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); } ; /* }}} */ /* 12.8 The break Statement {{{ */ BreakStatement - : "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); } + : "break" "\n" StrictSemi { $$ = CYNew CYBreak(NULL); } + | "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); } ; /* }}} */ /* 12.9 The return Statement {{{ */ ReturnStatement - : "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); } + : "return" "\n" StrictSemi { $$ = CYNew CYReturn(NULL); } + | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); } ; /* }}} */ /* 12.10 The with Statement {{{ */ WithStatement - : "with" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWith($3, $5); } + : "with" "(" Expression ")" Statement { $$ = CYNew CYWith($3, $5); } ; /* }}} */ /* 12.11 The switch Statement {{{ */ SwitchStatement - : "switch" "(" Expression ")" CaseBlock { $$ = new(driver.pool_) CYSwitch($3, $5); } + : "switch" "(" Expression ")" CaseBlock { $$ = CYNew CYSwitch($3, $5); } ; CaseBlock - : "{" CaseClausesOpt "}" { $$ = $2; } + : BRACE CaseClausesOpt "}" { $$ = $2; } + ; + +CaseClause + : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } ; CaseClausesOpt @@ -1420,47 +1190,49 @@ CaseClausesOpt | { $$ = NULL; } ; -CaseClause - : "case" Expression ":" StatementListOpt { $$ = new(driver.pool_) CYClause($2, $4); } - ; - DefaultClause - : "default" ":" StatementListOpt { $$ = new(driver.pool_) CYClause(NULL, $3); } + : "default" ":" StatementListOpt { $$ = CYNew CYClause(NULL, $3); } ; /* }}} */ /* 12.12 Labelled Statements {{{ */ LabelledStatement - : Identifier ":" Statement { $$ = new(driver.pool_) CYLabel($1, $3); } + : Identifier ":" Statement { $$ = CYNew CYLabel($1, $3); } ; /* }}} */ /* 12.13 The throw Statement {{{ */ ThrowStatement - : "throw" Expression Terminator { $$ = new(driver.pool_) cy::Syntax::Throw($2); } + : "throw" "\n" StrictSemi { YYABORT; } + | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } ; /* }}} */ /* 12.14 The try Statement {{{ */ TryStatement - : "try" Block_ CatchOpt FinallyOpt { $$ = new(driver.pool_) cy::Syntax::Try($2, $3, $4); } + : "try" Block_ CatchOpt FinallyOpt { $$ = CYNew cy::Syntax::Try($2, $3, $4); } ; CatchOpt - : "catch" "(" Identifier ")" Block_ { $$ = new(driver.pool_) cy::Syntax::Catch($3, $5); } + : "catch" "(" Identifier ")" Block_ { $$ = CYNew cy::Syntax::Catch($3, $5); } | { $$ = NULL; } ; FinallyOpt - : "finally" Block_ { $$ = new(driver.pool_) CYFinally($2); } + : "finally" Block_ { $$ = CYNew CYFinally($2); } | { $$ = NULL; } ; /* }}} */ +/* 12.14 The debugger Statement {{{ */ +DebuggerStatement + : "debugger" Terminator { $$ = CYNew CYDebugger(); } + ; +/* }}} */ -/* 13 Function Definition {{{ */ +/* 13.1 Function Definitions {{{ */ FunctionDeclaration - : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionStatement($2, $4, $7); } + : ";function" Identifier "(" FormalParameterListOpt ")" BRACE FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); } ; FunctionExpression - : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($2, $4, $7); } + : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt LexPopIn ")" BRACE LexPushInOff FunctionBody LexPopIn "}" { $$ = CYNew CYFunctionExpression($2, $5, $10); } ; FormalParameterList_ @@ -1469,44 +1241,76 @@ FormalParameterList_ ; FormalParameterList - : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYFunctionParameter($1, $2); } + // XXX: : FunctionRestParameter { $$ = $1; } + : FormalParameter FormalParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); } + ; + +FormalParameterListOpt + : FormalParameterList | { $$ = NULL; } ; +/* XXX: FunctionRestParameter + : "..." BindingIdentifier { $$ = CYNew CYFunctionRestParameter($2); } + ;*/ + +FormalParameter + : BindingElement { $$ = $1; } + ; + FunctionBody - : SourceElements { $$ = $1; } + : StatementListOpt { $$ = $1; } ; /* }}} */ -/* 14 Program {{{ */ -Program - : SourceElements { driver.program_ = new(driver.pool_) CYProgram($1); } +/* 13.2 Arrow Function Definitions {{{ */ +ArrowFunction + : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFunctionExpression(NULL, $2, $5); } ; -SourceElements - : SourceElement SourceElements { $1->SetNext($2); $$ = $1; } - | LexSetRegExp { $$ = NULL; } +ArrowParameters + : BindingIdentifier { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1)); } + //| ParentheticalOpt { $$ = $1; } + ; + +ConciseBody + : AssignmentExpression { $$ = CYNew CYReturn($1); } + | ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $3; } + ; +/* }}} */ +/* 14 Program {{{ */ +Program + : ProgramBodyOpt { driver.program_ = CYNew CYProgram($1); } ; -SourceElement_ - : Statement_ { $$ = $1; } - | FunctionDeclaration { $$ = $1; } +ProgramBody + : StatementList { $$ = $1; } ; -SourceElement - : LexSetRegExp SourceElement_ { $$ = $2; } +ProgramBodyOpt + : ProgramBody { $$ = $1; } + | { $$ = NULL; } ; /* }}} */ @begin ObjectiveC /* Cycript (Objective-C): @class Declaration {{{ */ ClassSuperOpt - /* XXX: why the hell did I choose MemberExpressionNoBF? */ - : ":" LexSetRegExp MemberExpressionNoBF { $$ = $3; } + /* XXX: why the hell did I choose MemberExpression? */ + : ":" LexSetRegExp MemberExpression { $$ = $3; } | { $$ = NULL; } ; +ClassField + : Expression Identifier ";" + ; + ClassFieldList - : "{" "}" { $$ = NULL; } + : BRACE ClassFieldListOpt "}" { $$ = NULL; } + ; + +ClassFieldListOpt + : ClassFieldListOpt ClassField + | ; MessageScope @@ -1516,11 +1320,16 @@ MessageScope TypeOpt : "(" Expression ")" { $$ = $2; } + | "(" LexSetRegExp "void" ")" { $$ = NULL; } | { $$ = NULL; } ; MessageParameter - : Word ":" TypeOpt Identifier { $$ = new(driver.pool_) CYMessageParameter($1, $3, $4); } + : Word ":" TypeOpt Identifier { $$ = CYNew CYMessageParameter($1, $3, $4); } + ; + +MessageParameterList + : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } ; MessageParameterListOpt @@ -1528,21 +1337,18 @@ MessageParameterListOpt | { $$ = NULL; } ; -MessageParameterList - : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } - ; - MessageParameters : MessageParameterList { $$ = $1; } - | Word { $$ = new(driver.pool_) CYMessageParameter($1, NULL, NULL); } + | Word { $$ = CYNew CYMessageParameter($1, NULL, NULL); } ; ClassMessageDeclaration - : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new(driver.pool_) CYMessage($1, $2, $3, $5); } + : MessageScope TypeOpt MessageParameters BRACE FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); } ; ClassMessageDeclarationListOpt : ClassMessageDeclarationListOpt ClassMessageDeclaration { $2->SetNext($1); $$ = $2; } + | ClassMessageDeclarationListOpt Comment { $$ = $1; } | { $$ = NULL; } ; @@ -1558,7 +1364,7 @@ ClassNameOpt // XXX: this should be AssignmentExpressionNoRight ClassProtocols - : ShiftExpression ClassProtocolsOpt { $$ = new(driver.pool_) CYProtocol($1, $2); } + : ShiftExpression ClassProtocolsOpt { $$ = CYNew CYProtocol($1, $2); } ; ClassProtocolsOpt @@ -1572,54 +1378,67 @@ ClassProtocolListOpt ; ClassExpression - : "@class" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassExpression($2, $3, $4, $5, $6); } + : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt LexPopIn "@end" { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); } ; ClassStatement - : "@class" ClassName ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassStatement($2, $3, $4, $5, $6); } + : ";@implementation" ClassName ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassStatement($2, $3, $4, $5, $6); } + ; + +CategoryName + : "(" WordOpt ")" ; CategoryStatement - : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYCategory($2, $3); } + : ";@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); } ; -PrimaryExpressionBF +PrimaryExpression : ClassExpression { $$ = $1; } ; -Statement_ +Statement__ : ClassStatement { $$ = $1; } | CategoryStatement { $$ = $1; } ; /* }}} */ /* Cycript (Objective-C): Send Message {{{ */ VariadicCall - : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); } + : "," AssignmentExpression VariadicCall { $$ = CYNew CYArgument(NULL, $2, $3); } | { $$ = NULL; } ; -SelectorCall_ - : SelectorCall { $$ = $1; } - | VariadicCall { $$ = $1; } - ; - SelectorWordOpt : WordOpt { driver.contexts_.back().words_.push_back($1); } { $$ = $1; } | AutoComplete { driver.mode_ = CYDriver::AutoMessage; YYACCEPT; } ; +SelectorCall_ + : SelectorCall { $$ = $1; } + | VariadicCall { $$ = $1; } + ; + SelectorCall - : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = new(driver.pool_) CYArgument($1 ?: new(driver.pool_) CYBlank(), $3, $4); } + : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYBlank(), $3, $4); } ; SelectorList : SelectorCall { $$ = $1; } - | Word { $$ = new(driver.pool_) CYArgument($1, NULL); } + | Word { $$ = CYNew CYArgument($1, NULL); } ; MessageExpression - : "[" AssignmentExpression { driver.contexts_.push_back($2); } SelectorList "]" { driver.contexts_.pop_back(); } { $$ = new(driver.pool_) CYSendDirect($2, $4); } - | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = new(driver.pool_) CYSendSuper($5); } + : "[" LexPushInOff AssignmentExpression { driver.contexts_.push_back($3); } SelectorList LexPopIn "]" { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($3, $5); } + | "[" LexPushInOff LexSetRegExp "super" { driver.context_ = NULL; } SelectorList LexPopIn "]" { $$ = CYNew CYSendSuper($6); } + ; + +SelectorExpression_ + : WordOpt ":" SelectorExpressionOpt { $$ = CYNew CYSelectorPart($1, true, $3); } + ; + +SelectorExpression + : SelectorExpression_ { $$ = $1; } + | Word { $$ = CYNew CYSelectorPart($1, false, NULL); } ; SelectorExpressionOpt @@ -1627,42 +1446,65 @@ SelectorExpressionOpt | { $$ = NULL; } ; -SelectorExpression_ - : WordOpt ":" SelectorExpressionOpt { $$ = new(driver.pool_) CYSelectorPart($1, true, $3); } +PrimaryExpression + : MessageExpression { $$ = $1; } + | "@selector" "(" LexPushInOff SelectorExpression LexPopIn ")" { $$ = CYNew CYSelector($4); } + ; +/* }}} */ +/* Cycript (Objective-C): @import Directive {{{ */ +PathName + : "/" PathName + | "." PathName + | Word PathName + | ; -SelectorExpression - : SelectorExpression_ { $$ = $1; } - | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); } +ImportPath + : "<" PathName ">" + | StringLiteral ; -PrimaryExpressionNo - : MessageExpression { $$ = $1; } - | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); } +StatementListItem + : "@import" ImportPath { $$ = CYNew CYImport(); } + ; +/* }}} */ +/* Cycript (Objective-C): Boxed Expressions {{{ */ +BoxableExpression + : NullLiteral { $$ = $1; } + | BooleanLiteral { $$ = $1; } + | NumericLiteral { $$ = $1; } + | StringLiteral { $$ = $1; } + | ArrayLiteral { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | Parenthetical { $$ = $1; } + ; + +PrimaryExpression + : "@" BoxableExpression { $$ = CYNew CYBox($2); } ; /* }}} */ @end @begin C /* Cycript (C): Pointer Indirection/Addressing {{{ */ -UnaryAssigneeExpression - : "*" UnaryExpressionNoRE { $$ = new(driver.pool_) CYIndirect($2); } +LeftHandSideExpression + : LexSetRegExp "*" UnaryExpression { $$ = CYNew CYIndirect($3); } ; UnaryExpression_ - : "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); } + : "&" UnaryExpression { $$ = CYNew CYAddressOf($2); } ; MemberAccess - : "->" "[" Expression "]" { $$ = new(driver.pool_) CYIndirectMember(NULL, $3); } - | "->" Identifier { $$ = new(driver.pool_) CYIndirectMember(NULL, new(driver.pool_) CYString($2)); } + : "->" "[" Expression "]" { $$ = CYNew CYIndirectMember(NULL, $3); } + | "->" IdentifierName { $$ = CYNew CYIndirectMember(NULL, CYNew CYString($2)); } | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; } ; /* }}} */ @end /* YUI: Documentation Comments {{{ */ -Statement_ +Statement__ : Comment { $$ = $1; } ; /* }}} */ @@ -1693,11 +1535,12 @@ LexSetXMLTag : { driver.SetCondition(CYDriver::XMLTagCondition); } ; /* }}} */ - +/* Virtual Tokens {{{ */ XMLWhitespaceOpt : XMLWhitespace | ; +/* }}} */ /* 8.1 Context Keywords {{{ */ Identifier @@ -1712,9 +1555,10 @@ XMLMarkup | XMLPI { $$ = $1; } ; /* }}} */ + /* 11.1 Primary Expressions {{{ */ -PrimaryExpressionNo - : PropertyIdentifier { $$ = new(driver.pool_) CYPropertyVariable($1); } +PrimaryExpression + : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); } | XMLInitialiser { $$ = $1; } | XMLListInitialiser { $$ = $1; } ; @@ -1727,32 +1571,32 @@ PropertyIdentifier /* }}} */ /* 11.1.1 Attribute Identifiers {{{ */ AttributeIdentifier - : "@" QualifiedIdentifier_ { $$ = new(driver.pool_) CYAttribute($2); } + : "@" QualifiedIdentifier_ { $$ = CYNew CYAttribute($2); } ; PropertySelector_ : PropertySelector { $$ = $1; } - | "[" Expression "]" { $$ = new(driver.pool_) CYSelector($2); } + | "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYSelector($3); } ; PropertySelector - : Identifier { $$ = new(driver.pool_) CYSelector($1); } + : Identifier { $$ = CYNew CYSelector($1); } | WildcardIdentifier { $$ = $1; } ; /* }}} */ /* 11.1.2 Qualified Identifiers {{{ */ QualifiedIdentifier_ - : PropertySelector_ { $$ = new(driver.pool_) CYQualified(NULL, $1); } + : PropertySelector_ { $$ = CYNew CYQualified(NULL, $1); } | QualifiedIdentifier { $$ = $1; } ; QualifiedIdentifier - : PropertySelector "::" PropertySelector_ { $$ = new(driver.pool_) CYQualified($1, $3); } + : PropertySelector "::" PropertySelector_ { $$ = CYNew CYQualified($1, $3); } ; /* }}} */ /* 11.1.3 Wildcard Identifiers {{{ */ WildcardIdentifier - : "*" { $$ = new(driver.pool_) CYWildcard(); } + : "*" { $$ = CYNew CYWildcard(); } ; /* }}} */ /* 11.1.4 XML Initialiser {{{ */ @@ -1762,8 +1606,8 @@ XMLInitialiser ; XMLElement - : "<" XMLTagContent "/>" LexPop - | "<" XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" LexPop + : "<" LexPushInOff XMLTagContent LexPop LexPopIn "/>" + | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" ; XMLTagContent @@ -1771,7 +1615,7 @@ XMLTagContent ; XMLExpression - : "{" LexPushRegExp Expression "}" LexPop + : BRACE LexPushRegExp Expression LexPop "}" ; XMLTagName @@ -1812,9 +1656,10 @@ XMLElementContentOpt /* }}} */ /* 11.1.5 XMLList Initialiser {{{ */ XMLListInitialiser - : "<>" LexPushXMLContent XMLElementContent "" LexPop { $$ = new(driver.pool_) CYXMLList($3); } + : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop LexPopIn "" { $$ = CYNew CYXMLList($4); } ; /* }}} */ + /* 11.2 Left-Hand-Side Expressions {{{ */ PropertyIdentifier_ : Identifier { $$ = $1; } @@ -1822,36 +1667,34 @@ PropertyIdentifier_ ; MemberAccess - : "." PropertyIdentifier { $$ = new(driver.pool_) CYPropertyMember(NULL, $2); } - | ".." PropertyIdentifier_ { $$ = new(driver.pool_) CYDescendantMember(NULL, $2); } - | "." "(" Expression ")" { $$ = new(driver.pool_) CYFilteringPredicate(NULL, $3); } + : "." PropertyIdentifier { $$ = CYNew CYPropertyMember(NULL, $2); } + | ".." PropertyIdentifier_ { $$ = CYNew CYDescendantMember(NULL, $2); } + | "." "(" Expression ")" { $$ = CYNew CYFilteringPredicate(NULL, $3); } ; /* }}} */ /* 12.1 The default xml namespace Statement {{{ */ /* XXX: DefaultXMLNamespaceStatement - : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); } + : "default" "xml" "namespace" "=" Expression Terminator { $$ = CYNew CYDefaultXMLNamespace($5); } ; -Statement_ +Statement__ : DefaultXMLNamespaceStatement { $$ = $1; } ; */ /* }}} */ @end -/* ECMAScript5: Object Literal Trailing Comma {{{ */ -PropertyNameAndValueList_ - : "," { $$ = NULL; } - ; -/* }}} */ - /* JavaScript 1.7: Array Comprehensions {{{ */ IfComprehension - : "if" "(" Expression ")" { $$ = new(driver.pool_) CYIfComprehension($3); } + : "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); } ; ForComprehension - : "for" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForInComprehension($3, $5); } - | "for" "each" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForEachInComprehension($4, $6); } + : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); } + | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); } + ; + +ComprehensionList + : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; } ; ComprehensionListOpt @@ -1860,37 +1703,56 @@ ComprehensionListOpt | { $$ = NULL; } ; -ComprehensionList - : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; } - ; - -PrimaryExpressionNo - : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); } +PrimaryExpression + : "[" LexPushInOff AssignmentExpression ComprehensionList LexPopIn "]" { $$ = CYNew CYArrayComprehension($3, $4); } ; /* }}} */ /* JavaScript 1.7: for each {{{ */ -ForInStatement - : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForEachIn($4, $6, $8); } +IterationStatement + : "for" "each" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); } ; /* }}} */ -/* JavaScript 1.7: let Statements {{{ *//* +/* JavaScript 1.7: let Statements {{{ */ LetStatement - : "let" "(" VariableDeclarationList ")" Block_ { $$ = new(driver.pool_) CYLet($3, $5); } + : "let" "(" VariableDeclarationList ")" Statement { $$ = CYNew CYLetStatement($3, $5); } ; -Statement_ +Statement__ : LetStatement ; -*//* }}} */ +/* }}} */ -/* JavaScript FTW: Function Statements {{{ */ -Statement - : LexSetRegExp FunctionDeclaration { driver.Warning(yylloc, "warning, FunctionDeclaration is a SourceElement, not a Statement"); } { $$ = $2; } +/* JavaScript FTW: Ruby Blocks {{{ */ +RubyProcParameterList_ + : "," RubyProcParameterList { $$ = $2; } + | { $$ = NULL; } ; -/* }}} */ -/* JavaScript FTW: Optional Arguments {{{ */ -FormalParameterList - : Identifier "=" AssignmentExpression FormalParameterList_ { $$ = new(driver.pool_) CYOptionalFunctionParameter($1, $3, $4); } + +RubyProcParameterList + : Identifier RubyProcParameterList_ { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1), $2); } + | { $$ = NULL; } + ; + +RubyProcParameters + : "|" RubyProcParameterList "|" { $$ = $2; } + | "||" { $$ = NULL; } + ; + +RubyProcParametersOpt + : RubyProcParameters + | { $$ = NULL; } + ; + +RubyProcExpression + : "{" RubyProcParametersOpt StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); } + ; + +PrimaryExpression + : "{" LexPushInOff RubyProcParameters StatementListOpt LexPopIn "}" { $$ = CYNew CYRubyProc($3, $4); } + ; + +CallExpression + : CallExpression_ RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } ; /* }}} */