X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/322286dd48cfe4c3b9eff66583931e89038e4ba4..6244bca0d4d6048c9c27e501648dbc955882d7cf:/Parser.ypp.in?ds=sidebyside diff --git a/Parser.ypp.in b/Parser.ypp.in index 21db450..5b0c18b 100644 --- a/Parser.ypp.in +++ b/Parser.ypp.in @@ -113,6 +113,8 @@ int cylex(YYSTYPE *, CYLocation *, void *); %code { +typedef cy::parser::token tk; + #undef yylex _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CYDriver &driver) { if (driver.mark_ == CYMarkIgnore); @@ -124,9 +126,35 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY return cy::parser::token::MarkModule; } + lex: + if (driver.newline_ == CYDriver::NewLineHere) + driver.newline_ = CYDriver::NewLineLast; + else if (driver.newline_ == CYDriver::NewLineLast) + driver.newline_ = CYDriver::NewLineNone; + YYSTYPE data; int token(cylex(&data, location, driver.scanner_)); *semantic = data.semantic_; + + switch (token) { + case tk::_in_: + if (driver.in_.top()) + token = tk::_in__; + break; + + case tk::_yield_: + if (driver.yield_.top()) + token = tk::_yield__; + break; + + case tk::NewLine: + driver.newline_ = CYDriver::NewLineHere; + if (!driver.next_) + goto lex; + break; + } + + driver.next_ = false; return token; } @@ -142,14 +170,30 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY yyla.type = yytranslate_(token::to); \ } while (false) +#define CYLIN(from) do { \ + CYLEX(); \ + if (yyla.type == yytranslate_(token::from) && driver.newline_ == CYDriver::NewLineLast) \ + yyla.type = yytranslate_(token::from ## _); \ +} while (false) + #define CYERR(location, message) do { \ error(location, message); \ YYABORT; \ } while (false) +#define CYEOK() do { \ + yyerrok; \ + driver.errors_.pop_back(); \ +} while (false) + #define CYNOT(location) \ CYERR(location, "unimplemented feature") +#define CYMPT(location) do { \ + if (!yyla.empty() && yyla.type_get() != yyeof_) \ + CYERR(location, "unexpected lookahead"); \ +} while (false) + } %name-prefix "cy" @@ -260,9 +304,11 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY %token OpenBrace "{" %token OpenBrace_ "\n{" %token OpenBrace__ ";{" +%token OpenBrace_let "let {" %token CloseBrace "}" %token OpenBracket "[" +%token OpenBracket_let "let [" %token CloseBracket "]" %token At_error_ "@error" @@ -327,7 +373,6 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY %token _instanceof_ "instanceof" %token _new_ "new" %token _return_ "return" -%token _return__ "!return" %token _super_ "super" %token _switch_ "switch" %token _target_ "target" @@ -357,6 +402,7 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY %token _int_ "int" %token _interface_ "interface" %token _let_ "let" +%token _let__ "!let" %token _long_ "long" %token _native_ "native" %token _package_ "package" @@ -388,6 +434,7 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY %token _auto_ "auto" %token _each_ "each" %token _of_ "of" +%token _of__ "!of" @begin E4X %token _namespace_ "namespace" @@ -407,6 +454,7 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY %token TemplateMiddle %token TemplateTail +%type AccessExpression %type AdditiveExpression %type ArgumentList_ %type ArgumentList @@ -489,6 +537,7 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY %type IdentifierName %type IdentifierReference %type IfStatement +%type IndirectExpression %type Initializer %type InitializerOpt %type IterationStatement @@ -629,9 +678,6 @@ _finline int yylex(cy::parser::semantic_type *semantic, CYLocation *location, CY @end /* }}} */ /* Token Priorities {{{ */ -%nonassoc "" -%left "++" "--" "{" - %nonassoc "if" %nonassoc "else" /* }}} */ @@ -663,12 +709,16 @@ LexPushYieldOn: { driver.yield_.push(true); }; LexPushYieldOff: { driver.yield_.push(false); }; LexPopYield: { driver.yield_.pop(); }; +LexOf + : { CYMAP(_of__, _of_); } + ; + LexSetRegExp - : { CYLEX(); if (yyla.type == yytranslate_(token::Slash)) { yyla.clear(); driver.SetRegEx(false); } else if (yyla.type == yytranslate_(token::SlashEqual)) { yyla.clear(); driver.SetRegEx(true); } } + : { CYLEX(); if (yyla.type == yytranslate_(token::Slash)) { yyla.clear(); driver.SetRegEx(false); } else if (yyla.type == yytranslate_(token::SlashEqual)) { yyla.clear(); driver.SetRegEx(true); } } LexOf ; LexNewLine - : { if (!yyla.empty() && yyla.type_get() != yyeof_) CYERR(@$, "unexpected lookahead"); driver.next_ = true; } + : { CYMPT(@$); driver.next_ = true; } ; LexNoStar @@ -707,7 +757,6 @@ IdentifierName : Word { $$ = $1; } | "for" { $$ = CYNew CYWord("for"); } | "in" { $$ = CYNew CYWord("in"); } - | "Infinity" { $$ = CYNew CYIdentifier("Infinity"); } | "instanceof" { $$ = CYNew CYWord("instanceof"); } ; @@ -743,7 +792,6 @@ Word | "new" LexSetRegExp { $$ = CYNew CYWord("new"); } | "null" { $$ = CYNew CYWord("null"); } | "return" { $$ = CYNew CYWord("return"); } - | "!return" { $$ = CYNew CYWord("return"); } | "super" { $$ = CYNew CYWord("super"); } | "switch" { $$ = CYNew CYWord("switch"); } | "this" { $$ = CYNew CYWord("this"); } @@ -758,9 +806,6 @@ Word | "yield" { $$ = CYNew CYIdentifier("yield"); } | Yield LexSetRegExp NewLineOpt { $$ = CYNew CYIdentifier("yield"); } - - // XXX: should be Identifier - | "let" { $$ = CYNew CYIdentifier("let"); } ; @begin ObjectiveC @@ -794,7 +839,7 @@ TerminatorSoft Terminator : ";" - | error { if (yyla.type_get() != yyeof_ && yyla.type != yytranslate_(token::CloseBrace) && !driver.newline_) { CYERR(@1, "required semi-colon"); } else { yyerrok; driver.errors_.pop_back(); } } StrictSemi + | error { if (yyla.type_get() != yyeof_ && yyla.type != yytranslate_(token::CloseBrace) && driver.newline_ == CYDriver::NewLineNone) CYERR(@1, "required semi-colon"); else CYEOK(); } StrictSemi ; TerminatorOpt @@ -840,9 +885,12 @@ IdentifierType | "get" { $$ = CYNew CYIdentifier("get"); } | "goto" { $$ = CYNew CYIdentifier("goto"); } | "implements" { $$ = CYNew CYIdentifier("implements"); } + | "Infinity" { $$ = CYNew CYIdentifier("Infinity"); } | "interface" { $$ = CYNew CYIdentifier("interface"); } + | "let" { $$ = CYNew CYIdentifier("let"); } + | "!let" LexBind { $$ = CYNew CYIdentifier("let"); } | "native" { $$ = CYNew CYIdentifier("native"); } - | "of" { $$ = CYNew CYIdentifier("of"); } + | "!of" { $$ = CYNew CYIdentifier("of"); } | "package" { $$ = CYNew CYIdentifier("package"); } | "private" { $$ = CYNew CYIdentifier("private"); } | "protected" { $$ = CYNew CYIdentifier("protected"); } @@ -912,7 +960,6 @@ Literal : NullLiteral { $$ = $1; } | BooleanLiteral { $$ = $1; } | NumericLiteral { $$ = $1; } - | "Infinity" { $$ = CYNew CYNumber(std::numeric_limits::infinity()); } | StringLiteral { $$ = $1; } ; /* }}} */ @@ -1066,16 +1113,25 @@ ArgumentListOpt | LexSetRegExp { $$ = NULL; } ; -LeftHandSideExpression +AccessExpression : NewExpression { $$ = $1; } | CallExpression { $$ = $1; } ; + +LeftHandSideExpression + : AccessExpression LexCrement { $$ = $1; } + | LexSetRegExp IndirectExpression { $$ = $2; } + ; /* }}} */ /* 12.4 Postfix Expressions {{{ */ +LexCrement + : { CYLIN(PlusPlus); CYLIN(HyphenHyphen); } + ; + PostfixExpression - : %prec "" LeftHandSideExpression { $$ = $1; } - | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); } - | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); } + : AccessExpression LexCrement { $$ = $1; } + | AccessExpression LexCrement "++" { $$ = CYNew CYPostIncrement($1); } + | AccessExpression LexCrement "--" { $$ = CYNew CYPostDecrement($1); } ; /* }}} */ /* 12.5 Unary Operators {{{ */ @@ -1094,7 +1150,7 @@ UnaryExpression_ ; UnaryExpression - : %prec "" PostfixExpression { $$ = $1; } + : PostfixExpression LexOpenBrace { $$ = $1; } | LexSetRegExp UnaryExpression_ { $$ = $2; } ; /* }}} */ @@ -1251,17 +1307,17 @@ Statement_ ; Statement - : LexSetStatement Statement_ { $$ = $2; } + : LexSetStatement LexLet Statement_ { $$ = $3; } ; Declaration__ : HoistableDeclaration { $$ = $1; } | ClassDeclaration { $$ = $1; } - | LexicalDeclaration { $$ = $1; } ; Declaration_ - : LexSetRegExp Declaration__ { $$ = $2; } + : LexLet LexSetRegExp Declaration__ { $$ = $3; } + | LexicalDeclaration { $$ = $1; } ; Declaration @@ -1293,7 +1349,7 @@ StatementList StatementListOpt : StatementList { $$ = $1; } - | LexSetStatement LexSetRegExp { $$ = NULL; } + | LexSetStatement LexLet LexSetRegExp { $$ = NULL; } ; StatementListItem @@ -1310,13 +1366,21 @@ LexicalDeclaration : LexicalDeclaration_ Terminator { $$ = $1; } ; +LexLet + : { CYMAP(_let__, _let_); } + ; + +LexBind + : { CYMAP(OpenBrace_let, OpenBrace); CYMAP(OpenBracket_let, OpenBracket); } LexOf + ; + LetOrConst - : "let" { $$ = false; } - | "const" { $$ = true; } + : LexLet LexSetRegExp "!let" LexBind { $$ = false; } + | LexLet LexSetRegExp "const" { $$ = true; } ; BindingList_ - : "," BindingList { $$ = $2; } + : "," LexBind BindingList { $$ = $3; } | { $$ = NULL; } ; @@ -1344,7 +1408,7 @@ VariableDeclarationList_ ; VariableDeclarationList - : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); } + : LexBind VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($2, $3); } ; VariableDeclaration @@ -1359,11 +1423,11 @@ BindingPattern ; ObjectBindingPattern - : BRACE BindingPropertyListOpt "}" + : "let {" BindingPropertyListOpt "}" ; ArrayBindingPattern - : "[" { CYNOT(@$); } + : "let [" { CYNOT(@$); } ; BindingPropertyList_ @@ -1386,8 +1450,8 @@ BindingProperty ; BindingElement - : SingleNameBinding { $$ = $1; } - | BindingPattern InitializerOpt { CYNOT(@$); } + : LexBind SingleNameBinding { $$ = $2; } + | LexBind BindingPattern InitializerOpt { CYNOT(@$); } ; SingleNameBinding @@ -1426,22 +1490,23 @@ IterationStatement : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); } | "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); } | "for" "(" LexPushInOn ForStatementInitializer LexPopIn ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $6, $8, $10); } - | "for" "(" LexPushInOn LexSetRegExp Var_ BindingIdentifier Initializer "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForInitialized(CYNew CYDeclaration($6, $7), $10, $12); } + | "for" "(" LexPushInOn LexLet LexSetRegExp Var_ LexBind BindingIdentifier Initializer "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForInitialized(CYNew CYDeclaration($8, $9), $12, $14); } | "for" "(" LexPushInOn ForInStatementInitializer "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); } | "for" "(" LexPushInOn ForInStatementInitializer "of" LexPopIn AssignmentExpression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); } ; ForStatementInitializer - : LexSetRegExp EmptyStatement { $$ = $2; } - | ExpressionStatement_ ";" { $$ = $1; } - | LexSetRegExp VariableStatement_ ";" { $$ = $2; } - | LexSetRegExp LexicalDeclaration_ ";" { $$ = $2; } + : LexLet LexSetRegExp EmptyStatement { $$ = $3; } + | LexLet ExpressionStatement_ ";" { $$ = $2; } + | LexLet LexSetRegExp VariableStatement_ ";" { $$ = $3; } + | LexicalDeclaration_ ";" { $$ = $1; } ; ForInStatementInitializer - : LeftHandSideExpression { $$ = $1; } - | LexSetRegExp Var_ ForBinding { $$ = CYNew CYForVariable($3); } - | LexSetRegExp ForDeclaration { $$ = $2; } + : LexLet AccessExpression LexCrement { $$ = $2; } + | LexLet LexSetRegExp IndirectExpression { $$ = $3; } + | LexLet LexSetRegExp Var_ LexBind ForBinding { $$ = CYNew CYForVariable($5); } + | ForDeclaration { $$ = $1; } ; ForDeclaration @@ -1475,7 +1540,7 @@ BreakStatement /* }}} */ /* 13.10 The return Statement {{{ */ Return - : "!return" LexNewLine + : "return" { if (!driver.return_.top()) CYERR(@1, "invalid return"); } LexNewLine ; ReturnStatement @@ -1519,7 +1584,7 @@ LabelledStatement LabelledItem : Statement { $$ = $1; } - | LexSetStatement LexSetRegExp FunctionDeclaration { $$ = $3; } + | LexSetStatement LexLet LexSetRegExp FunctionDeclaration { $$ = $4; } ; /* }}} */ /* 13.14 The throw Statement {{{ */ @@ -1540,7 +1605,7 @@ TryStatement ; Catch - : "catch" "(" CatchParameter ")" Block { $$ = CYNew cy::Syntax::Catch($3, $5); } + : "catch" "(" LexBind CatchParameter ")" Block { $$ = CYNew cy::Syntax::Catch($4, $6); } ; Finally @@ -1572,7 +1637,7 @@ StrictFormalParameters ; FormalParameters - : { $$ = NULL; } + : LexBind { $$ = NULL; } | FormalParameterList ; @@ -1582,7 +1647,7 @@ FormalParameterList_ ; FormalParameterList - : FunctionRestParameter { CYNOT(@$); } + : LexBind FunctionRestParameter { CYNOT(@$); } | FormalParameter FormalParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); } ; @@ -1603,8 +1668,12 @@ FunctionStatementList ; /* }}} */ /* 14.2 Arrow Function Definitions {{{ */ +LexEqualRight + : { CYLIN(EqualRight); } + ; + ArrowFunction - : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); } + : LexSetRegExp ArrowParameters LexEqualRight "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $6); } ; ArrowParameters @@ -1670,7 +1739,7 @@ ClassTail ; ClassHeritage - : "extends" LeftHandSideExpression { $$ = CYNew CYClassTail($2); } + : "extends" AccessExpression { $$ = CYNew CYClassTail($2); } ; ClassHeritageOpt @@ -1714,7 +1783,7 @@ ScriptBody ScriptBodyOpt : ScriptBody { $$ = $1; } - | LexSetStatement LexSetRegExp { $$ = NULL; } + | LexSetStatement LexLet LexSetRegExp { $$ = NULL; } ; /* }}} */ /* 15.2 Modules {{{ */ @@ -1741,8 +1810,8 @@ ModuleItemListOpt ; ModuleItem - : LexSetStatement LexSetRegExp ImportDeclaration - | LexSetStatement LexSetRegExp ExportDeclaration + : LexSetStatement LexLet LexSetRegExp ImportDeclaration + | LexSetStatement LexLet LexSetRegExp ExportDeclaration | StatementListItem ; /* }}} */ @@ -1815,7 +1884,7 @@ ExportDeclaration_ ; ExportDeclaration - : "export" LexSetStatement LexSetRegExp ExportDeclaration_ + : "export" LexSetStatement LexLet LexSetRegExp ExportDeclaration_ | "export" Declaration ; @@ -1917,7 +1986,7 @@ ClassSuperOpt ; ImplementationFieldListOpt - : TypedIdentifier ";" ImplementationFieldListOpt { $$ = CYNew CYImplementationField($1, $3); } + : LexSetRegExp TypedIdentifier ";" ImplementationFieldListOpt { $$ = CYNew CYImplementationField($2, $4); } | LexSetRegExp { $$ = NULL; } ; @@ -2093,8 +2162,12 @@ PrimaryExpression @begin C /* Cycript (C): Pointer Indirection/Addressing {{{ */ -LeftHandSideExpression - : LexSetRegExp "*" UnaryExpression { $$ = CYNew CYIndirect($3); } +UnaryExpression_ + : IndirectExpression { $$ = $1; } + ; + +IndirectExpression + : "*" UnaryExpression { $$ = CYNew CYIndirect($2); } ; UnaryExpression_ @@ -2324,7 +2397,7 @@ Comprehension ; ComprehensionFor - : "for" "each" "(" LexPushInOn LexicalBinding "!in" LexPopIn Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); } + : "for" "each" "(" LexPushInOn LexBind ForBinding "!in" LexPopIn Expression ")" { $$ = CYNew CYForOfComprehension($6, $9); } ; /* }}} */ /* JavaScript FTL: for each {{{ */ @@ -2353,8 +2426,8 @@ ComprehensionTail ; ComprehensionFor - : "for" "(" LexPushInOn ForBinding "!in" LexPopIn Expression ")" { $$ = CYNew CYForInComprehension($4, $7); } - | "for" "(" LexPushInOn ForBinding "of" LexPopIn Expression ")" { $$ = CYNew CYForOfComprehension($4, $7); } + : "for" "(" LexPushInOn LexBind ForBinding "!in" LexPopIn Expression ")" { $$ = CYNew CYForInComprehension($5, $8); } + | "for" "(" LexPushInOn LexBind ForBinding "of" LexPopIn Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); } ; ComprehensionIf @@ -2389,7 +2462,11 @@ RubyProcParameters RubyProcParametersOpt : RubyProcParameters { $$ = $1; } - | { $$ = NULL; } + | LexSetRegExp { $$ = NULL; } + ; + +LexOpenBrace + : { CYLIN(OpenBrace); } ; RubyProcExpression @@ -2401,7 +2478,7 @@ PrimaryExpression ; PostfixExpression - : PostfixExpression RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } + : PostfixExpression LexOpenBrace RubyProcExpression { $$ = CYNew CYRubyBlock($1, $3); } ; /* }}} */