/* Cycript - Optimizing JavaScript Compiler/Runtime
- * Copyright (C) 2009-2010 Jay Freeman (saurik)
+ * Copyright (C) 2009-2012 Jay Freeman (saurik)
*/
/* GNU Lesser General Public License, Version 3 {{{ */
#include "E4X/Syntax.hpp"
@end
+#include "Highlight.hpp"
+
typedef struct {
bool newline_;
+ hi::Value highlight_;
union {
bool bool_;
CYString *string_;
CYThis *this_;
CYTrue *true_;
+ CYTypeModifier *type_;
+ CYTypedIdentifier *typedIdentifier_;
+ CYTypedParameter *typedParameter_;
CYWord *word_;
@begin ObjectiveC
%parse-param { CYDriver &driver }
%lex-param { void *cyscanner }
+/* Token Declarations {{{ */
@begin E4X
%token XMLCDATA
%token XMLComment
%token AtImplementation "@implementation"
%token AtImplementation_ ";@implementation"
%token AtImport "@import"
+%token AtEncode "@encode"
%token AtEnd "@end"
%token AtSelector "@selector"
@end
%token <true_> True "true"
// ES3/ES5/WIE/JSC Reserved
+%token <word_> Auto "auto"
%token <word_> Break "break"
%token <word_> Case "case"
%token <word_> Catch "catch"
%token <word_> In_ "!in"
%token <word_> InstanceOf "instanceof"
%token <word_> New "new"
-%token <word_> Of "of"
%token <word_> Return "return"
%token <word_> Switch "switch"
%token <this_> This "this"
// Woah?!
%token <identifier_> Each "each"
+%token <identifier_> Of "of"
@begin E4X
// E4X Conditional
%type <expression_> ArrowFunction
%type <functionParameter_> ArrowParameters
%type <expression_> AssignmentExpression
+%type <identifier_> Binding
%type <identifier_> BindingIdentifier
%type <expression_> BitwiseANDExpression
%type <statement_> Block_
%type <clause_> CaseClause
%type <clause_> CaseClausesOpt
%type <catch_> CatchOpt
+%type <comprehension_> ComprehensionForList
+%type <comprehension_> ComprehensionForListOpt
%type <comprehension_> ComprehensionList
%type <comprehension_> ComprehensionListOpt
%type <expression_> ConditionalExpression
%type <expression_> FunctionExpression
%type <identifier_> Identifier
%type <identifier_> IdentifierOpt
+%type <word_> IdentifierName
%type <comprehension_> IfComprehension
%type <statement_> IfStatement
%type <expression_> Initialiser
%type <statement_> LetStatement
%type <statement_> LexicalDeclaration
%type <literal_> Literal
-%type <literal_> LiteralNoRE
+%type <literal_> ValueLiteral
%type <expression_> LogicalANDExpression
%type <expression_> LogicalORExpression
%type <member_> MemberAccess
%type <statement_> ProgramBodyOpt
%type <propertyName_> PropertyName_
%type <propertyName_> PropertyName
-%type <property_> PropertyNameAndValueList_
-%type <property_> PropertyNameAndValueList
-%type <property_> PropertyNameAndValueListOpt
+%type <property_> PropertyDefinition
+%type <property_> PropertyDefinitionList_
+%type <property_> PropertyDefinitionList
+%type <property_> PropertyDefinitionListOpt
%type <expression_> RelationalExpression
%type <statement_> ReturnStatement
%type <rubyProc_> RubyProcExpression
%type <declarations_> VariableDeclarationList
%type <statement_> VariableStatement
%type <statement_> WithStatement
+%type <word_> Word
+%type <word_> WordOpt
+%type <expression_> Variable
@begin ObjectiveC
+%type <expression_> BoxableExpression
%type <statement_> CategoryStatement
%type <expression_> ClassExpression
+%type <field_> ClassFieldListOpt
+%type <field_> ClassFields
%type <statement_> ClassStatement
%type <expression_> ClassSuperOpt
-%type <field_> ClassFieldList
%type <message_> ClassMessageDeclaration
%type <message_> ClassMessageDeclarationListOpt
%type <className_> ClassName
%type <protocol_> ClassProtocolListOpt
%type <protocol_> ClassProtocols
%type <protocol_> ClassProtocolsOpt
+%type <expression_> EncodedType
%type <expression_> MessageExpression
%type <messageParameter_> MessageParameter
%type <messageParameter_> MessageParameters
%type <messageParameter_> MessageParameterList
%type <messageParameter_> MessageParameterListOpt
%type <bool_> MessageScope
+%type <type_> ModifiedType
+%type <typedIdentifier_> PrefixedType
+%type <expression_> PrimitiveType
+%type <type_> QualifiedType
%type <argument_> SelectorCall_
%type <argument_> SelectorCall
%type <selector_> SelectorExpression_
%type <selector_> SelectorExpressionOpt
%type <argument_> SelectorList
%type <word_> SelectorWordOpt
+%type <typedIdentifier_> SuffixedType
%type <expression_> TypeOpt
+%type <typedIdentifier_> TypedIdentifier
+%type <typedParameter_> TypedParameterList_
+%type <typedParameter_> TypedParameterList
+%type <typedParameter_> TypedParameterListOpt
%type <argument_> VariadicCall
-%type <word_> Word
-%type <word_> WordOpt
@end
@begin E4X
%type <expression_> XMLListInitialiser
%type <expression_> XMLInitialiser
@end
-
+/* }}} */
+/* Token Priorities {{{ */
%nonassoc ""
%left "++" "--"
%nonassoc "if"
%nonassoc "else"
+/* }}} */
%start Program
;
LexNoBrace
- : { if (yychar == yyempty_) driver.nobrace_ = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }
+ : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }
;
LexNoFunction
- : { if (yychar == token::Function) yychar = token::Function_; }
+ : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
+ ;
+
+LexNoAtImplementation
+ : { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
;
LexSetStatement
- : LexNoBrace LexNoFunction
+ : LexNoBrace LexNoFunction LexNoAtImplementation
;
/* }}} */
-
+/* Virtual Tokens {{{ */
BRACE
: "{"
| "\n{"
;
-StrictSemi
- : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
- ;
-
-Terminator_
- : ";"
- | "\n" StrictSemi
- ;
-
-Terminator
- : Terminator_
- | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+Var_
+ : "var"
;
+/* }}} */
-TerminatorOpt
- : Terminator_
- | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
+/* 7.6 Identifier Names and Identifiers {{{ */
+IdentifierName
+ : Word { $$ = $1; }
;
-/*CommaOpt
- : ","
- |
- ;*/
-
-@begin ObjectiveC
NewLineOpt
: "\n"
|
Word
: Identifier { $$ = $1; }
+ | "auto" { $$ = $1; }
| "break" NewLineOpt { $$ = $1; }
| "case" { $$ = $1; }
| "catch" { $$ = $1; }
| "if" { $$ = $1; }
| "import" { $$ = $1; }
/* XXX: | "in" { $$ = $1; } */
+ | "!in" { $$ = $1; }
/* XXX: | "instanceof" { $$ = $1; } */
// XXX: as it currently is not an Identifier
| "new" { $$ = $1; }
| "null" { $$ = $1; }
- | "of" { $$ = $1; }
| "return" NewLineOpt { $$ = $1; }
| "super" { $$ = $1; }
| "switch" { $$ = $1; }
| { $$ = NULL; }
;
-PrimaryExpression
- : "@" LiteralNoRE { $$ = CYNew CYBox($2); }
- | "@" ArrayLiteral { $$ = CYNew CYBox($2); }
- | "@" ObjectLiteral { $$ = CYNew CYBox($2); }
- | "@" Parenthetical { $$ = CYNew CYBox($2); }
- ;
-@end
-
Identifier
: Identifier_ { $$ = $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; }
;
-Literal
- : LiteralNoRE { $$ = $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 {{{ */
Parenthetical
| { $$ = NULL; }
;
+Variable
+ : Identifier { $$ = CYNew CYVariable($1); }
+ ;
+
PrimaryExpression
: "this" { $$ = $1; }
- | Identifier { $$ = CYNew CYVariable($1); }
+ | Variable { $$ = $1; }
| Literal { $$ = $1; }
| ArrayLiteral { $$ = $1; }
| ObjectLiteral { $$ = $1; }
| LexSetRegExp { $$ = NULL; }
;
/* }}} */
+/* 11.1.4.2 Array Comprehension {{{ */
+PrimaryExpression
+ : "[" LexPushInOff AssignmentExpression ComprehensionForList LexPopIn "]" { $$ = CYNew CYArrayComprehension($3, $4); }
+ ;
+
+ComprehensionForList
+ : "for" Binding "in" Expression ComprehensionForListOpt { $$ = CYNew CYForInComprehension($2, $4, $5); }
+ | "for" Binding "of" Expression ComprehensionForListOpt { $$ = CYNew CYForOfComprehension($2, $4, $5); }
+ ;
+
+ComprehensionForListOpt
+ : ComprehensionForList { $$ = $1; }
+ | "if" Expression { $$ = CYNew CYIfComprehension($2); }
+ | { $$ = NULL; }
+ ;
+/* }}} */
/* 11.1.5 Object Initialiser {{{ */
ObjectLiteral
- : BRACE LexPushInOff PropertyNameAndValueListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }
+ : BRACE LexPushInOff PropertyDefinitionListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }
;
-PropertyNameAndValueList_
- : "," PropertyNameAndValueList { $$ = $2; }
+PropertyDefinitionList_
+ : "," PropertyDefinitionList { $$ = $2; }
+ | "," LexSetRegExp { $$ = NULL; }
| { $$ = NULL; }
;
-PropertyNameAndValueList
- : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); }
+PropertyDefinitionList
+ : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; }
;
-PropertyNameAndValueListOpt
- : PropertyNameAndValueList { $$ = $1; }
- | { $$ = NULL; }
+PropertyDefinitionListOpt
+ : PropertyDefinitionList { $$ = $1; }
+ | LexSetRegExp { $$ = NULL; }
+ ;
+
+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; }
;
/* 11.2 Left-Hand-Side Expressions {{{ */
MemberAccess
: "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYDirectMember(NULL, $3); }
- | "." Identifier { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
+ | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
| "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
;
StatementListOpt
: StatementList { $$ = $1; }
- | LexSetRegExp { $$ = NULL; }
+ | LexSetStatement LexSetRegExp { $$ = NULL; }
;
StatementListItem
| Declaration { $$ = $1; }
;
/* }}} */
+
/* 12.2 Declarations {{{ */
BindingIdentifier
: Identifier { $$ = $1; }
;
+Binding
+ : BindingIdentifier
+ ;
+
// XXX: BindingPattern
/* }}} */
/* 12.2.1 Let and Const Declarations {{{ */
/* }}} */
/* 12.2.2 Variable Statement {{{ */
VariableStatement
- : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
+ : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
;
VariableDeclarationList_
: BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
;
/* }}} */
+
/* 12.3 Empty Statement {{{ */
EmptyStatement
: ";" { $$ = CYNew CYEmpty(); }
ForStatementInitialiser
: ExpressionOpt { $$ = $1; }
- | LexSetRegExp "var" VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }
+ | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }
;
/* }}} */
/* 12.6.4 The for-in and for-of Statements {{{ */
ForInStatementInitialiser
: LeftHandSideExpression { $$ = $1; }
- | LexSetRegExp "var" VariableDeclaration { $$ = $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 {{{ */
/* }}} */
/* 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 {{{ */
/* }}} */
/* 13.2 Arrow Function Definitions {{{ */
ArrowFunction
- : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFunctionExpression(NULL, $2, $5); }
+ : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); }
;
ArrowParameters
ConciseBody
: AssignmentExpression { $$ = CYNew CYReturn($1); }
- | ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $3; }
+ | LexSetRegExp ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $4; }
;
/* }}} */
/* 14 Program {{{ */
ProgramBodyOpt
: ProgramBody { $$ = $1; }
- | { $$ = NULL; }
+ | LexSetStatement LexSetRegExp { $$ = NULL; }
;
/* }}} */
@begin ObjectiveC
+/* Cycript (Objective-C): Type Encoding {{{ */
+SuffixedType
+ : IdentifierOpt { $$ = CYNew CYTypedIdentifier($1); }
+ | "(" LexPushInOff PrefixedType LexPopIn ")" { $$ = $3; }
+ | SuffixedType "[" NumericLiteral "]" { CYSetLast($1->type_) = CYNew CYTypeArrayOf($3->Value()); $$ = $1; }
+ ;
+
+PrefixedType
+ : SuffixedType { $$ = $1; }
+ | "const" PrefixedType { CYSetLast($2->type_) = CYNew CYTypeConstant(); $$ = $2; }
+ | "*" PrefixedType { CYSetLast($2->type_) = CYNew CYTypePointerTo(); $$ = $2; }
+ ;
+
+PrimitiveType
+ : Variable { $$ = $1; }
+ | "void" { $$ = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); }
+ ;
+
+QualifiedType
+ : PrimitiveType { $$ = CYNew CYTypeVariable($1); }
+ | "const" QualifiedType { $$ = CYNew CYTypeConstant($2); }
+ ;
+
+ModifiedType
+ : QualifiedType { $$ = $1; }
+ | QualifiedType "*" { $$ = CYNew CYTypePointerTo($1); }
+ | QualifiedType "const" { $$ = CYNew CYTypeConstant($1); }
+ ;
+
+TypedIdentifier
+ : QualifiedType PrefixedType { CYSetLast($2->type_) = $1; $$ = $2;}
+ ;
+
+EncodedType
+ : TypedIdentifier { $$ = CYNew CYEncodedType($1->type_); }
+ ;
+
+PrimaryExpression
+ : AtEncode "(" EncodedType ")" { $$ = $3; }
+ ;
+/* }}} */
/* Cycript (Objective-C): @class Declaration {{{ */
ClassSuperOpt
/* XXX: why the hell did I choose MemberExpression? */
| { $$ = NULL; }
;
-ClassField
- : Expression Identifier ";"
+ClassFieldListOpt
+ : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
+ | LexSetRegExp { $$ = NULL; }
;
-ClassFieldList
- : BRACE ClassFieldListOpt "}" { $$ = NULL; }
- ;
-
-ClassFieldListOpt
- : ClassFieldListOpt ClassField
- |
+ClassFields
+ : BRACE ClassFieldListOpt "}" { $$ = $2; }
;
MessageScope
;
TypeOpt
- : "(" Expression ")" { $$ = $2; }
- | "(" LexSetRegExp "void" ")" { $$ = NULL; }
+ : "(" LexSetRegExp EncodedType ")" { $$ = $3; }
| { $$ = NULL; }
;
;
ClassExpression
- : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt LexPopIn "@end" { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); }
+ : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields LexPopIn ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassExpression($3, $4, $5, $6, $8); }
;
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
;
StatementListItem
- : "@import" ImportPath { $$ = CYNew CYImport(); }
+ : LexSetStatement LexSetRegExp "@import" ImportPath { $$ = CYNew CYImport(); }
+ ;
+/* }}} */
+/* Cycript (Objective-C): Boxed Expressions {{{ */
+BoxableExpression
+ : NullLiteral { $$ = $1; }
+ | BooleanLiteral { $$ = $1; }
+ | NumericLiteral { $$ = $1; }
+ | StringLiteral { $$ = $1; }
+ | ArrayLiteral { $$ = $1; }
+ | ObjectLiteral { $$ = $1; }
+ | Parenthetical { $$ = $1; }
+ ;
+
+PrimaryExpression
+ : "@" BoxableExpression { $$ = CYNew CYBox($2); }
+ ;
+/* }}} */
+/* Cycript (Objective-C): Block Expressions {{{ */
+TypedParameterList_
+ : "," TypedParameterList { $$ = $2; }
+ | { $$ = NULL; }
+ ;
+
+TypedParameterList
+ : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); }
+ ;
+
+TypedParameterListOpt
+ : TypedParameterList { $$ = $1; }
+ | { $$ = NULL; }
+ ;
+
+PrimaryExpression
+ : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt LexPopIn ")" BRACE LexPushInOff FunctionBody LexPopIn "}" { $$ = CYNew CYObjCBlock($2, $5, $10); }
;
/* }}} */
@end
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"
+ ;
+/* }}} */
@end
/* YUI: Documentation Comments {{{ */
: { driver.SetCondition(CYDriver::XMLTagCondition); }
;
/* }}} */
-
+/* Virtual Tokens {{{ */
XMLWhitespaceOpt
: XMLWhitespace
|
;
+/* }}} */
/* 8.1 Context Keywords {{{ */
Identifier
| XMLPI { $$ = $1; }
;
/* }}} */
+
/* 11.1 Primary Expressions {{{ */
PrimaryExpression
: PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }
: "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop LexPopIn "</>" { $$ = CYNew CYXMLList($4); }
;
/* }}} */
+
/* 11.2 Left-Hand-Side Expressions {{{ */
PropertyIdentifier_
: Identifier { $$ = $1; }
/* }}} */
@end
-/* ECMAScript5: Object Literal Trailing Comma {{{ */
-PropertyNameAndValueList_
- : "," { $$ = NULL; }
- ;
-/* }}} */
-
/* JavaScript 1.7: Array Comprehensions {{{ */
IfComprehension
: "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); }
;
ForComprehension
- : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); }
- | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); }
+ : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); }
+ | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); }
;
ComprehensionList
projects / cycript.git / blobdiff