-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010 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 <http://www.gnu.org/licenses/>.
+**/
/* }}} */
@if Bison23 %{
@if Bison24 %code requires {
#include "Parser.hpp"
+#define CYNew new($pool)
@begin ObjectiveC
#include "ObjectiveC/Syntax.hpp"
CYProgram *program_;
CYProperty *property_;
CYPropertyName *propertyName_;
+ CYRubyProc *rubyProc_;
CYStatement *statement_;
CYString *string_;
CYThis *this_;
%token Percent "%"
%token PercentEqual "%="
%token Period "."
+%token PeriodPeriodPeriod "..."
%token Pipe "|"
%token PipeEqual "|="
%token PipePipe "||"
%token CloseParen ")"
%token OpenBrace "{"
+%token OpenBrace_ "\n{"
%token CloseBrace "}"
%token OpenBracket "["
%token CloseBracket "]"
+@begin Java
%token AtClass "@class"
-%token AtSelector "@selector"
+@end
+
+@begin ObjectiveC
+%token AtImplementation "@implementation"
+%token AtImport "@import"
%token AtEnd "@end"
+%token AtSelector "@selector"
+@end
%token <false_> False "false"
%token <null_> Null "null"
%type <expression_> AdditiveExpression
%type <expression_> AdditiveExpressionNoBF
-%type <argument_> ArgumentList
%type <argument_> ArgumentList_
+%type <argument_> ArgumentList
%type <argument_> ArgumentListOpt
%type <argument_> Arguments
%type <literal_> ArrayLiteral
%type <expression_> AssigneeExpression
%type <expression_> AssigneeExpressionNoBF
-%type <expression_> AssignmentExpression
%type <assignment_> AssignmentExpression_
+%type <expression_> AssignmentExpression
%type <expression_> AssignmentExpressionNoBF
%type <expression_> AssignmentExpressionNoIn
+%type <identifier_> BindingIdentifier
%type <expression_> BitwiseANDExpression
%type <expression_> BitwiseANDExpressionNoBF
%type <expression_> BitwiseANDExpressionNoIn
-%type <statement_> Block
%type <statement_> Block_
+%type <statement_> Block
%type <boolean_> BooleanLiteral
+%type <declaration_> BindingElement
%type <expression_> BitwiseORExpression
%type <expression_> BitwiseORExpressionNoBF
%type <expression_> BitwiseORExpressionNoIn
%type <expression_> BitwiseXORExpressionNoBF
%type <expression_> BitwiseXORExpressionNoIn
%type <statement_> BreakStatement
+%type <statement_> BreakableStatement
%type <expression_> CallExpression
%type <expression_> CallExpressionNoBF
%type <clause_> CaseBlock
%type <expression_> ConditionalExpressionNoBF
%type <expression_> ConditionalExpressionNoIn
%type <statement_> ContinueStatement
+%type <statement_> DebuggerStatement
+%type <statement_> Declaration
%type <clause_> DefaultClause
%type <statement_> DoWhileStatement
%type <expression_> Element
%type <expression_> EqualityExpression
%type <expression_> EqualityExpressionNoBF
%type <expression_> EqualityExpressionNoIn
+%type <compound_> Expression_
%type <expression_> Expression
%type <expression_> ExpressionOpt
-%type <compound_> Expression_
%type <expression_> ExpressionNoBF
-%type <expression_> ExpressionNoIn
%type <compound_> ExpressionNoIn_
+%type <expression_> ExpressionNoIn
%type <expression_> ExpressionNoInOpt
%type <statement_> ExpressionStatement
%type <finally_> FinallyOpt
%type <for_> ForStatementInitialiser
%type <statement_> ForInStatement
%type <forin_> ForInStatementInitialiser
-%type <functionParameter_> FormalParameterList
+%type <declaration_> FormalParameter
%type <functionParameter_> FormalParameterList_
+%type <functionParameter_> FormalParameterList
+%type <functionParameter_> FormalParameterListOpt
%type <statement_> FunctionBody
%type <statement_> FunctionDeclaration
%type <expression_> FunctionExpression
%type <statement_> LabelledStatement
%type <expression_> LeftHandSideExpression
%type <expression_> LeftHandSideExpressionNoBF
-//%type <statement_> LetStatement
+//%type <expression_> LetExpression
+%type <statement_> LetStatement
+%type <statement_> LexicalDeclaration
%type <literal_> Literal
%type <literal_> LiteralNoRE
%type <literal_> LiteralRE
%type <expression_> LogicalORExpressionNoBF
%type <expression_> LogicalORExpressionNoIn
%type <member_> MemberAccess
-%type <expression_> MemberExpression
%type <expression_> MemberExpression_
+%type <expression_> MemberExpression
%type <expression_> MemberExpressionNoBF
%type <expression_> MultiplicativeExpression
%type <expression_> MultiplicativeExpressionNoBF
-%type <expression_> NewExpression
%type <expression_> NewExpression_
+%type <expression_> NewExpression
%type <expression_> NewExpressionNoBF
%type <null_> NullLiteral
%type <literal_> ObjectLiteral
%type <expression_> PrimaryExpressionNoRE
%type <expression_> PrimaryExpressionBF
%type <statement_> Program
-%type <propertyName_> PropertyName
+%type <statement_> ProgramBody
+%type <statement_> ProgramBodyOpt
%type <propertyName_> PropertyName_
-%type <property_> PropertyNameAndValueList
+%type <propertyName_> PropertyName
%type <property_> PropertyNameAndValueList_
+%type <property_> PropertyNameAndValueList
%type <property_> PropertyNameAndValueListOpt
-%type <expression_> RelationalExpression
%type <infix_> RelationalExpression_
+%type <expression_> RelationalExpression
%type <expression_> RelationalExpressionNoBF
-%type <expression_> RelationalExpressionNoIn
%type <infix_> RelationalExpressionNoIn_
+%type <expression_> RelationalExpressionNoIn
%type <statement_> ReturnStatement
+%type <rubyProc_> RubyProcExpression
+%type <rubyProc_> RubyProcExpressionNoOA
+%type <functionParameter_> RubyProcParameterList_
+%type <functionParameter_> RubyProcParameterList
+%type <functionParameter_> RubyProcParameters
+%type <functionParameter_> RubyProcParametersOpt
%type <expression_> ShiftExpression
%type <expression_> ShiftExpressionNoBF
-%type <statement_> SourceElement
-%type <statement_> SourceElement_
-%type <statement_> SourceElements
-%type <statement_> Statement
+%type <declaration_> SingleNameBinding
%type <statement_> Statement_
+%type <statement_> Statement
%type <statement_> StatementList
%type <statement_> StatementListOpt
+%type <statement_> StatementListItem
%type <statement_> SwitchStatement
%type <statement_> ThrowStatement
%type <statement_> TryStatement
-%type <expression_> UnaryExpression
%type <expression_> UnaryExpression_
+%type <expression_> UnaryExpression
%type <expression_> UnaryExpressionNoBF
%type <declaration_> VariableDeclaration
%type <declaration_> VariableDeclarationNoIn
-%type <declarations_> VariableDeclarationList
%type <declarations_> VariableDeclarationList_
-%type <declarations_> VariableDeclarationListNoIn
+%type <declarations_> VariableDeclarationList
%type <declarations_> VariableDeclarationListNoIn_
+%type <declarations_> VariableDeclarationListNoIn
%type <statement_> VariableStatement
%type <statement_> WhileStatement
%type <statement_> WithStatement
%type <messageParameter_> MessageParameterList
%type <messageParameter_> MessageParameterListOpt
%type <bool_> MessageScope
-%type <argument_> SelectorCall
%type <argument_> SelectorCall_
-%type <selector_> SelectorExpression
+%type <argument_> SelectorCall
%type <selector_> SelectorExpression_
+%type <selector_> SelectorExpression
%type <selector_> SelectorExpressionOpt
%type <argument_> SelectorList
%type <word_> SelectorWordOpt
@begin E4X
%type <propertyIdentifier_> PropertyIdentifier_
-%type <selector_> PropertySelector
%type <selector_> PropertySelector_
-%type <identifier_> QualifiedIdentifier
+%type <selector_> PropertySelector
%type <identifier_> QualifiedIdentifier_
+%type <identifier_> QualifiedIdentifier
%type <identifier_> WildcardIdentifier
%type <identifier_> XMLComment
%type <identifier_> XMLCDATA
;
/* }}} */
+Brace
+ : "{"
+ | "\n{"
+ ;
+
StrictSemi
: { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
;
| "\n" StrictSemi
;
-TerminatorOpt
+Terminator
: Terminator_
- | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
+ | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
;
-Terminator
+TerminatorOpt
: Terminator_
- | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+ | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
;
/*CommaOpt
|
;
-WordOpt
- : Word { $$ = $1; }
- | { $$ = NULL; }
- ;
-
Word
: Identifier { $$ = $1; }
| "break" NewLineOpt { $$ = $1; }
| "while" { $$ = $1; }
| "with" { $$ = $1; }
;
+
+WordOpt
+ : Word { $$ = $1; }
+ | { $$ = NULL; }
+ ;
+
+PrimaryExpressionNo
+ : "@" LiteralNoRE { $$ = CYNew CYBox($2); }
+ | "@" ArrayLiteral { $$ = CYNew CYBox($2); }
+ | "@" ObjectLiteral { $$ = CYNew CYBox($2); }
+ | "@" "(" Expression ")" { $$ = CYNew CYBox($3); }
+ ;
@end
Identifier
| "transient" { $$ = $1; }
| "volatile" { $$ = $1; }
- | "let" { $$ = $1; }
+ // XXX: is this allowed?! | "let" { $$ = $1; }
| "yield" { $$ = $1; }
| "each" { $$ = $1; }
| BooleanLiteral { $$ = $1; }
| NumericLiteral { $$ = $1; }
| StringLiteral { $$ = $1; }
- | "@" StringLiteral { $$ = $2; }
;
LiteralRE
PrimaryExpressionNo
: "this" { $$ = $1; }
- | Identifier { $$ = new(driver.pool_) CYVariable($1); }
+ | Identifier { $$ = CYNew CYVariable($1); }
| AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
| Literal { $$ = $1; }
| ArrayLiteral { $$ = $1; }
/* }}} */
/* 11.1.4 Array Initialiser {{{ */
ArrayLiteral
- : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); }
+ : "[" ElementListOpt "]" { $$ = CYNew CYArray($2); }
;
Element
| 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 PropertyNameAndValueListOpt "}" { $$ = CYNew CYObject($2); }
;
PropertyNameAndValueList_
| { $$ = NULL; }
;
+PropertyNameAndValueList
+ : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); }
+ ;
+
PropertyNameAndValueListOpt
: PropertyNameAndValueList { $$ = $1; }
| { $$ = NULL; }
;
-PropertyNameAndValueList
- : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
- ;
-
PropertyName_
: Identifier { $$ = $1; }
| StringLiteral { $$ = $1; }
/* }}} */
/* 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)); }
+ : "[" Expression "]" { $$ = CYNew CYDirectMember(NULL, $2); }
+ | "." Identifier { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
| "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
;
+MemberExpression_
+ : "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($2, $3); }
+ ;
+
MemberExpression
: PrimaryExpression { $$ = $1; }
| LexSetRegExp FunctionExpression { $$ = $2; }
@end
NewExpression_
- : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); }
+ : "new" NewExpression { $$ = CYNew cy::Syntax::New($2, NULL); }
;
NewExpression
@end
CallExpression
- : MemberExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+ : MemberExpression Arguments { $$ = CYNew 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); }
+ : 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 { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
+ : MemberExpressionNoRE Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpressionNoRE Arguments { $$ = CYNew CYCall($1, $2); }
| CallExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
;
@end
| { $$ = NULL; }
;
+ArgumentList
+ : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); }
+ ;
+
ArgumentListOpt
: ArgumentList { $$ = $1; }
| LexSetRegExp { $$ = NULL; }
;
-ArgumentList
- : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); }
- ;
-
Arguments
: "(" ArgumentListOpt ")" { $$ = $2; }
;
/* 11.3 Postfix Expressions {{{ */
PostfixExpression
: AssigneeExpression { $$ = $1; }
- | LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
- | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+ | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); }
+ | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); }
;
PostfixExpressionNoBF
: AssigneeExpressionNoBF { $$ = $1; }
- | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
- | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+ | LeftHandSideExpressionNoBF "++" { $$ = CYNew CYPostIncrement($1); }
+ | LeftHandSideExpressionNoBF "--" { $$ = CYNew CYPostDecrement($1); }
;
@begin C
PostfixExpressionNoRE
: AssigneeExpressionNoRE { $$ = $1; }
- | LeftHandSideExpressionNoRE "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
- | LeftHandSideExpressionNoRE "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+ | LeftHandSideExpressionNoRE "++" { $$ = CYNew CYPostIncrement($1); }
+ | LeftHandSideExpressionNoRE "--" { $$ = 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
/* 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); }
+ | MultiplicativeExpression "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); }
+ | MultiplicativeExpression "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); }
+ | MultiplicativeExpression "%" UnaryExpression { $$ = CYNew 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); }
+ | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); }
+ | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); }
+ | MultiplicativeExpressionNoBF "%" 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); }
+ | AdditiveExpression "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); }
+ | AdditiveExpression "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); }
;
AdditiveExpressionNoBF
: MultiplicativeExpressionNoBF { $$ = $1; }
- | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
- | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
+ | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); }
+ | AdditiveExpressionNoBF "-" 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); }
+ | ShiftExpression "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); }
+ | ShiftExpression ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); }
+ | ShiftExpression ">>>" AdditiveExpression { $$ = CYNew 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); }
+ | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); }
+ | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); }
+ | ShiftExpressionNoBF ">>>" 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); }
+ | "in" ShiftExpression { $$ = CYNew CYIn(NULL, $2); }
;
RelationalExpression
| RelationalExpression RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
;
+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); }
+ ;
+
RelationalExpressionNoIn
: ShiftExpression { $$ = $1; }
| RelationalExpressionNoIn RelationalExpressionNoIn_ { $2->SetLeft($1); $$ = $2; }
/* 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); }
+ | EqualityExpression "==" RelationalExpression { $$ = CYNew CYEqual($1, $3); }
+ | EqualityExpression "!=" RelationalExpression { $$ = CYNew CYNotEqual($1, $3); }
+ | EqualityExpression "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); }
+ | EqualityExpression "!==" RelationalExpression { $$ = CYNew 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); }
+ | 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 { $$ = 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); }
+ | 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
: EqualityExpression { $$ = $1; }
- | BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+ | BitwiseANDExpression "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); }
;
BitwiseANDExpressionNoIn
: EqualityExpressionNoIn { $$ = $1; }
- | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+ | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = CYNew CYBitwiseAnd($1, $3); }
;
BitwiseANDExpressionNoBF
: EqualityExpressionNoBF { $$ = $1; }
- | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+ | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); }
;
BitwiseXORExpression
: BitwiseANDExpression { $$ = $1; }
- | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+ | BitwiseXORExpression "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); }
;
BitwiseXORExpressionNoIn
: BitwiseANDExpressionNoIn { $$ = $1; }
- | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+ | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = CYNew CYBitwiseXOr($1, $3); }
;
BitwiseXORExpressionNoBF
: BitwiseANDExpressionNoBF { $$ = $1; }
- | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+ | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); }
;
BitwiseORExpression
: BitwiseXORExpression { $$ = $1; }
- | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+ | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); }
;
BitwiseORExpressionNoIn
: BitwiseXORExpressionNoIn { $$ = $1; }
- | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+ | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = CYNew CYBitwiseOr($1, $3); }
;
BitwiseORExpressionNoBF
: BitwiseXORExpressionNoBF { $$ = $1; }
- | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+ | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); }
;
/* }}} */
/* 11.11 Binary Logical Operators {{{ */
LogicalANDExpression
: BitwiseORExpression { $$ = $1; }
- | LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+ | LogicalANDExpression "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); }
;
LogicalANDExpressionNoIn
: BitwiseORExpressionNoIn { $$ = $1; }
- | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+ | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = CYNew CYLogicalAnd($1, $3); }
;
LogicalANDExpressionNoBF
: BitwiseORExpressionNoBF { $$ = $1; }
- | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+ | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); }
;
LogicalORExpression
: LogicalANDExpression { $$ = $1; }
- | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+ | LogicalORExpression "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); }
;
LogicalORExpressionNoIn
: LogicalANDExpressionNoIn { $$ = $1; }
- | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+ | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = CYNew CYLogicalOr($1, $3); }
;
LogicalORExpressionNoBF
: LogicalANDExpressionNoBF { $$ = $1; }
- | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+ | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); }
;
/* }}} */
/* 11.12 Conditional Operator ( ? : ) {{{ */
ConditionalExpression
: LogicalORExpression { $$ = $1; }
- | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); }
;
ConditionalExpressionNoIn
: LogicalORExpressionNoIn { $$ = $1; }
- | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = CYNew CYCondition($1, $3, $5); }
;
ConditionalExpressionNoBF
: LogicalORExpressionNoBF { $$ = $1; }
- | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); }
;
/* }}} */
/* 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); }
+ : "=" 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
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); }
+ | 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
/* }}} */
/* 11.14 Comma Operator {{{ */
Expression_
- : "," Expression { $$ = new(driver.pool_) CYCompound($2); }
+ : "," Expression { $$ = CYNew CYCompound($2); }
| { $$ = NULL; }
;
-ExpressionNoIn_
- : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); }
- | { $$ = NULL; }
+Expression
+ : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
ExpressionOpt
| LexSetRegExp { $$ = NULL; }
;
-ExpressionNoInOpt
- : ExpressionNoIn { $$ = $1; }
- | LexSetRegExp { $$ = NULL; }
- ;
-
-Expression
- : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
+ExpressionNoIn_
+ : "," ExpressionNoIn { $$ = CYNew CYCompound($2); }
+ | { $$ = NULL; }
;
ExpressionNoIn
: AssignmentExpressionNoIn ExpressionNoIn_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
+ExpressionNoInOpt
+ : ExpressionNoIn { $$ = $1; }
+ | LexSetRegExp { $$ = NULL; }
+ ;
+
ExpressionNoBF
: AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $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; }
;
+
+Declaration
+ : FunctionDeclaration { $$ = $1; }
+ | LexicalDeclaration { $$ = $1; }
+ ;
+
+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(); }
+ : Block_ { $$ = CYNew CYBlock($1); }
;
StatementList
- : Statement StatementListOpt { $1->SetNext($2); $$ = $1; }
+ : StatementListItem StatementListOpt { $1->SetNext($2); $$ = $1; }
;
StatementListOpt
: StatementList { $$ = $1; }
| LexSetRegExp { $$ = NULL; }
;
+
+StatementListItem
+ : Statement { $$ = $1; }
+ | LexSetRegExp Declaration { $$ = $2; }
+ ;
/* }}} */
-/* 12.2 Variable Statement {{{ */
+/* 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.2 Variable Statement {{{ */
VariableStatement
- : "var" VariableDeclarationList Terminator { $$ = new(driver.pool_) CYVar($2); }
+ : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
;
VariableDeclarationList_
| { $$ = NULL; }
;
+VariableDeclarationList
+ : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); }
+ ;
+
VariableDeclarationListNoIn_
: "," VariableDeclarationListNoIn { $$ = $2; }
| { $$ = NULL; }
;
-VariableDeclarationList
- : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
- ;
-
VariableDeclarationListNoIn
- : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
+ : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = 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); }
+ : BindingIdentifier InitialiserNoInOpt { $$ = CYNew CYDeclaration($1, $2); }
+ // XXX: | BindingPattern InitialiserNoIn { $$ = CYNew CYDeclaration($1, $2); }
+ ;
+
+Initialiser
+ : "=" AssignmentExpression { $$ = $2; }
;
InitialiserOpt
| { $$ = NULL; }
;
+InitialiserNoIn
+ : "=" AssignmentExpressionNoIn { $$ = $2; }
+ ;
+
InitialiserNoInOpt
: InitialiserNoIn { $$ = $1; }
| { $$ = NULL; }
;
+/* }}} */
+/* 12.2.4 Destructuring Binding Patterns {{{ */
+// XXX: *
-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); }
+ : ExpressionNoBF Terminator { $$ = CYNew CYExpress($1); }
;
/* }}} */
/* 12.5 The if Statement {{{ */
;
IfStatement
- : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); }
+ : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = CYNew CYIf($3, $5, $6); }
;
/* }}} */
/* }}} */
/* 12.6.1 The do-while Statement {{{ */
DoWhileStatement
- : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); }
+ : "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); }
+ : "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); }
+ : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($3, $5, $7, $9); }
;
ForStatementInitialiser
: ExpressionNoInOpt { $$ = $1; }
- | LexSetRegExp "var" VariableDeclarationListNoIn { $$ = $3; }
+ | LexSetRegExp "var" VariableDeclarationListNoIn { $$ = CYNew CYForDeclarations($3); }
;
/* }}} */
/* 12.6.4 The for-in Statement {{{ */
ForInStatement
- : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); }
+ : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForIn($3, $5, $7); }
;
ForInStatementInitialiser
/* 12.7 The continue Statement {{{ */
ContinueStatement
- : "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); }
+ : "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); }
;
/* }}} */
/* 12.8 The break Statement {{{ */
BreakStatement
- : "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); }
+ : "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); }
;
/* }}} */
/* 12.9 The return Statement {{{ */
ReturnStatement
- : "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); }
+ : "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
| { $$ = 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" 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 {{{ */
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 "(" FormalParameterListOpt ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionExpression($2, $4, $7); }
;
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); }
- ;
-
-SourceElements
- : SourceElement SourceElements { $1->SetNext($2); $$ = $1; }
- | LexSetRegExp { $$ = NULL; }
+ : ProgramBodyOpt { driver.program_ = CYNew CYProgram($1); }
;
-SourceElement_
- : Statement_ { $$ = $1; }
- | FunctionDeclaration { $$ = $1; }
+ProgramBody
+ : StatementList { $$ = $1; }
;
-SourceElement
- : LexSetRegExp SourceElement_ { $$ = $2; }
+ProgramBodyOpt
+ : ProgramBody { $$ = $1; }
+ | { $$ = NULL; }
;
/* }}} */
| { $$ = NULL; }
;
+ClassField
+ : Expression Identifier ";"
+ ;
+
ClassFieldList
- : "{" "}" { $$ = NULL; }
+ : Brace ClassFieldListOpt "}" { $$ = NULL; }
+ ;
+
+ClassFieldListOpt
+ : ClassFieldListOpt ClassField
+ |
;
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
| { $$ = 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; }
;
// XXX: this should be AssignmentExpressionNoRight
ClassProtocols
- : ShiftExpression ClassProtocolsOpt { $$ = new(driver.pool_) CYProtocol($1, $2); }
+ : ShiftExpression ClassProtocolsOpt { $$ = CYNew CYProtocol($1, $2); }
;
ClassProtocolsOpt
;
ClassExpression
- : "@class" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassExpression($2, $3, $4, $5, $6); }
+ : "@implementation" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassExpression($2, $3, $4, $5, $6); }
;
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
/* }}} */
/* 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); }
- ;
-
-SelectorExpressionOpt
- : SelectorExpression_ { $$ = $1; }
- | { $$ = NULL; }
+ : "[" AssignmentExpression { driver.contexts_.push_back($2); } SelectorList "]" { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($2, $4); }
+ | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = CYNew CYSendSuper($5); }
;
SelectorExpression_
- : WordOpt ":" SelectorExpressionOpt { $$ = new(driver.pool_) CYSelectorPart($1, true, $3); }
+ : WordOpt ":" SelectorExpressionOpt { $$ = CYNew CYSelectorPart($1, true, $3); }
;
SelectorExpression
: SelectorExpression_ { $$ = $1; }
- | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
+ | Word { $$ = CYNew CYSelectorPart($1, false, NULL); }
+ ;
+
+SelectorExpressionOpt
+ : SelectorExpression_ { $$ = $1; }
+ | { $$ = NULL; }
;
PrimaryExpressionNo
: MessageExpression { $$ = $1; }
- | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); }
+ | "@selector" "(" SelectorExpression ")" { $$ = CYNew CYSelector($3); }
+ ;
+/* }}} */
+/* Cycript (Objective-C): @import Directive {{{ */
+PathName
+ : "/" PathName
+ | "." PathName
+ | Word PathName
+ |
+ ;
+
+ImportPath
+ : "<" PathName ">"
+ | StringLiteral
+ ;
+
+StatementListItem
+ : "@import" ImportPath { $$ = CYNew CYImport(); }
;
/* }}} */
@end
@begin C
/* Cycript (C): Pointer Indirection/Addressing {{{ */
UnaryAssigneeExpression
- : "*" UnaryExpressionNoRE { $$ = new(driver.pool_) CYIndirect($2); }
+ : "*" UnaryExpressionNoRE { $$ = CYNew CYIndirect($2); }
;
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); }
+ | "->" Identifier { $$ = CYNew CYIndirectMember(NULL, CYNew CYString($2)); }
| "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
;
/* }}} */
/* }}} */
/* 11.1 Primary Expressions {{{ */
PrimaryExpressionNo
- : PropertyIdentifier { $$ = new(driver.pool_) CYPropertyVariable($1); }
+ : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }
| XMLInitialiser { $$ = $1; }
| XMLListInitialiser { $$ = $1; }
;
/* }}} */
/* 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); }
+ | "[" Expression "]" { $$ = CYNew CYSelector($2); }
;
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 {{{ */
;
XMLExpression
- : "{" LexPushRegExp Expression "}" LexPop
+ : Brace LexPushRegExp Expression "}" LexPop
;
XMLTagName
/* }}} */
/* 11.1.5 XMLList Initialiser {{{ */
XMLListInitialiser
- : "<>" LexPushXMLContent XMLElementContent "</>" LexPop { $$ = new(driver.pool_) CYXMLList($3); }
+ : "<>" LexPushXMLContent XMLElementContent "</>" LexPop { $$ = CYNew CYXMLList($3); }
;
/* }}} */
/* 11.2 Left-Hand-Side Expressions {{{ */
;
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_
/* 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" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); }
+ | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForEachInComprehension($4, $6); }
+ ;
+
+ComprehensionList
+ : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; }
;
ComprehensionListOpt
| { $$ = NULL; }
;
-ComprehensionList
- : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; }
- ;
-
PrimaryExpressionNo
- : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); }
+ : "[" AssignmentExpression ComprehensionList "]" { $$ = CYNew CYArrayComprehension($2, $3); }
;
/* }}} */
/* JavaScript 1.7: for each {{{ */
ForInStatement
- : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForEachIn($4, $6, $8); }
+ : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForEachIn($4, $6, $8); }
+ ;
+/* }}} */
+/* JavaScript 1.7: let Expressions {{{ */
+/*LetExpression
+ : "let" "(" VariableDeclarationList ")" Expression { $$ = CYNew CYLetExpression($3, $5); }
;
+
+MemberExpression
+ : LexSetRegExp LetExpression { $$ = $2; }
+ ;*/
/* }}} */
-/* 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_
: 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); }
;
+
+RubyProcExpressionNoOA
+ : "{" RubyProcParameters StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); }
+ ;
+
+PrimaryExpressionNo
+ : RubyProcExpressionNoOA { $$ = $1; }
+ ;
+
+LeftHandSideExpression
+ : LeftHandSideExpression RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }
+ ;
+
+LeftHandSideExpressionNoBF
+ : LeftHandSideExpressionNoBF RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }
+ ;
+
+@begin C
+LeftHandSideExpressionNoRE
+ : LeftHandSideExpressionNoRE RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }
+ ;
+@end
/* }}} */
%%
projects / cycript.git / blobdiff