union {
bool bool_;
+ CYDriver::Condition condition_;
+
CYArgument *argument_;
CYAssignment *assignment_;
CYBoolean *boolean_;
CYClause *clause_;
CYCatch *catch_;
CYClassName *className_;
+ CYComprehension *comprehension_;
CYCompound *compound_;
CYDeclaration *declaration_;
CYDeclarations *declarations_;
CYExpression *expression_;
CYFalse *false_;
CYField *field_;
+ CYFinally *finally_;
CYForInitialiser *for_;
CYForInInitialiser *forin_;
CYFunctionParameter *functionParameter_;
CYProperty *property_;
CYPropertyName *propertyName_;
CYSelectorPart *selector_;
- CYSource *source_;
CYStatement *statement_;
CYString *string_;
CYThis *this_;
%defines
-%debug
+//%glr-parser
+//%expect 1
+
%error-verbose
%parse-param { CYDriver &driver }
%lex-param { void *scanner }
+%token At "@"
+
%token Ampersand "&"
%token AmpersandAmpersand "&&"
%token AmpersandEqual "&="
%token AtSelector "@selector"
%token AtEnd "@end"
+%token <false_> False "false"
+%token <null_> Null "null"
+%token <true_> True "true"
+
+// ES3/ES5/WIE/JSC Reserved
%token <word_> Break "break"
%token <word_> Case "case"
%token <word_> Catch "catch"
%token <word_> Delete "delete"
%token <word_> Do "do"
%token <word_> Else "else"
-%token <false_> False "false"
%token <word_> Finally "finally"
%token <word_> For "for"
%token <word_> Function "function"
%token <word_> In "in"
%token <word_> InstanceOf "instanceof"
%token <word_> New "new"
-%token <null_> Null "null"
%token <word_> Return "return"
%token <word_> Switch "switch"
%token <this_> This "this"
%token <word_> Throw "throw"
-%token <true_> True "true"
%token <word_> Try "try"
%token <word_> TypeOf "typeof"
%token <word_> Var "var"
%token <word_> While "while"
%token <word_> With "with"
-%token <word_> Abstract "abstract"
-%token <word_> Boolean "boolean"
-%token <word_> Byte "byte"
-%token <word_> Char "char"
-%token <word_> Class "class"
-%token <word_> Const "const"
+// ES3/IE6 Future, ES5/JSC Reserved
%token <word_> Debugger "debugger"
-%token <word_> Double "double"
+
+// ES3/ES5/IE6 Future, JSC Reserved
+%token <word_> Const "const"
+
+// ES3/ES5/IE6/JSC Future
+%token <word_> Class "class"
%token <word_> Enum "enum"
%token <word_> Export "export"
%token <word_> Extends "extends"
-%token <word_> Final "final"
-%token <word_> Float "float"
-%token <word_> Goto "goto"
-%token <word_> Implements "implements"
%token <word_> Import "import"
-%token <word_> Int "int"
-%token <word_> Interface "interface"
-%token <word_> Long "long"
-%token <word_> Native "native"
-%token <word_> Package "package"
-%token <word_> Private "private"
-%token <word_> Protected "protected"
-%token <word_> Public "public"
-%token <word_> Short "short"
-%token <word_> Static "static"
%token <word_> Super "super"
-%token <word_> Synchronized "synchronized"
-%token <word_> Throws "throws"
-%token <word_> Transient "transient"
-%token <word_> Volatile "volatile"
-%token <identifier_> Identifier
+// ES3 Future, ES5 Strict Future
+%token <identifier_> Implements "implements"
+%token <identifier_> Interface "interface"
+%token <identifier_> Package "package"
+%token <identifier_> Private "private"
+%token <identifier_> Protected "protected"
+%token <identifier_> Public "public"
+%token <identifier_> Static "static"
+
+// ES3 Future
+%token <identifier_> Abstract "abstract"
+%token <identifier_> Boolean "boolean"
+%token <identifier_> Byte "byte"
+%token <identifier_> Char "char"
+%token <identifier_> Double "double"
+%token <identifier_> Final "final"
+%token <identifier_> Float "float"
+%token <identifier_> Goto "goto"
+%token <identifier_> Int "int"
+%token <identifier_> Long "long"
+%token <identifier_> Native "native"
+%token <identifier_> Short "short"
+%token <identifier_> Synchronized "synchronized"
+%token <identifier_> Throws "throws"
+%token <identifier_> Transient "transient"
+%token <identifier_> Volatile "volatile"
+
+// ES5 Strict
+%token <identifier_> Let "let"
+%token <identifier_> Yield "yield"
+
+// Woah?!
+%token <identifier_> Each "each"
+
+%token <identifier_> Identifier_
%token <number_> NumericLiteral
%token <string_> StringLiteral
+%token <literal_> RegularExpressionLiteral
%type <expression_> AdditiveExpression
%type <expression_> AdditiveExpressionNoBF
%type <expression_> BitwiseANDExpressionNoBF
%type <expression_> BitwiseANDExpressionNoIn
%type <statement_> Block
+%type <statement_> Block_
%type <boolean_> BooleanLiteral
%type <expression_> BitwiseORExpression
%type <expression_> BitwiseORExpressionNoBF
%type <message_> ClassMessageDeclarationListOpt
%type <className_> ClassName
%type <className_> ClassNameOpt
+%type <statement_> ClassStatement
%type <expression_> ClassSuperOpt
%type <field_> ClassFieldList
+%type <comprehension_> ComprehensionList
+%type <comprehension_> ComprehensionListOpt
%type <expression_> ConditionalExpression
%type <expression_> ConditionalExpressionNoBF
%type <expression_> ConditionalExpressionNoIn
%type <compound_> ExpressionNoIn_
%type <expression_> ExpressionNoInOpt
%type <statement_> ExpressionStatement
-%type <statement_> FinallyOpt
+%type <finally_> FinallyOpt
+%type <comprehension_> ForComprehension
%type <statement_> ForStatement
%type <for_> ForStatementInitialiser
%type <statement_> ForInStatement
%type <forin_> ForInStatementInitialiser
%type <functionParameter_> FormalParameterList
%type <functionParameter_> FormalParameterList_
-%type <source_> FunctionBody
-%type <source_> FunctionDeclaration
+%type <statement_> FunctionBody
+%type <statement_> FunctionDeclaration
%type <expression_> FunctionExpression
+%type <identifier_> Identifier
%type <identifier_> IdentifierOpt
+%type <comprehension_> IfComprehension
%type <statement_> IfStatement
%type <expression_> Initialiser
%type <expression_> InitialiserOpt
%type <statement_> LabelledStatement
%type <expression_> LeftHandSideExpression
%type <expression_> LeftHandSideExpressionNoBF
+//%type <statement_> LetStatement
%type <literal_> Literal
%type <expression_> LogicalANDExpression
%type <expression_> LogicalANDExpressionNoBF
%type <expression_> PrimaryExpression
%type <expression_> PrimaryExpression_
%type <expression_> PrimaryExpressionNoBF
-%type <source_> Program
+%type <statement_> Program
%type <propertyName_> PropertyName
%type <property_> PropertyNameAndValueList
%type <property_> PropertyNameAndValueList_
%type <property_> PropertyNameAndValueListOpt
+%type <literal_> RegularExpressionLiteral_
+%type <condition_> RegularExpressionToken
%type <expression_> RelationalExpression
%type <infix_> RelationalExpression_
%type <expression_> RelationalExpressionNoBF
%type <selector_> SelectorExpressionOpt
%type <expression_> ShiftExpression
%type <expression_> ShiftExpressionNoBF
-%type <source_> SourceElement
-%type <source_> SourceElements
+%type <statement_> SourceElement
+%type <statement_> SourceElements
%type <statement_> Statement
+%type <statement_> Statement_
%type <statement_> StatementList
%type <statement_> StatementListOpt
%type <statement_> SwitchStatement
%%
-TerminatorOpt
+StrictSemi
+ : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
+ ;
+
+Terminator_
: ";"
- | "\n"
- | error { yyerrok; driver.errors_.pop_back(); }
+ | "\n" StrictSemi
+ ;
+
+TerminatorOpt
+ : Terminator_
+ | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
;
Terminator
- : ";"
- | "\n"
- | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } }
+ : Terminator_
+ | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
;
-CommaOpt
+/*CommaOpt
: ","
|
- ;
+ ;*/
NewLineOpt
: "\n"
Word
: Identifier { $$ = $1; }
- | "abstract" { $$ = $1; }
- | "boolean" { $$ = $1; }
| "break" NewLineOpt { $$ = $1; }
- | "byte" { $$ = $1; }
| "case" { $$ = $1; }
| "catch" { $$ = $1; }
- | "char" { $$ = $1; }
| "class" { $$ = $1; }
| "const" { $$ = $1; }
| "continue" NewLineOpt { $$ = $1; }
| "default" { $$ = $1; }
| "delete" { $$ = $1; }
| "do" { $$ = $1; }
- | "double" { $$ = $1; }
| "else" { $$ = $1; }
| "enum" { $$ = $1; }
| "export" { $$ = $1; }
| "extends" { $$ = $1; }
| "false" { $$ = $1; }
- | "final" { $$ = $1; }
| "finally" { $$ = $1; }
- | "float" { $$ = $1; }
| "for" { $$ = $1; }
| "function" { $$ = $1; }
- | "goto" { $$ = $1; }
| "if" { $$ = $1; }
- | "implements" { $$ = $1; }
| "import" { $$ = $1; }
/* XXX: | "in" { $$ = $1; } */
/* XXX: | "instanceof" { $$ = $1; } */
- | "int" { $$ = $1; }
- | "interface" { $$ = $1; }
- | "long" { $$ = $1; }
- | "native" { $$ = $1; }
| "new" { $$ = $1; }
| "null" { $$ = $1; }
- | "package" { $$ = $1; }
- | "private" { $$ = $1; }
- | "protected" { $$ = $1; }
- | "public" { $$ = $1; }
| "return" NewLineOpt { $$ = $1; }
- | "short" { $$ = $1; }
- | "static" { $$ = $1; }
| "super" { $$ = $1; }
| "switch" { $$ = $1; }
- | "synchronized" { $$ = $1; }
| "this" { $$ = $1; }
| "throw" NewLineOpt { $$ = $1; }
- | "throws" { $$ = $1; }
- | "transient" { $$ = $1; }
| "true" { $$ = $1; }
| "try" { $$ = $1; }
| "typeof" { $$ = $1; }
| "var" { $$ = $1; }
| "void" { $$ = $1; }
- | "volatile" { $$ = $1; }
| "while" { $$ = $1; }
| "with" { $$ = $1; }
;
+Identifier
+ : Identifier_ { $$ = $1; }
+
+ | "implements" { $$ = $1; }
+ | "interface" { $$ = $1; }
+ | "package" { $$ = $1; }
+ | "private" { $$ = $1; }
+ | "protected" { $$ = $1; }
+ | "public" { $$ = $1; }
+ | "static" { $$ = $1; }
+
+ | "abstract" { $$ = $1; }
+ | "boolean" { $$ = $1; }
+ | "byte" { $$ = $1; }
+ | "char" { $$ = $1; }
+ | "double" { $$ = $1; }
+ | "final" { $$ = $1; }
+ | "float" { $$ = $1; }
+ | "goto" { $$ = $1; }
+ | "int" { $$ = $1; }
+ | "long" { $$ = $1; }
+ | "native" { $$ = $1; }
+ | "short" { $$ = $1; }
+ | "synchronized" { $$ = $1; }
+ | "throws" { $$ = $1; }
+ | "transient" { $$ = $1; }
+ | "volatile" { $$ = $1; }
+
+ | "let" { $$ = $1; }
+ | "yield" { $$ = $1; }
+
+ | "each" { $$ = $1; }
+ ;
+
IdentifierOpt
: Identifier { $$ = $1; }
| { $$ = NULL; }
;
+RegularExpressionToken
+ : "/" { $$ = CYDriver::RegExStart; }
+ | "/=" { $$ = CYDriver::RegExRest; }
+ ;
+
+RegularExpressionLiteral_
+ : RegularExpressionToken { driver.SetCondition($1); } RegularExpressionLiteral { $$ = $3; }
+ ;
+
Literal
: NullLiteral { $$ = $1; }
| BooleanLiteral { $$ = $1; }
| NumericLiteral { $$ = $1; }
| StringLiteral { $$ = $1; }
+ | RegularExpressionLiteral_ { $$ = $1; }
;
NullLiteral
PropertyNameAndValueList_
: "," PropertyNameAndValueList { $$ = $2; }
- | CommaOpt { $$ = NULL; }
+ | { $$ = NULL; }
;
PropertyNameAndValueListOpt
;
/* }}} */
+/* 11.2 Left-Hand-Side Expressions {{{ */
MemberExpression_
: "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); }
;
: NewExpressionNoBF { $$ = $1; }
| CallExpressionNoBF { $$ = $1; }
;
-
+/* }}} */
+/* 11.3 Postfix Expressions {{{ */
PostfixExpression
: AssigneeExpression { $$ = $1; }
| LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
| LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
| LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
;
-
+/* }}} */
+/* 11.4 Unary Operators {{{ */
UnaryExpression_
: "delete" UnaryExpression { $$ = new(driver.pool_) CYDelete($2); }
| "void" UnaryExpression { $$ = new(driver.pool_) CYVoid($2); }
: PostfixExpressionNoBF { $$ = $1; }
| UnaryExpression_ { $$ = $1; }
;
-
+/* }}} */
+/* 11.5 Multiplicative Operators {{{ */
MultiplicativeExpression
: UnaryExpression { $$ = $1; }
| MultiplicativeExpression "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
| MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
| MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
;
-
+/* }}} */
+/* 11.6 Additive Operators {{{ */
AdditiveExpression
: MultiplicativeExpression { $$ = $1; }
| AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
| AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
| AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
;
-
+/* }}} */
+/* 11.7 Bitwise Shift Operators {{{ */
ShiftExpression
: AdditiveExpression { $$ = $1; }
| ShiftExpression "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
| ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
| ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
;
-
+/* }}} */
+/* 11.8 Relational Operators {{{ */
RelationalExpressionNoIn_
: "<" ShiftExpression { $$ = new(driver.pool_) CYLess(NULL, $2); }
| ">" ShiftExpression { $$ = new(driver.pool_) CYGreater(NULL, $2); }
: ShiftExpressionNoBF { $$ = $1; }
| RelationalExpressionNoBF RelationalExpression_ { $2->SetLeft($1); $$ = $2; }
;
-
+/* }}} */
+/* 11.9 Equality Operators {{{ */
EqualityExpression
: RelationalExpression { $$ = $1; }
| EqualityExpression "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
| EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
| EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
;
-
+/* }}} */
+/* 11.10 Binary Bitwise Operators {{{ */
BitwiseANDExpression
: EqualityExpression { $$ = $1; }
| BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
: BitwiseXORExpressionNoBF { $$ = $1; }
| BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
;
-
+/* }}} */
+/* 11.11 Binary Logical Operators {{{ */
LogicalANDExpression
: BitwiseORExpression { $$ = $1; }
| LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
: LogicalANDExpressionNoBF { $$ = $1; }
| LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
;
-
+/* }}} */
+/* 11.12 Conditional Operator ( ? : ) {{{ */
ConditionalExpression
: LogicalORExpression { $$ = $1; }
| LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
: LogicalORExpressionNoBF { $$ = $1; }
| LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
;
-
+/* }}} */
+/* 11.13 Assignment Operators {{{ */
AssignmentExpression_
: "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign(NULL, $2); }
| "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign(NULL, $2); }
: ConditionalExpressionNoBF { $$ = $1; }
| AssigneeExpressionNoBF AssignmentExpression_ { $2->SetLeft($1); $$ = $2; }
;
-
+/* }}} */
+/* 11.14 Comma Operator {{{ */
Expression_
: "," Expression { $$ = new(driver.pool_) CYCompound($2); }
| { $$ = NULL; }
ExpressionNoBF
: AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }
;
+/* }}} */
-Statement
+/* 12 Statements {{{ */
+Statement_
: Block { $$ = $1; }
| VariableStatement { $$ = $1; }
| EmptyStatement { $$ = $1; }
| TryStatement { $$ = $1; }
;
+Statement
+ : Statement_ { $$ = $1; }
+ ;
+/* }}} */
+/* 12.1 Block {{{ */
+Block_
+ : "{" StatementListOpt "}" { $$ = $2; }
+ ;
+
Block
- : "{" StatementListOpt "}" { if ($2) $$ = new(driver.pool_) CYBlock($2); else $$ = new(driver.pool_) CYEmpty(); }
+ : Block_ { if ($1) $$ = new(driver.pool_) CYBlock($1); else $$ = new(driver.pool_) CYEmpty(); }
;
StatementList
: StatementList { $$ = $1; }
| { $$ = NULL; }
;
-
+/* }}} */
+/* 12.2 Variable Statement {{{ */
VariableStatement
- : "var" VariableDeclarationList Terminator { $$ = $2; }
+ : "var" VariableDeclarationList Terminator { $$ = new(driver.pool_) CYVar($2); }
;
VariableDeclarationList_
InitialiserNoIn
: "=" AssignmentExpressionNoIn { $$ = $2; }
;
-
+/* }}} */
+/* 12.3 Empty Statement {{{ */
EmptyStatement
: ";" { $$ = new(driver.pool_) CYEmpty(); }
;
-
+/* }}} */
+/* 12.4 Expression Statement {{{ */
ExpressionStatement
: ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); }
;
-
+/* }}} */
+/* 12.5 The if Statement {{{ */
ElseStatementOpt
: "else" Statement { $$ = $2; }
| %prec "if" { $$ = NULL; }
IfStatement
: "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); }
;
+/* }}} */
+/* 12.6 Iteration Statements {{{ */
IterationStatement
: DoWhileStatement { $$ = $1; }
| WhileStatement { $$ = $1; }
| ForStatement { $$ = $1; }
| ForInStatement { $$ = $1; }
;
-
+/* }}} */
+/* 12.6.1 The do-while Statement {{{ */
DoWhileStatement
: "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); }
;
-
+/* }}} */
+/* 12.6.2 The while Statement {{{ */
WhileStatement
: "while" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWhile($3, $5); }
;
-
+/* }}} */
+/* 12.6.3 The for Statement {{{ */
ForStatement
: "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new(driver.pool_) CYFor($3, $5, $7, $9); }
;
: ExpressionNoInOpt { $$ = $1; }
| "var" VariableDeclarationListNoIn { $$ = $2; }
;
-
+/* }}} */
+/* 12.6.4 The for-in Statement {{{ */
ForInStatement
: "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); }
;
: LeftHandSideExpression { $$ = $1; }
| "var" VariableDeclarationNoIn { $$ = $2; }
;
+/* }}} */
+/* 12.7 The continue Statement {{{ */
ContinueStatement
: "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); }
;
-
+/* }}} */
+/* 12.8 The break Statement {{{ */
BreakStatement
: "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); }
;
-
+/* }}} */
+/* 12.9 The return Statement {{{ */
ReturnStatement
: "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); }
;
-
+/* }}} */
+/* 12.10 The with Statement {{{ */
WithStatement
: "with" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWith($3, $5); }
;
+/* }}} */
+/* 12.11 The switch Statement {{{ */
SwitchStatement
: "switch" "(" Expression ")" CaseBlock { $$ = new(driver.pool_) CYSwitch($3, $5); }
;
DefaultClause
: "default" ":" StatementListOpt { $$ = new(driver.pool_) CYClause(NULL, $3); }
;
-
+/* }}} */
+/* 12.12 Labelled Statements {{{ */
LabelledStatement
: Identifier ":" Statement { $3->AddLabel($1); $$ = $3; }
;
-
+/* }}} */
+/* 12.13 The throw Statement {{{ */
ThrowStatement
: "throw" Expression Terminator { $$ = new(driver.pool_) CYThrow($2); }
;
-
+/* }}} */
+/* 12.14 The try Statement {{{ */
TryStatement
- : "try" Block CatchOpt FinallyOpt { $$ = new(driver.pool_) CYTry($2, $3, $4); }
+ : "try" Block_ CatchOpt FinallyOpt { $$ = new(driver.pool_) CYTry($2, $3, $4); }
;
CatchOpt
- : "catch" "(" Identifier ")" Block { $$ = new(driver.pool_) CYCatch($3, $5); }
+ : "catch" "(" Identifier ")" Block_ { $$ = new(driver.pool_) CYCatch($3, $5); }
| { $$ = NULL; }
;
FinallyOpt
- : "finally" Block { $$ = $2; }
+ : "finally" Block_ { $$ = new(driver.pool_) CYFinally($2); }
| { $$ = NULL; }
;
+/* }}} */
+/* 13 Function Definition {{{ */
FunctionDeclaration
- : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunction($2, $4, $7); }
+ : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionStatement($2, $4, $7); }
;
FunctionExpression
- : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYLambda($2, $4, $7); }
+ : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($2, $4, $7); }
;
FormalParameterList_
FunctionBody
: SourceElements { $$ = $1; }
;
-
+/* }}} */
+/* 14 Program {{{ */
Program
- : SourceElements { driver.source_ = $1; }
+ : SourceElements { driver.program_ = $1; }
;
SourceElements
;
SourceElement
- : Statement { $$ = $1; }
+ : Statement_ { $$ = $1; }
| FunctionDeclaration { $$ = $1; }
;
+/* }}} */
-/* Objective-C Extensions {{{ */
+/* Cycript: @class Declaration {{{ */
ClassSuperOpt
: ":" MemberExpressionNoBF { $$ = $2; }
| { $$ = NULL; }
;
MessageParameter
- : Word ":" TypeOpt Identifier { $$ = new CYMessageParameter($1, $3, $4); }
+ : Word ":" TypeOpt Identifier { $$ = new(driver.pool_) CYMessageParameter($1, $3, $4); }
;
MessageParameterListOpt
MessageParameters
: MessageParameterList { $$ = $1; }
- | Word { $$ = new CYMessageParameter($1, NULL, NULL); }
+ | Word { $$ = new(driver.pool_) CYMessageParameter($1, NULL, NULL); }
;
ClassMessageDeclaration
- : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new CYMessage($1, $2, $3, $5); }
+ : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new(driver.pool_) CYMessage($1, $2, $3, $5); }
;
ClassMessageDeclarationListOpt
;
ClassExpression
- : "@class" ClassNameOpt ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new CYClass($2, $3, $4, $5); }
+ : "@class" ClassNameOpt ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassExpression($2, $3, $4, $5); }
+ ;
+
+ClassStatement
+ : "@class" ClassName ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassStatement($2, $3, $4, $5); }
;
CategoryStatement
- : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new CYCategory($2, $3); }
+ : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYCategory($2, $3); }
;
-PrimaryExpression_
+PrimaryExpression
: ClassExpression { $$ = $1; }
;
-Statement
- : CategoryStatement
+Statement_
+ : ClassStatement { $$ = $1; }
+ | CategoryStatement { $$ = $1; }
;
-
+/* }}} */
+/* Cycript: Send Message {{{ */
VariadicCall
: "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
| { $$ = NULL; }
PrimaryExpression_
: MessageExpression { $$ = $1; }
- | "@selector" "(" SelectorExpression ")" { $$ = new CYSelector($3); }
+ | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); }
;
/* }}} */
-
+/* Cycript: Pointer Indirection/Addressing {{{ */
AssigneeExpression_
: "*" UnaryExpression { $$ = new(driver.pool_) CYIndirect($2); }
;
MemberAccess
: "->" Identifier { $$ = new(driver.pool_) CYIndirectMember(NULL, new(driver.pool_) CYString($2)); }
;
-
-/*
-
+/* }}} */
+/* ECMAScript5: Object Literal Trailing Comma {{{ */
+PropertyNameAndValueList_
+ : "," { $$ = NULL; }
+ ;
+/* }}} */
+/* JavaScript 1.7: Array Comprehensions {{{ */
IfComprehension
- : "if" "(" Expression ")"
+ : "if" "(" Expression ")" { $$ = new(driver.pool_) CYIfComprehension($3); }
;
ForComprehension
- : "for" "(" ForInStatementInitialiser "in" Expression ")"
+ : "for" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForInComprehension($3, $5); }
+ | "for" "each" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForEachInComprehension($4, $6); }
;
ComprehensionListOpt
- : ComprehensionList
- | IfComprehension
- |
+ : ComprehensionList { $$ = $1; }
+ | IfComprehension { $$ = $1; }
+ | { $$ = NULL; }
;
ComprehensionList
- : ForComprehension ComprehensionListOpt
+ : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; }
;
PrimaryExpression_
- : "[" AssignmentExpression ComprehensionList "]"
+ : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); }
+ ;
+/* }}} */
+/* JavaScript 1.7: for each {{{ */
+ForInStatement
+ : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForEachIn($4, $6, $8); }
+ ;
+/* }}} */
+/* JavaScript 1.7: let Statements {{{ *//*
+LetStatement
+ : "let" "(" VariableDeclarationList ")" Block_ { $$ = new(driver.pool_) CYLet($3, $5); }
;
-*/
+Statement
+ : LetStatement
+ ;
+*//* }}} */
+/* JavaScript FTW: Function Statements {{{ */
+Statement
+ : FunctionDeclaration { driver.Warning(yylloc, "warning, FunctionDeclaration is a SourceElement, not a Statement"); } { $$ = $1; }
+ ;
+/* }}} */
%%
projects / cycript.git / blobdiff