From: Jay Freeman (saurik) Date: Wed, 6 Jun 2012 05:47:18 +0000 (-0700) Subject: Standardize grammar rule ordering: *_, *, *Opt. X-Git-Tag: v0.9.456~24 X-Git-Url: https://git.saurik.com/cycript.git/commitdiff_plain/55fc1817b91ea69a393f7d149ea6848be5abbfed Standardize grammar rule ordering: *_, *, *Opt. --- diff --git a/Cycript.yy.in b/Cycript.yy.in index ed14164..d8ec64a 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -319,23 +319,23 @@ int cylex(YYSTYPE *, cy::location *, void *); %type AdditiveExpression %type AdditiveExpressionNoBF -%type ArgumentList %type ArgumentList_ +%type ArgumentList %type ArgumentListOpt %type Arguments %type ArrayLiteral %type AssigneeExpression %type AssigneeExpressionNoBF -%type AssignmentExpression %type AssignmentExpression_ +%type AssignmentExpression %type AssignmentExpressionNoBF %type AssignmentExpressionNoIn %type BindingIdentifier %type BitwiseANDExpression %type BitwiseANDExpressionNoBF %type BitwiseANDExpressionNoIn -%type Block %type Block_ +%type Block %type BooleanLiteral %type BindingElement %type BitwiseORExpression @@ -371,12 +371,12 @@ int cylex(YYSTYPE *, cy::location *, void *); %type EqualityExpression %type EqualityExpressionNoBF %type EqualityExpressionNoIn +%type Expression_ %type Expression %type ExpressionOpt -%type Expression_ %type ExpressionNoBF -%type ExpressionNoIn %type ExpressionNoIn_ +%type ExpressionNoIn %type ExpressionNoInOpt %type ExpressionStatement %type FinallyOpt @@ -386,8 +386,8 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ForInStatement %type ForInStatementInitialiser %type FormalParameter -%type FormalParameterList %type FormalParameterList_ +%type FormalParameterList %type FormalParameterListOpt %type FunctionBody %type FunctionDeclaration @@ -417,13 +417,13 @@ int cylex(YYSTYPE *, cy::location *, void *); %type LogicalORExpressionNoBF %type LogicalORExpressionNoIn %type MemberAccess -%type MemberExpression %type MemberExpression_ +%type MemberExpression %type MemberExpressionNoBF %type MultiplicativeExpression %type MultiplicativeExpressionNoBF -%type NewExpression %type NewExpression_ +%type NewExpression %type NewExpressionNoBF %type NullLiteral %type ObjectLiteral @@ -437,43 +437,43 @@ int cylex(YYSTYPE *, cy::location *, void *); %type Program %type ProgramBody %type ProgramBodyOpt -%type PropertyName %type PropertyName_ -%type PropertyNameAndValueList +%type PropertyName %type PropertyNameAndValueList_ +%type PropertyNameAndValueList %type PropertyNameAndValueListOpt -%type RelationalExpression %type RelationalExpression_ +%type RelationalExpression %type RelationalExpressionNoBF -%type RelationalExpressionNoIn %type RelationalExpressionNoIn_ +%type RelationalExpressionNoIn %type ReturnStatement %type RubyProcExpression %type RubyProcExpressionNoOA -%type RubyProcParameterList %type RubyProcParameterList_ +%type RubyProcParameterList %type RubyProcParameters %type RubyProcParametersOpt %type ShiftExpression %type ShiftExpressionNoBF %type SingleNameBinding -%type Statement %type Statement_ +%type Statement %type StatementList %type StatementListOpt %type StatementListItem %type SwitchStatement %type ThrowStatement %type TryStatement -%type UnaryExpression %type UnaryExpression_ +%type UnaryExpression %type UnaryExpressionNoBF %type VariableDeclaration %type VariableDeclarationNoIn -%type VariableDeclarationList %type VariableDeclarationList_ -%type VariableDeclarationListNoIn +%type VariableDeclarationList %type VariableDeclarationListNoIn_ +%type VariableDeclarationListNoIn %type VariableStatement %type WhileStatement %type WithStatement @@ -508,10 +508,10 @@ int cylex(YYSTYPE *, cy::location *, void *); %type MessageParameterList %type MessageParameterListOpt %type MessageScope -%type SelectorCall %type SelectorCall_ -%type SelectorExpression +%type SelectorCall %type SelectorExpression_ +%type SelectorExpression %type SelectorExpressionOpt %type SelectorList %type SelectorWordOpt @@ -523,10 +523,10 @@ int cylex(YYSTYPE *, cy::location *, void *); @begin E4X %type PropertyIdentifier_ -%type PropertySelector %type PropertySelector_ -%type QualifiedIdentifier +%type PropertySelector %type QualifiedIdentifier_ +%type QualifiedIdentifier %type WildcardIdentifier %type XMLComment %type XMLCDATA @@ -587,14 +587,14 @@ Terminator_ | "\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 @@ -608,11 +608,6 @@ NewLineOpt | ; -WordOpt - : Word { $$ = $1; } - | { $$ = NULL; } - ; - Word : Identifier { $$ = $1; } | "break" NewLineOpt { $$ = $1; } @@ -653,6 +648,11 @@ Word | "with" { $$ = $1; } ; +WordOpt + : Word { $$ = $1; } + | { $$ = NULL; } + ; + PrimaryExpressionNo : "@" LiteralNoRE { $$ = CYNew CYBox($2); } | "@" ArrayLiteral { $$ = CYNew CYBox($2); } @@ -766,15 +766,15 @@ ElementOpt | LexSetRegExp { $$ = NULL; } ; -ElementListOpt - : ElementList { $$ = $1; } - | LexSetRegExp { $$ = NULL; } - ; - ElementList : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); } | Element { $$ = CYNew CYElement($1, NULL); } ; + +ElementListOpt + : ElementList { $$ = $1; } + | LexSetRegExp { $$ = NULL; } + ; /* }}} */ /* 11.1.5 Object Initialiser {{{ */ ObjectLiteral @@ -786,15 +786,15 @@ PropertyNameAndValueList_ | { $$ = NULL; } ; +PropertyNameAndValueList + : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); } + ; + PropertyNameAndValueListOpt : PropertyNameAndValueList { $$ = $1; } | { $$ = NULL; } ; -PropertyNameAndValueList - : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); } - ; - PropertyName_ : Identifier { $$ = $1; } | StringLiteral { $$ = $1; } @@ -807,16 +807,16 @@ PropertyName /* }}} */ /* 11.2 Left-Hand-Side Expressions {{{ */ -MemberExpression_ - : "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($2, $3); } - ; - MemberAccess : "[" Expression "]" { $$ = CYNew CYDirectMember(NULL, $2); } | "." Identifier { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); } | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; } ; +MemberExpression_ + : "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($2, $3); } + ; + MemberExpression : PrimaryExpression { $$ = $1; } | LexSetRegExp FunctionExpression { $$ = $2; } @@ -885,15 +885,15 @@ ArgumentList_ | { $$ = NULL; } ; +ArgumentList + : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); } + ; + ArgumentListOpt : ArgumentList { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; -ArgumentList - : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); } - ; - Arguments : "(" ArgumentListOpt ")" { $$ = $2; } ; @@ -1012,14 +1012,6 @@ ShiftExpressionNoBF ; /* }}} */ /* 11.8 Relational Operators {{{ */ -RelationalExpressionNoIn_ - : "<" ShiftExpression { $$ = CYNew CYLess(NULL, $2); } - | ">" ShiftExpression { $$ = CYNew CYGreater(NULL, $2); } - | "<=" ShiftExpression { $$ = CYNew CYLessOrEqual(NULL, $2); } - | ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual(NULL, $2); } - | "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf(NULL, $2); } - ; - RelationalExpression_ : RelationalExpressionNoIn_ { $$ = $1; } | "in" ShiftExpression { $$ = CYNew CYIn(NULL, $2); } @@ -1030,6 +1022,14 @@ 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; } @@ -1227,9 +1227,8 @@ Expression_ | { $$ = NULL; } ; -ExpressionNoIn_ - : "," ExpressionNoIn { $$ = CYNew CYCompound($2); } - | { $$ = NULL; } +Expression + : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; } ; ExpressionOpt @@ -1237,19 +1236,20 @@ 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; } ; @@ -1337,15 +1337,15 @@ VariableDeclarationList_ | { $$ = NULL; } ; +VariableDeclarationList + : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); } + ; + VariableDeclarationListNoIn_ : "," VariableDeclarationListNoIn { $$ = $2; } | { $$ = NULL; } ; -VariableDeclarationList - : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); } - ; - VariableDeclarationListNoIn : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = CYNew CYDeclarations($1, $2); } ; @@ -1360,23 +1360,23 @@ VariableDeclarationNoIn // XXX: | BindingPattern InitialiserNoIn { $$ = CYNew CYDeclaration($1, $2); } ; +Initialiser + : "=" AssignmentExpression { $$ = $2; } + ; + InitialiserOpt : Initialiser { $$ = $1; } | { $$ = NULL; } ; +InitialiserNoIn + : "=" AssignmentExpressionNoIn { $$ = $2; } + ; + InitialiserNoInOpt : InitialiserNoIn { $$ = $1; } | { $$ = NULL; } ; - -Initialiser - : "=" AssignmentExpression { $$ = $2; } - ; - -InitialiserNoIn - : "=" AssignmentExpressionNoIn { $$ = $2; } - ; /* }}} */ /* 12.2.4 Destructuring Binding Patterns {{{ */ // XXX: * @@ -1479,16 +1479,16 @@ CaseBlock : Brace CaseClausesOpt "}" { $$ = $2; } ; +CaseClause + : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } + ; + CaseClausesOpt : CaseClause CaseClausesOpt { $1->SetNext($2); $$ = $1; } | DefaultClause CaseClausesOpt { $1->SetNext($2); $$ = $1; } | { $$ = NULL; } ; -CaseClause - : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } - ; - DefaultClause : "default" ":" StatementListOpt { $$ = CYNew CYClause(NULL, $3); } ; @@ -1538,16 +1538,16 @@ FormalParameterList_ | { $$ = NULL; } ; -FormalParameterListOpt - : FormalParameterList - | { $$ = NULL; } - ; - FormalParameterList // XXX: : FunctionRestParameter { $$ = $1; } : FormalParameter FormalParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); } ; +FormalParameterListOpt + : FormalParameterList + | { $$ = NULL; } + ; + /* XXX: FunctionRestParameter : "..." BindingIdentifier { $$ = CYNew CYFunctionRestParameter($2); } ;*/ @@ -1565,14 +1565,14 @@ Program : ProgramBodyOpt { driver.program_ = CYNew CYProgram($1); } ; +ProgramBody + : StatementList { $$ = $1; } + ; + ProgramBodyOpt : ProgramBody { $$ = $1; } | { $$ = NULL; } ; - -ProgramBody - : StatementList { $$ = $1; } - ; /* }}} */ @begin ObjectiveC @@ -1587,15 +1587,15 @@ ClassField : Expression Identifier ";" ; +ClassFieldList + : Brace ClassFieldListOpt "}" { $$ = NULL; } + ; + ClassFieldListOpt : ClassFieldListOpt ClassField | ; -ClassFieldList - : Brace ClassFieldListOpt "}" { $$ = NULL; } - ; - MessageScope : "+" { $$ = false; } | "-" { $$ = true; } @@ -1611,15 +1611,15 @@ MessageParameter : Word ":" TypeOpt Identifier { $$ = CYNew CYMessageParameter($1, $3, $4); } ; +MessageParameterList + : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } + ; + MessageParameterListOpt : MessageParameterList { $$ = $1; } | { $$ = NULL; } ; -MessageParameterList - : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } - ; - MessageParameters : MessageParameterList { $$ = $1; } | Word { $$ = CYNew CYMessageParameter($1, NULL, NULL); } @@ -1691,16 +1691,16 @@ VariadicCall | { $$ = NULL; } ; -SelectorCall_ - : SelectorCall { $$ = $1; } - | VariadicCall { $$ = $1; } - ; - SelectorWordOpt : WordOpt { driver.contexts_.back().words_.push_back($1); } { $$ = $1; } | AutoComplete { driver.mode_ = CYDriver::AutoMessage; YYACCEPT; } ; +SelectorCall_ + : SelectorCall { $$ = $1; } + | VariadicCall { $$ = $1; } + ; + SelectorCall : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYBlank(), $3, $4); } ; @@ -1715,11 +1715,6 @@ MessageExpression | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = CYNew CYSendSuper($5); } ; -SelectorExpressionOpt - : SelectorExpression_ { $$ = $1; } - | { $$ = NULL; } - ; - SelectorExpression_ : WordOpt ":" SelectorExpressionOpt { $$ = CYNew CYSelectorPart($1, true, $3); } ; @@ -1729,6 +1724,11 @@ SelectorExpression | Word { $$ = CYNew CYSelectorPart($1, false, NULL); } ; +SelectorExpressionOpt + : SelectorExpression_ { $$ = $1; } + | { $$ = NULL; } + ; + PrimaryExpressionNo : MessageExpression { $$ = $1; } | "@selector" "(" SelectorExpression ")" { $$ = CYNew CYSelector($3); } @@ -1964,16 +1964,16 @@ ForComprehension | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForEachInComprehension($4, $6); } ; +ComprehensionList + : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; } + ; + ComprehensionListOpt : ComprehensionList { $$ = $1; } | IfComprehension { $$ = $1; } | { $$ = NULL; } ; -ComprehensionList - : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; } - ; - PrimaryExpressionNo : "[" AssignmentExpression ComprehensionList "]" { $$ = CYNew CYArrayComprehension($2, $3); } ;