X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c8a0500b2fc78101e1a7f3b2c99939f88a33aa4d..62f398e4aed5b34ee2bd8edff9fb3afa80d75e25:/Cycript.yy.in?ds=inline diff --git a/Cycript.yy.in b/Cycript.yy.in index ed14164..5a35dd7 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -1,20 +1,20 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU General Public License, Version 3 {{{ */ /* - * 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. + * Cycript is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published + * by the Free Software Foundation, either version 3 of the License, + * or (at your option) any later version. * - * 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. + * 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 General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with Cycript. If not, see . **/ /* }}} */ @@ -28,6 +28,7 @@ @if Bison24 } @if Bison24 %code requires { +#include "Driver.hpp" #include "Parser.hpp" #define CYNew new($pool) @@ -39,8 +40,11 @@ #include "E4X/Syntax.hpp" @end +#include "Highlight.hpp" + typedef struct { bool newline_; + hi::Value highlight_; union { bool bool_; @@ -68,6 +72,7 @@ typedef struct { CYInfix *infix_; CYLiteral *literal_; CYMember *member_; + CYModule *module_; CYNull *null_; CYNumber *number_; CYProgram *program_; @@ -87,6 +92,9 @@ typedef struct { CYMessageParameter *messageParameter_; CYProtocol *protocol_; CYSelectorPart *selector_; + CYTypeModifier *modifier_; + CYTypedIdentifier *typedIdentifier_; + CYTypedParameter *typedParameter_; @end @begin E4X @@ -126,6 +134,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %parse-param { CYDriver &driver } %lex-param { void *cyscanner } +/* Token Declarations {{{ */ @begin E4X %token XMLCDATA %token XMLComment @@ -151,6 +160,7 @@ int cylex(YYSTYPE *, cy::location *, void *); @begin E4X ObjectiveC %token At "@" +%token Pound "#" @end %token Ampersand "&" @@ -161,6 +171,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Equal "=" %token EqualEqual "==" %token EqualEqualEqual "===" +%token EqualRight "=>" %token Exclamation "!" %token ExclamationEqual "!=" %token ExclamationEqualEqual "!==" @@ -209,20 +220,31 @@ int cylex(YYSTYPE *, cy::location *, void *); %token OpenBrace "{" %token OpenBrace_ "\n{" +%token OpenBrace__ ";{" %token CloseBrace "}" %token OpenBracket "[" %token CloseBracket "]" +%token AtError "@error" + @begin Java %token AtClass "@class" @end +@begin C +%token Typedef "typedef" +@end + @begin ObjectiveC %token AtImplementation "@implementation" +%token AtImplementation_ ";@implementation" %token AtImport "@import" +%token AtEncode "@encode" %token AtEnd "@end" %token AtSelector "@selector" +%token Yes "YES" +%token No "NO" @end %token False "false" @@ -230,6 +252,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token True "true" // ES3/ES5/WIE/JSC Reserved +%token Auto "auto" %token Break "break" %token Case "case" %token Catch "catch" @@ -241,8 +264,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" @@ -303,6 +328,7 @@ int cylex(YYSTYPE *, cy::location *, void *); // Woah?! %token Each "each" +%token Of "of" @begin E4X // E4X Conditional @@ -318,50 +344,45 @@ int cylex(YYSTYPE *, cy::location *, void *); %token RegularExpressionLiteral %type AdditiveExpression -%type AdditiveExpressionNoBF -%type ArgumentList %type ArgumentList_ +%type ArgumentList %type ArgumentListOpt %type Arguments +%type ArrayComprehension +%type ArrayInitialiser %type ArrayLiteral -%type AssigneeExpression -%type AssigneeExpressionNoBF +%type ArrowFunction +%type ArrowParameters %type AssignmentExpression -%type AssignmentExpression_ -%type AssignmentExpressionNoBF -%type AssignmentExpressionNoIn +%type Binding %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 %type CatchOpt -%type ComprehensionList -%type ComprehensionListOpt +%type Comprehension +%type ComprehensionFor +%type ComprehensionIf +%type ComprehensionTail %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 @@ -369,132 +390,93 @@ 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 FormalParameter -%type FormalParameterList %type FormalParameterList_ +%type FormalParameterList %type FormalParameterListOpt %type FunctionBody %type FunctionDeclaration %type FunctionExpression %type Identifier %type IdentifierOpt -%type IfComprehension +%type IdentifierName %type IfStatement %type Initialiser %type InitialiserOpt -%type InitialiserNoIn -%type InitialiserNoInOpt %type IterationStatement %type LabelledStatement %type LeftHandSideExpression -%type LeftHandSideExpressionNoBF -//%type LetExpression %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 ProgramBody %type ProgramBodyOpt -%type PropertyName %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 RubyProcExpressionNoOA -%type RubyProcParameterList %type RubyProcParameterList_ +%type RubyProcParameterList %type RubyProcParameters %type RubyProcParametersOpt %type ShiftExpression -%type ShiftExpressionNoBF %type SingleNameBinding -%type Statement +%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 +%type Variable @begin ObjectiveC +%type ArrayedType +%type BoxableExpression %type CategoryStatement %type ClassExpression +%type ClassFieldListOpt +%type ClassFields %type ClassStatement %type ClassSuperOpt -%type ClassFieldList %type ClassMessageDeclaration %type ClassMessageDeclarationListOpt %type ClassName @@ -502,31 +484,44 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ClassProtocolListOpt %type ClassProtocols %type ClassProtocolsOpt +%type EncodedType +%type FunctionedType %type MessageExpression %type MessageParameter %type MessageParameters %type MessageParameterList %type MessageParameterListOpt %type MessageScope -%type SelectorCall +%type ModifiedType +%type Module +%type PrefixedType +%type PrimitiveType %type SelectorCall_ -%type SelectorExpression +%type SelectorCall %type SelectorExpression_ +%type SelectorExpression %type SelectorExpressionOpt %type SelectorList %type SelectorWordOpt +%type SuffixedType %type TypeOpt +%type TypeParenthetical +%type TypeQualifierLeft +%type TypeQualifierRight +%type TypeSignifier +%type TypedIdentifier +%type TypedParameterList_ +%type TypedParameterList +%type TypedParameterListOpt %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 @@ -541,80 +536,78 @@ 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); } ; -/* }}} */ -Brace - : "{" - | "\n{" +LexNoBrace + : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; } ; -StrictSemi - : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); } +LexNoFunction + : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; } ; -Terminator_ - : ";" - | "\n" StrictSemi +LexNoAtImplementation : +@begin ObjectiveC + { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; } +@end ; -TerminatorOpt - : Terminator_ - | error { yyerrok; driver.errors_.pop_back(); } StrictSemi +LexSetStatement + : LexNoBrace LexNoFunction LexNoAtImplementation + ; +/* }}} */ +/* Virtual Tokens {{{ */ +BRACE + : "{" + | "\n{" ; -Terminator - : Terminator_ - | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi +Var_ + : "var" ; +/* }}} */ -/*CommaOpt - : "," - | - ;*/ +/* 7.6 Identifier Names and Identifiers {{{ */ +IdentifierName + : Word { $$ = $1; } + ; -@begin ObjectiveC NewLineOpt : "\n" | ; -WordOpt - : Word { $$ = $1; } - | { $$ = NULL; } - ; - Word : Identifier { $$ = $1; } + | "auto" { $$ = $1; } | "break" NewLineOpt { $$ = $1; } | "case" { $$ = $1; } | "catch" { $$ = $1; } @@ -636,7 +629,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; } @@ -653,17 +651,20 @@ Word | "with" { $$ = $1; } ; -PrimaryExpressionNo - : "@" LiteralNoRE { $$ = CYNew CYBox($2); } - | "@" ArrayLiteral { $$ = CYNew CYBox($2); } - | "@" ObjectLiteral { $$ = CYNew CYBox($2); } - | "@" "(" Expression ")" { $$ = CYNew CYBox($3); } +WordOpt + : Word { $$ = $1; } + | { $$ = NULL; } ; -@end Identifier : Identifier_ { $$ = $1; } +@begin C + | "typedef" { $$ = $1; } + | "YES" { $$ = $1; } + | "NO" { $$ = $1; } +@end + | "implements" { $$ = $1; } | "interface" { $$ = $1; } | "package" { $$ = $1; } @@ -689,72 +690,95 @@ Identifier | "transient" { $$ = $1; } | "volatile" { $$ = $1; } - // XXX: is this allowed?! | "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; } + | ValueLiteral { $$ = $1; } ; -LiteralRE - : RegularExpressionLiteral { $$ = $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; } ; +/* }}} */ + +/* 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 + ; + +TerminatorOpt + : ";" + | error { yyerrok; driver.errors_.pop_back(); } StrictSemi + ; +/* }}} */ /* 11.1 Primary Expressions {{{ */ -PrimaryExpression - : LexSetRegExp PrimaryExpressionNoRE { $$ = $2; } +Parenthetical + : "(" LexPushInOff Expression ")" LexPopIn { $$ = $3; } ; -PrimaryExpressionNoBF - : PrimaryExpressionNo { $$ = $1; } +ParentheticalOpt + : Parenthetical { $$ = $1; } + | { $$ = NULL; } ; -PrimaryExpressionNoRE - : PrimaryExpressionBF { $$ = $1; } - | PrimaryExpressionNo { $$ = $1; } +Variable + : Identifier { $$ = CYNew CYVariable($1); } ; -PrimaryExpressionNo +PrimaryExpression : "this" { $$ = $1; } - | Identifier { $$ = CYNew CYVariable($1); } - | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; } + | Variable { $$ = $1; } | Literal { $$ = $1; } - | ArrayLiteral { $$ = $1; } - | "(" Expression ")" { $$ = $2; } + | ArrayInitialiser { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | Parenthetical { $$ = $1; } + | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; } ; - -PrimaryExpressionBF - : ObjectLiteral { $$ = $1; } +/* }}} */ +/* 11.1.4 Array Initializer {{{ */ +ArrayInitialiser + : ArrayLiteral { $$ = $1; } + | ArrayComprehension { $$ = $1; } ; /* }}} */ -/* 11.1.4 Array Initialiser {{{ */ +/* 11.1.4.1 Array Literal {{{ */ ArrayLiteral - : "[" ElementListOpt "]" { $$ = CYNew CYArray($2); } + : "[" LexPushInOff ElementListOpt "]" LexPopIn { $$ = CYNew CYArray($3); } ; Element @@ -766,37 +790,68 @@ ElementOpt | LexSetRegExp { $$ = NULL; } ; +ElementList + : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); } + | Element { $$ = CYNew CYElement($1, NULL); } + ; + ElementListOpt : ElementList { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; +/* }}} */ +/* 11.1.4.2 Array Comprehension {{{ */ +ArrayComprehension + : "[" LexPushInOff Comprehension "]" LexPopIn { $$ = $3; } + ; -ElementList - : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); } - | Element { $$ = CYNew CYElement($1, NULL); } +Comprehension + : LexSetRegExp ComprehensionFor ComprehensionTail AssignmentExpression { $$ = CYNew CYArrayComprehension($4, $2->Modify($3)); } + ; + +ComprehensionTail + : { $$ = NULL; } + | ComprehensionFor ComprehensionTail { $$ = $1->Modify($2); } + | ComprehensionIf ComprehensionTail { $$ = $1->Modify($2); } + ; + +ComprehensionFor + : "for" "(" Binding "of" Expression ")" { $$ = CYNew CYForOfComprehension($3, $5); } + ; + +ComprehensionIf + : "if" "(" AssignmentExpression ")" { $$ = CYNew CYIfComprehension($3); } ; /* }}} */ /* 11.1.5 Object Initialiser {{{ */ ObjectLiteral - : Brace PropertyNameAndValueListOpt "}" { $$ = CYNew CYObject($2); } + : BRACE LexPushInOff PropertyDefinitionListOpt "}" LexPopIn { $$ = CYNew CYObject($3); } ; -PropertyNameAndValueList_ - : "," PropertyNameAndValueList { $$ = $2; } +PropertyDefinitionList_ + : "," PropertyDefinitionList { $$ = $2; } + | "," LexSetRegExp { $$ = NULL; } | { $$ = NULL; } ; -PropertyNameAndValueListOpt - : PropertyNameAndValueList { $$ = $1; } - | { $$ = NULL; } +PropertyDefinitionList + : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; } + ; + +PropertyDefinitionListOpt + : PropertyDefinitionList { $$ = $1; } + | LexSetRegExp { $$ = NULL; } ; -PropertyNameAndValueList - : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew 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; } ; @@ -807,134 +862,68 @@ PropertyName /* }}} */ /* 11.2 Left-Hand-Side Expressions {{{ */ -MemberExpression_ - : "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($2, $3); } - ; - MemberAccess - : "[" Expression "]" { $$ = CYNew CYDirectMember(NULL, $2); } - | "." Identifier { $$ = CYNew CYDirectMember(NULL, CYNew 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 { $$ = CYNew cy::Syntax::New($2, NULL); } +MemberExpression + : LexSetRegExp PrimaryExpression { $$ = $2; } + | LexSetRegExp FunctionExpression { $$ = $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; } + | LexSetRegExp "new" NewExpression { $$ = CYNew cy::Syntax::New($3, NULL); } ; -NewExpressionNoBF - : MemberExpressionNoBF { $$ = $1; } - | NewExpression_ { $$ = $1; } +CallExpression_ + : MemberExpression_ + | CallExpression ; -@begin C -NewExpressionNoRE - : MemberExpressionNoRE { $$ = $1; } - | NewExpression_ { $$ = $1; } - ; -@end - CallExpression - : MemberExpression Arguments { $$ = CYNew CYCall($1, $2); } - | CallExpression Arguments { $$ = CYNew CYCall($1, $2); } + : CallExpression_ Arguments { $$ = CYNew CYCall($1, $2); } | CallExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } ; -CallExpressionNoBF - : MemberExpressionNoBF Arguments { $$ = CYNew CYCall($1, $2); } - | CallExpressionNoBF Arguments { $$ = CYNew CYCall($1, $2); } - | CallExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - ; - -@begin C -CallExpressionNoRE - : MemberExpressionNoRE Arguments { $$ = CYNew CYCall($1, $2); } - | CallExpressionNoRE Arguments { $$ = CYNew 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_ { $$ = 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; } + : %prec "" LeftHandSideExpression { $$ = $1; } | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); } | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); } ; - -PostfixExpressionNoBF - : AssigneeExpressionNoBF { $$ = $1; } - | LeftHandSideExpressionNoBF "++" { $$ = CYNew CYPostIncrement($1); } - | LeftHandSideExpressionNoBF "--" { $$ = CYNew CYPostDecrement($1); } - ; - -@begin C -PostfixExpressionNoRE - : AssigneeExpressionNoRE { $$ = $1; } - | LeftHandSideExpressionNoRE "++" { $$ = CYNew CYPostIncrement($1); } - | LeftHandSideExpressionNoRE "--" { $$ = CYNew CYPostDecrement($1); } - ; -@end /* }}} */ /* 11.4 Unary Operators {{{ */ UnaryExpression_ @@ -955,18 +944,6 @@ UnaryExpression : PostfixExpression { $$ = $1; } | LexSetRegExp UnaryExpression_ { $$ = $2; } ; - -UnaryExpressionNoBF - : PostfixExpressionNoBF { $$ = $1; } - | UnaryExpression_ { $$ = $1; } - ; - -@begin C -UnaryExpressionNoRE - : PostfixExpressionNoRE { $$ = $1; } - | UnaryExpression_ { $$ = $1; } - ; -@end /* }}} */ /* 11.5 Multiplicative Operators {{{ */ MultiplicativeExpression @@ -975,13 +952,6 @@ MultiplicativeExpression | MultiplicativeExpression "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); } | MultiplicativeExpression "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); } ; - -MultiplicativeExpressionNoBF - : UnaryExpressionNoBF { $$ = $1; } - | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); } - | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); } - | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); } - ; /* }}} */ /* 11.6 Additive Operators {{{ */ AdditiveExpression @@ -989,12 +959,6 @@ AdditiveExpression | AdditiveExpression "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); } | AdditiveExpression "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); } ; - -AdditiveExpressionNoBF - : MultiplicativeExpressionNoBF { $$ = $1; } - | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); } - | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); } - ; /* }}} */ /* 11.7 Bitwise Shift Operators {{{ */ ShiftExpression @@ -1003,41 +967,16 @@ ShiftExpression | ShiftExpression ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); } | ShiftExpression ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); } ; - -ShiftExpressionNoBF - : AdditiveExpressionNoBF { $$ = $1; } - | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); } - | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); } - | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); } - ; /* }}} */ /* 11.8 Relational Operators {{{ */ -RelationalExpressionNoIn_ - : "<" ShiftExpression { $$ = CYNew CYLess(NULL, $2); } - | ">" ShiftExpression { $$ = CYNew CYGreater(NULL, $2); } - | "<=" ShiftExpression { $$ = CYNew CYLessOrEqual(NULL, $2); } - | ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual(NULL, $2); } - | "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf(NULL, $2); } - ; - -RelationalExpression_ - : RelationalExpressionNoIn_ { $$ = $1; } - | "in" ShiftExpression { $$ = CYNew 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 {{{ */ @@ -1048,22 +987,6 @@ EqualityExpression | EqualityExpression "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); } | EqualityExpression "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); } ; - -EqualityExpressionNoIn - : RelationalExpressionNoIn { $$ = $1; } - | EqualityExpressionNoIn "==" RelationalExpressionNoIn { $$ = CYNew CYEqual($1, $3); } - | EqualityExpressionNoIn "!=" RelationalExpressionNoIn { $$ = CYNew CYNotEqual($1, $3); } - | EqualityExpressionNoIn "===" RelationalExpressionNoIn { $$ = CYNew CYIdentical($1, $3); } - | EqualityExpressionNoIn "!==" RelationalExpressionNoIn { $$ = CYNew CYNotIdentical($1, $3); } - ; - -EqualityExpressionNoBF - : RelationalExpressionNoBF { $$ = $1; } - | EqualityExpressionNoBF "==" RelationalExpression { $$ = CYNew CYEqual($1, $3); } - | EqualityExpressionNoBF "!=" RelationalExpression { $$ = CYNew CYNotEqual($1, $3); } - | EqualityExpressionNoBF "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); } - | EqualityExpressionNoBF "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); } - ; /* }}} */ /* 11.10 Binary Bitwise Operators {{{ */ BitwiseANDExpression @@ -1071,45 +994,15 @@ BitwiseANDExpression | BitwiseANDExpression "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); } ; -BitwiseANDExpressionNoIn - : EqualityExpressionNoIn { $$ = $1; } - | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = CYNew CYBitwiseAnd($1, $3); } - ; - -BitwiseANDExpressionNoBF - : EqualityExpressionNoBF { $$ = $1; } - | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); } - ; - BitwiseXORExpression : BitwiseANDExpression { $$ = $1; } | BitwiseXORExpression "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); } ; -BitwiseXORExpressionNoIn - : BitwiseANDExpressionNoIn { $$ = $1; } - | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = CYNew CYBitwiseXOr($1, $3); } - ; - -BitwiseXORExpressionNoBF - : BitwiseANDExpressionNoBF { $$ = $1; } - | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); } - ; - BitwiseORExpression : BitwiseXORExpression { $$ = $1; } | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); } ; - -BitwiseORExpressionNoIn - : BitwiseXORExpressionNoIn { $$ = $1; } - | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = CYNew CYBitwiseOr($1, $3); } - ; - -BitwiseORExpressionNoBF - : BitwiseXORExpressionNoBF { $$ = $1; } - | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); } - ; /* }}} */ /* 11.11 Binary Logical Operators {{{ */ LogicalANDExpression @@ -1117,150 +1010,57 @@ LogicalANDExpression | LogicalANDExpression "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); } ; -LogicalANDExpressionNoIn - : BitwiseORExpressionNoIn { $$ = $1; } - | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = CYNew CYLogicalAnd($1, $3); } - ; - -LogicalANDExpressionNoBF - : BitwiseORExpressionNoBF { $$ = $1; } - | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); } - ; - LogicalORExpression : LogicalANDExpression { $$ = $1; } | LogicalORExpression "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); } ; - -LogicalORExpressionNoIn - : LogicalANDExpressionNoIn { $$ = $1; } - | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = CYNew CYLogicalOr($1, $3); } - ; - -LogicalORExpressionNoBF - : LogicalANDExpressionNoBF { $$ = $1; } - | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); } - ; /* }}} */ /* 11.12 Conditional Operator ( ? : ) {{{ */ ConditionalExpression : LogicalORExpression { $$ = $1; } - | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); } - ; - -ConditionalExpressionNoIn - : LogicalORExpressionNoIn { $$ = $1; } - | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = CYNew CYCondition($1, $3, $5); } - ; - -ConditionalExpressionNoBF - : LogicalORExpressionNoBF { $$ = $1; } - | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); } + | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); } + | LogicalORExpression "?" LexPushInOff LexSetRegExp ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $1, $7); } ; /* }}} */ /* 11.13 Assignment Operators {{{ */ -AssignmentExpression_ - : "=" AssignmentExpression { $$ = CYNew CYAssign(NULL, $2); } - | "*=" AssignmentExpression { $$ = CYNew CYMultiplyAssign(NULL, $2); } - | "/=" AssignmentExpression { $$ = CYNew CYDivideAssign(NULL, $2); } - | "%=" AssignmentExpression { $$ = CYNew CYModulusAssign(NULL, $2); } - | "+=" AssignmentExpression { $$ = CYNew CYAddAssign(NULL, $2); } - | "-=" AssignmentExpression { $$ = CYNew CYSubtractAssign(NULL, $2); } - | "<<=" AssignmentExpression { $$ = CYNew CYShiftLeftAssign(NULL, $2); } - | ">>=" AssignmentExpression { $$ = CYNew CYShiftRightSignedAssign(NULL, $2); } - | ">>>=" AssignmentExpression { $$ = CYNew CYShiftRightUnsignedAssign(NULL, $2); } - | "&=" AssignmentExpression { $$ = CYNew CYBitwiseAndAssign(NULL, $2); } - | "^=" AssignmentExpression { $$ = CYNew CYBitwiseXOrAssign(NULL, $2); } - | "|=" AssignmentExpression { $$ = CYNew 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 { $$ = CYNew CYAssign($1, $3); } - | AssigneeExpression "*=" AssignmentExpressionNoIn { $$ = CYNew CYMultiplyAssign($1, $3); } - | AssigneeExpression "/=" AssignmentExpressionNoIn { $$ = CYNew CYDivideAssign($1, $3); } - | AssigneeExpression "%=" AssignmentExpressionNoIn { $$ = CYNew CYModulusAssign($1, $3); } - | AssigneeExpression "+=" AssignmentExpressionNoIn { $$ = CYNew CYAddAssign($1, $3); } - | AssigneeExpression "-=" AssignmentExpressionNoIn { $$ = CYNew CYSubtractAssign($1, $3); } - | AssigneeExpression "<<=" AssignmentExpressionNoIn { $$ = CYNew CYShiftLeftAssign($1, $3); } - | AssigneeExpression ">>=" AssignmentExpressionNoIn { $$ = CYNew CYShiftRightSignedAssign($1, $3); } - | AssigneeExpression ">>>=" AssignmentExpressionNoIn { $$ = CYNew CYShiftRightUnsignedAssign($1, $3); } - | AssigneeExpression "&=" AssignmentExpressionNoIn { $$ = CYNew CYBitwiseAndAssign($1, $3); } - | AssigneeExpression "^=" AssignmentExpressionNoIn { $$ = CYNew CYBitwiseXOrAssign($1, $3); } - | AssigneeExpression "|=" AssignmentExpressionNoIn { $$ = CYNew 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 { $$ = CYNew CYCompound($2); } - | { $$ = NULL; } + : "," Expression { $$ = $2; } + | { $$ = CYNew CYCompound(); } ; -ExpressionNoIn_ - : "," ExpressionNoIn { $$ = CYNew 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; } | BreakableStatement { $$ = $1; } | ContinueStatement { $$ = $1; } @@ -1273,15 +1073,28 @@ Statement_ | DebuggerStatement { $$ = $1; } ; +Statement_ + : LexSetRegExp Statement__ { $$ = $2; } + | ExpressionStatement { $$ = $1; } + ; + Statement - : LexSetRegExp Statement_ { $$ = $2; } + : LexSetStatement Statement_ { $$ = $2; } ; -Declaration +Declaration__ : FunctionDeclaration { $$ = $1; } | LexicalDeclaration { $$ = $1; } ; +Declaration_ + : LexSetRegExp Declaration__ { $$ = $2; } + ; + +Declaration + : LexSetStatement Declaration_ { $$ = $2; } + ; + BreakableStatement : IterationStatement { $$ = $1; } | SwitchStatement { $$ = $1; } @@ -1289,11 +1102,11 @@ BreakableStatement /* }}} */ /* 12.1 Block {{{ */ Block_ - : Brace StatementListOpt "}" { $$ = $2; } + : BRACE StatementListOpt "}" { $$ = $2; } ; Block - : Block_ { $$ = CYNew CYBlock($1); } + : ";{" StatementListOpt "}" { $$ = CYNew CYBlock($2); } ; StatementList @@ -1302,19 +1115,24 @@ StatementList StatementListOpt : StatementList { $$ = $1; } - | LexSetRegExp { $$ = NULL; } + | LexSetStatement LexSetRegExp { $$ = NULL; } ; StatementListItem : Statement { $$ = $1; } - | LexSetRegExp Declaration { $$ = $2; } + | Declaration { $$ = $1; } ; /* }}} */ + /* 12.2 Declarations {{{ */ BindingIdentifier : Identifier { $$ = $1; } ; +Binding + : BindingIdentifier + ; + // XXX: BindingPattern /* }}} */ /* 12.2.1 Let and Const Declarations {{{ */ @@ -1329,7 +1147,7 @@ LetOrConst /* }}} */ /* 12.2.2 Variable Statement {{{ */ VariableStatement - : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } + : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } ; VariableDeclarationList_ @@ -1337,46 +1155,23 @@ VariableDeclarationList_ | { $$ = NULL; } ; -VariableDeclarationListNoIn_ - : "," VariableDeclarationListNoIn { $$ = $2; } - | { $$ = NULL; } - ; - VariableDeclarationList : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); } ; -VariableDeclarationListNoIn - : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = CYNew CYDeclarations($1, $2); } - ; - VariableDeclaration : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } // XXX: | BindingPattern Initialiser { $$ = CYNew CYDeclaration($1, $2); } ; -VariableDeclarationNoIn - : BindingIdentifier InitialiserNoInOpt { $$ = CYNew CYDeclaration($1, $2); } - // XXX: | BindingPattern InitialiserNoIn { $$ = CYNew CYDeclaration($1, $2); } +Initialiser + : "=" AssignmentExpression { $$ = $2; } ; InitialiserOpt : Initialiser { $$ = $1; } | { $$ = NULL; } ; - -InitialiserNoInOpt - : InitialiserNoIn { $$ = $1; } - | { $$ = NULL; } - ; - -Initialiser - : "=" AssignmentExpression { $$ = $2; } - ; - -InitialiserNoIn - : "=" AssignmentExpressionNoIn { $$ = $2; } - ; /* }}} */ /* 12.2.4 Destructuring Binding Patterns {{{ */ // XXX: * @@ -1389,6 +1184,7 @@ SingleNameBinding : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } ; /* }}} */ + /* 12.3 Empty Statement {{{ */ EmptyStatement : ";" { $$ = CYNew CYEmpty(); } @@ -1396,7 +1192,7 @@ EmptyStatement /* }}} */ /* 12.4 Expression Statement {{{ */ ExpressionStatement - : ExpressionNoBF Terminator { $$ = CYNew CYExpress($1); } + : Expression Terminator { $$ = CYNew CYExpress($1); } ; /* }}} */ /* 12.5 The if Statement {{{ */ @@ -1410,58 +1206,54 @@ IfStatement ; /* }}} */ -/* 12.6 Iteration Statements {{{ */ -IterationStatement - : DoWhileStatement { $$ = $1; } - | WhileStatement { $$ = $1; } - | ForStatement { $$ = $1; } - | ForInStatement { $$ = $1; } - ; -/* }}} */ /* 12.6.1 The do-while Statement {{{ */ -DoWhileStatement +IterationStatement : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); } ; /* }}} */ /* 12.6.2 The while Statement {{{ */ -WhileStatement +IterationStatement : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); } ; /* }}} */ /* 12.6.3 The for Statement {{{ */ -ForStatement - : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew 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 { $$ = CYNew CYForDeclarations($3); } + : ExpressionOpt { $$ = $1; } + | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); } ; /* }}} */ -/* 12.6.4 The for-in Statement {{{ */ -ForInStatement - : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForIn($3, $5, $7); } +/* 12.6.4 The for-in and for-of Statements {{{ */ +IterationStatement + : "for" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); } + | "for" "(" LexPushInOn ForInStatementInitialiser "of" LexPopIn 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 { $$ = CYNew CYContinue($2); } + : "continue" "\n" StrictSemi { $$ = CYNew CYContinue(NULL); } + | "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); } ; /* }}} */ /* 12.8 The break Statement {{{ */ BreakStatement - : "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); } + : "break" "\n" StrictSemi { $$ = CYNew CYBreak(NULL); } + | "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); } ; /* }}} */ /* 12.9 The return Statement {{{ */ ReturnStatement - : "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); } + : "return" LexSetRegExp "\n" StrictSemi { $$ = CYNew CYReturn(NULL); } + | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); } ; /* }}} */ /* 12.10 The with Statement {{{ */ @@ -1476,7 +1268,11 @@ SwitchStatement ; CaseBlock - : Brace CaseClausesOpt "}" { $$ = $2; } + : BRACE CaseClausesOpt "}" { $$ = $2; } + ; + +CaseClause + : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } ; CaseClausesOpt @@ -1485,10 +1281,6 @@ CaseClausesOpt | { $$ = NULL; } ; -CaseClause - : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } - ; - DefaultClause : "default" ":" StatementListOpt { $$ = CYNew CYClause(NULL, $3); } ; @@ -1500,7 +1292,8 @@ LabelledStatement /* }}} */ /* 12.13 The throw Statement {{{ */ ThrowStatement - : "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } + : "throw" LexSetRegExp "\n" StrictSemi { YYABORT; } + | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } ; /* }}} */ /* 12.14 The try Statement {{{ */ @@ -1524,13 +1317,13 @@ DebuggerStatement ; /* }}} */ -/* 13 Function Definition {{{ */ +/* 13.1 Function Definitions {{{ */ FunctionDeclaration - : "function" Identifier "(" FormalParameterListOpt ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); } + : ";function" Identifier "(" FormalParameterListOpt ")" BRACE FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); } ; FunctionExpression - : "function" IdentifierOpt "(" FormalParameterListOpt ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionExpression($2, $4, $7); } + : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYFunctionExpression($2, $5, $10); } ; FormalParameterList_ @@ -1538,16 +1331,16 @@ FormalParameterList_ | { $$ = NULL; } ; -FormalParameterListOpt - : FormalParameterList - | { $$ = NULL; } - ; - FormalParameterList // XXX: : FunctionRestParameter { $$ = $1; } : FormalParameter FormalParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); } ; +FormalParameterListOpt + : FormalParameterList + | { $$ = NULL; } + ; + /* XXX: FunctionRestParameter : "..." BindingIdentifier { $$ = CYNew CYFunctionRestParameter($2); } ;*/ @@ -1560,40 +1353,111 @@ FunctionBody : StatementListOpt { $$ = $1; } ; /* }}} */ +/* 13.2 Arrow Function Definitions {{{ */ +ArrowFunction + : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); } + ; + +ArrowParameters + : BindingIdentifier { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1)); } + //| ParentheticalOpt { $$ = $1; } + ; + +ConciseBody + : AssignmentExpression { $$ = CYNew CYReturn($1); } + | LexSetRegExp ";{" LexPushInOff FunctionBody "}" LexPopIn { $$ = $4; } + ; +/* }}} */ /* 14 Program {{{ */ Program : ProgramBodyOpt { driver.program_ = CYNew CYProgram($1); } ; +ProgramBody + : StatementList { $$ = $1; } + ; + ProgramBodyOpt : ProgramBody { $$ = $1; } + | LexSetStatement LexSetRegExp { $$ = NULL; } + ; +/* }}} */ + +@begin ObjectiveC +/* Cycript (Objective-C): Type Encoding {{{ */ +TypeParenthetical + : "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; } + ; + +TypeSignifier + : Identifier { $$ = CYNew CYTypedIdentifier($1); } + | TypeParenthetical { $$ = $1; } + ; + +ArrayedType + : ArrayedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); } + | TypeSignifier { $$ = $1; } + | { $$ = CYNew CYTypedIdentifier(); } + ; + +FunctionedType + : "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypeFunctionWith($3); } + ; + +SuffixedType + : ArrayedType { $$ = $1; } + | "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); } + | TypeParenthetical FunctionedType { $$ = $1; CYSetLast($2) = $$->modifier_; $$->modifier_ = $2; } + | FunctionedType { $$ = CYNew CYTypedIdentifier(); CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; } + ; + +PrefixedType + : "*" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); } + ; + +TypeQualifierLeft + : "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); } + /* XXX: | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); } */ | { $$ = NULL; } ; -ProgramBody - : StatementList { $$ = $1; } +TypeQualifierRight + : "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); } + | PrefixedType { $$ = $1; } + | SuffixedType { $$ = $1; } ; -/* }}} */ -@begin ObjectiveC +PrimitiveType + : Variable { $$ = $1; } + | "void" { $$ = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); } + ; + +TypedIdentifier + : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->type_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; } + ; + +EncodedType + : TypedIdentifier { $$ = CYNew CYEncodedType($1); } + ; + +PrimaryExpression + : AtEncode "(" EncodedType ")" { $$ = $3; } + ; +/* }}} */ /* 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 ";" - ; - ClassFieldListOpt - : ClassFieldListOpt ClassField - | + : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); } + | LexSetRegExp { $$ = NULL; } ; -ClassFieldList - : Brace ClassFieldListOpt "}" { $$ = NULL; } +ClassFields + : BRACE ClassFieldListOpt "}" { $$ = $2; } ; MessageScope @@ -1602,8 +1466,7 @@ MessageScope ; TypeOpt - : "(" Expression ")" { $$ = $2; } - | "(" LexSetRegExp "void" ")" { $$ = NULL; } + : "(" LexSetRegExp EncodedType ")" { $$ = $3; } | { $$ = NULL; } ; @@ -1611,22 +1474,22 @@ MessageParameter : Word ":" TypeOpt Identifier { $$ = CYNew CYMessageParameter($1, $3, $4); } ; +MessageParameterList + : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } + ; + MessageParameterListOpt : MessageParameterList { $$ = $1; } | { $$ = NULL; } ; -MessageParameterList - : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } - ; - MessageParameters : MessageParameterList { $$ = $1; } | Word { $$ = CYNew CYMessageParameter($1, NULL, NULL); } ; ClassMessageDeclaration - : MessageScope TypeOpt MessageParameters Brace FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); } + : MessageScope TypeOpt MessageParameters BRACE FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); } ; ClassMessageDeclarationListOpt @@ -1661,11 +1524,11 @@ ClassProtocolListOpt ; ClassExpression - : "@implementation" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassExpression($2, $3, $4, $5, $6); } + : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields ClassMessageDeclarationListOpt "@end" LexPopIn { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); } ; ClassStatement - : "@implementation" ClassName ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassStatement($2, $3, $4, $5, $6); } + : ";@implementation" ClassName ClassSuperOpt ClassProtocolListOpt ClassFields ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassStatement($2, $3, $4, $5, $6); } ; CategoryName @@ -1673,14 +1536,14 @@ CategoryName ; CategoryStatement - : "@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); } + : ";@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); } ; -PrimaryExpressionBF +PrimaryExpression : ClassExpression { $$ = $1; } ; -Statement_ +Statement__ : ClassStatement { $$ = $1; } | CategoryStatement { $$ = $1; } ; @@ -1691,16 +1554,16 @@ VariadicCall | { $$ = 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_ { $$ = CYNew CYArgument($1 ?: CYNew CYBlank(), $3, $4); } ; @@ -1711,13 +1574,8 @@ SelectorList ; MessageExpression - : "[" AssignmentExpression { driver.contexts_.push_back($2); } SelectorList "]" { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($2, $4); } - | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = CYNew CYSendSuper($5); } - ; - -SelectorExpressionOpt - : SelectorExpression_ { $$ = $1; } - | { $$ = NULL; } + : "[" 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_ @@ -1729,34 +1587,64 @@ SelectorExpression | Word { $$ = CYNew CYSelectorPart($1, false, NULL); } ; -PrimaryExpressionNo +SelectorExpressionOpt + : SelectorExpression_ { $$ = $1; } + | { $$ = NULL; } + ; + +PrimaryExpression : MessageExpression { $$ = $1; } - | "@selector" "(" SelectorExpression ")" { $$ = CYNew CYSelector($3); } + | "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); } ; /* }}} */ /* Cycript (Objective-C): @import Directive {{{ */ -PathName - : "/" PathName - | "." PathName - | Word PathName - | +Module + : Module "." Word { $$ = CYNew CYModule($3, $1); } + | Word { $$ = CYNew CYModule($1); } ; -ImportPath - : "<" PathName ">" - | StringLiteral +Declaration__ + : "@import" Module { $$ = CYNew CYImport($2); } + ; +/* }}} */ +/* Cycript (Objective-C): Boxed Expressions {{{ */ +BoxableExpression + : NullLiteral { $$ = $1; } + | BooleanLiteral { $$ = $1; } + | NumericLiteral { $$ = $1; } + | StringLiteral { $$ = $1; } + | ArrayLiteral { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | Parenthetical { $$ = $1; } + | "YES" { $$ = CYNew CYTrue(); } + | "NO" { $$ = CYNew CYFalse(); } ; -StatementListItem - : "@import" ImportPath { $$ = CYNew CYImport(); } +PrimaryExpression + : "@" BoxableExpression { $$ = CYNew CYBox($2); } + ; +/* }}} */ +/* Cycript (Objective-C): Block Expressions {{{ */ +ModifiedType + : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->type_ = $2; $$->modifier_ = $1; } + | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); } + ; + +PrimaryExpression + : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); } + ; +/* }}} */ +/* Cycript (Objective-C): Instance Literals {{{ */ +PrimaryExpression + : "#" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); } ; /* }}} */ @end @begin C /* Cycript (C): Pointer Indirection/Addressing {{{ */ -UnaryAssigneeExpression - : "*" UnaryExpressionNoRE { $$ = CYNew CYIndirect($2); } +LeftHandSideExpression + : LexSetRegExp "*" UnaryExpression { $$ = CYNew CYIndirect($3); } ; UnaryExpression_ @@ -1765,14 +1653,43 @@ UnaryExpression_ MemberAccess : "->" "[" Expression "]" { $$ = CYNew CYIndirectMember(NULL, $3); } - | "->" Identifier { $$ = CYNew CYIndirectMember(NULL, CYNew CYString($2)); } + | "->" IdentifierName { $$ = CYNew CYIndirectMember(NULL, CYNew CYString($2)); } | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; } ; /* }}} */ +/* Cycript (C): auto Compatibility {{{ */ +Var_ + : "auto" + ; +/* }}} */ +/* Cycript (C): Lambda Expressions {{{ */ +TypedParameterList_ + : "," TypedParameterList { $$ = $2; } + | { $$ = NULL; } + ; + +TypedParameterList + : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); } + ; + +TypedParameterListOpt + : TypedParameterList { $$ = $1; } + | { $$ = NULL; } + ; + +PrimaryExpression + : "[" LexPushInOff LexSetRegExp "&" LexSetRegExp "]" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn "->" TypedIdentifier BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYLambda($14, $10, $17); } + ; +/* }}} */ +/* Cycript (C): Type Definitions {{{ */ +Statement__ + : "typedef" TypedIdentifier Terminator { $$ = CYNew CYTypeDefinition($2); } + ; +/* }}} */ @end /* YUI: Documentation Comments {{{ */ -Statement_ +Statement__ : Comment { $$ = $1; } ; /* }}} */ @@ -1803,11 +1720,12 @@ LexSetXMLTag : { driver.SetCondition(CYDriver::XMLTagCondition); } ; /* }}} */ - +/* Virtual Tokens {{{ */ XMLWhitespaceOpt : XMLWhitespace | ; +/* }}} */ /* 8.1 Context Keywords {{{ */ Identifier @@ -1822,8 +1740,9 @@ XMLMarkup | XMLPI { $$ = $1; } ; /* }}} */ + /* 11.1 Primary Expressions {{{ */ -PrimaryExpressionNo +PrimaryExpression : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); } | XMLInitialiser { $$ = $1; } | XMLListInitialiser { $$ = $1; } @@ -1842,7 +1761,7 @@ AttributeIdentifier PropertySelector_ : PropertySelector { $$ = $1; } - | "[" Expression "]" { $$ = CYNew CYSelector($2); } + | "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYSelector($3); } ; PropertySelector @@ -1872,8 +1791,8 @@ XMLInitialiser ; XMLElement - : "<" XMLTagContent "/>" LexPop - | "<" XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" LexPop + : "<" LexPushInOff XMLTagContent LexPop "/>" LexPopIn + | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" LexPopIn ; XMLTagContent @@ -1881,7 +1800,7 @@ XMLTagContent ; XMLExpression - : Brace LexPushRegExp Expression "}" LexPop + : BRACE LexPushRegExp Expression LexPop "}" ; XMLTagName @@ -1922,9 +1841,10 @@ XMLElementContentOpt /* }}} */ /* 11.1.5 XMLList Initialiser {{{ */ XMLListInitialiser - : "<>" LexPushXMLContent XMLElementContent "" LexPop { $$ = CYNew CYXMLList($3); } + : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop "" LexPopIn { $$ = CYNew CYXMLList($4); } ; /* }}} */ + /* 11.2 Left-Hand-Side Expressions {{{ */ PropertyIdentifier_ : Identifier { $$ = $1; } @@ -1942,62 +1862,33 @@ MemberAccess : "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 ")" { $$ = CYNew CYIfComprehension($3); } +Comprehension + : AssignmentExpression ComprehensionFor ComprehensionTail { $$ = CYNew CYArrayComprehension($1, $2->Modify($3)); } ; -ForComprehension - : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); } - | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForEachInComprehension($4, $6); } - ; - -ComprehensionListOpt - : ComprehensionList { $$ = $1; } - | IfComprehension { $$ = $1; } - | { $$ = NULL; } - ; - -ComprehensionList - : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; } - ; - -PrimaryExpressionNo - : "[" AssignmentExpression ComprehensionList "]" { $$ = CYNew CYArrayComprehension($2, $3); } +ComprehensionFor + : "for" "(" Binding "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); } + | "for" "each" "(" Binding "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); } ; /* }}} */ /* JavaScript 1.7: for each {{{ */ -ForInStatement - : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForEachIn($4, $6, $8); } +IterationStatement + : "for" "each" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); } ; /* }}} */ -/* JavaScript 1.7: let Expressions {{{ */ -/*LetExpression - : "let" "(" VariableDeclarationList ")" Expression { $$ = CYNew CYLetExpression($3, $5); } - ; - -MemberExpression - : LexSetRegExp LetExpression { $$ = $2; } - ;*/ -/* }}} */ /* JavaScript 1.7: let Statements {{{ */ LetStatement : "let" "(" VariableDeclarationList ")" Statement { $$ = CYNew CYLetStatement($3, $5); } ; -Statement_ +Statement__ : LetStatement ; /* }}} */ @@ -2027,27 +1918,13 @@ RubyProcExpression : "{" RubyProcParametersOpt StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); } ; -RubyProcExpressionNoOA - : "{" RubyProcParameters StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); } - ; - -PrimaryExpressionNo - : RubyProcExpressionNoOA { $$ = $1; } - ; - -LeftHandSideExpression - : LeftHandSideExpression RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } - ; - -LeftHandSideExpressionNoBF - : LeftHandSideExpressionNoBF RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } +PrimaryExpression + : "{" LexPushInOff RubyProcParameters StatementListOpt "}" LexPopIn { $$ = CYNew CYRubyProc($3, $4); } ; -@begin C -LeftHandSideExpressionNoRE - : LeftHandSideExpressionNoRE RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } +CallExpression + : CallExpression_ RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } ; -@end /* }}} */ %%