X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b3378a02d0a811be38e530933fb9a57a3012a823..341d1456832396678c21074a7ec2a07181e12f49:/Cycript.yy.in diff --git a/Cycript.yy.in b/Cycript.yy.in index 224d6bf..8b00100 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -1,35 +1,34 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2015 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU Affero General Public License, Version 3 {{{ */ /* - * 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. - * - * 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. - * - * You should have received a copy of the GNU Lesser General Public License - * along with Cycript. If not, see . + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + + * This program 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 Affero General Public License for more details. + + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . **/ /* }}} */ -@if Bison23 %{ - -@if Bison24 %code top { +%code top { #define cyscanner driver.scanner_ #define YYSTACKEXPANDABLE 1 -@if Bison23 #define yyerrok (yyerrstatus_ = 0) -@if Bison24 } +} -@if Bison24 %code requires { +%code requires { +#include "Driver.hpp" #include "Parser.hpp" -#define CYNew new($pool) +#include "Stack.hpp" +#define CYNew new(driver.pool_) @begin ObjectiveC #include "ObjectiveC/Syntax.hpp" @@ -39,8 +38,11 @@ #include "E4X/Syntax.hpp" @end +#include "Highlight.hpp" + typedef struct { bool newline_; + hi::Value highlight_; union { bool bool_; @@ -54,7 +56,6 @@ typedef struct { cy::Syntax::Catch *catch_; CYComment *comment_; CYComprehension *comprehension_; - CYCompound *compound_; CYDeclaration *declaration_; CYDeclarations *declarations_; CYElement *element_; @@ -68,8 +69,10 @@ typedef struct { CYInfix *infix_; CYLiteral *literal_; CYMember *member_; + CYModule *module_; CYNull *null_; CYNumber *number_; + CYParenthetical *parenthetical_; CYProgram *program_; CYProperty *property_; CYPropertyName *propertyName_; @@ -80,9 +83,16 @@ typedef struct { CYTrue *true_; CYWord *word_; +@begin C + CYTypeModifier *modifier_; + CYTypeSpecifier *specifier_; + CYTypedIdentifier *typedIdentifier_; + CYTypedParameter *typedParameter_; +@end + @begin ObjectiveC CYClassName *className_; - CYField *field_; + CYClassField *classField_; CYMessage *message_; CYMessageParameter *messageParameter_; CYProtocol *protocol_; @@ -98,18 +108,15 @@ typedef struct { } YYSTYPE; #define YYSTYPE YYSTYPE -@if Bison24 } +} -@if Bison24 %code provides { -int cylex(YYSTYPE *, cy::location *, void *); -@if Bison24 } +%code provides { +int cylex(YYSTYPE *, CYLocation *, void *); +} -@if Bison23 %} +%name-prefix "cy" -%name-prefix="cy" - -@if Bison23 %skeleton "lalr1.cc" -@if Bison24 %language "C++" +%language "C++" %initial-action { @$.begin.filename = @$.end.filename = &driver.filename_; @@ -118,6 +125,8 @@ int cylex(YYSTYPE *, cy::location *, void *); %locations %defines +%define api.location.type { CYLocation } + //%glr-parser //%expect 1 @@ -126,6 +135,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %parse-param { CYDriver &driver } %lex-param { void *cyscanner } +/* Token Declarations {{{ */ @begin E4X %token XMLCDATA %token XMLComment @@ -151,6 +161,7 @@ int cylex(YYSTYPE *, cy::location *, void *); @begin E4X ObjectiveC %token At "@" +%token Pound "#" @end %token Ampersand "&" @@ -161,6 +172,8 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Equal "=" %token EqualEqual "==" %token EqualEqualEqual "===" +%token EqualRight "=>" +%token EqualRight_ "\n=>" %token Exclamation "!" %token ExclamationEqual "!=" %token ExclamationEqualEqual "!==" @@ -176,6 +189,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Percent "%" %token PercentEqual "%=" %token Period "." +%token PeriodPeriodPeriod "..." %token Pipe "|" %token PipeEqual "|=" %token PipePipe "||" @@ -208,78 +222,86 @@ int cylex(YYSTYPE *, cy::location *, void *); %token OpenBrace "{" %token OpenBrace_ "\n{" +%token OpenBrace__ ";{" %token CloseBrace "}" %token OpenBracket "[" %token CloseBracket "]" +%token AtError "@error" + @begin Java %token AtClass "@class" @end +@begin C +%token Typedef "typedef" +%token Unsigned "unsigned" +%token Signed "signed" +%token Extern "extern" +@end + +@begin C +%token AtEncode "@encode" +@end + @begin ObjectiveC %token AtImplementation "@implementation" +%token AtImplementation_ ";@implementation" %token AtImport "@import" %token AtEnd "@end" %token AtSelector "@selector" +%token AtNull "@null" +%token AtYes "@YES" +%token AtNo "@NO" +%token AtTrue "@true" +%token AtFalse "@false" +%token Yes "YES" +%token No "NO" @end -%token False "false" -%token Null "null" -%token True "true" - -// ES3/ES5/WIE/JSC Reserved -%token Break "break" -%token Case "case" -%token Catch "catch" -%token Continue "continue" -%token Default "default" -%token Delete "delete" -%token Do "do" -%token Else "else" -%token Finally "finally" -%token For "for" -%token Function "function" -%token If "if" -%token In "in" -%token InstanceOf "instanceof" -%token New "new" -%token Return "return" -%token Switch "switch" -%token This "this" -%token Throw "throw" -%token Try "try" -%token TypeOf "typeof" -%token Var "var" -%token Void "void" -%token While "while" -%token With "with" - -// ES3/IE6 Future, ES5/JSC Reserved -%token Debugger "debugger" - -// ES3/ES5/IE6 Future, JSC Reserved -%token Const "const" - -// ES3/ES5/IE6/JSC Future -%token Class "class" -%token Enum "enum" -%token Export "export" -%token Extends "extends" -%token Import "import" -%token Super "super" - -// ES3 Future, ES5 Strict Future -%token Implements "implements" -%token Interface "interface" -%token Package "package" -%token Private "private" -%token Protected "protected" -%token Public "public" -%token Static "static" +%token False "false" +%token Null "null" +%token True "true" + +%token Break "break" +%token Case "case" +%token Catch "catch" +%token Class "class" +%token Const "const" +%token Continue "continue" +%token Debugger "debugger" +%token Default "default" +%token Delete "delete" +%token Do "do" +%token Else "else" +%token Enum "enum" +%token Export "export" +%token Extends "extends" +%token Finally "finally" +%token For "for" +%token Function "function" +%token Function_ ";function" +%token If "if" +%token Import "import" +%token In "in" +%token In_ "!in" +%token InstanceOf "instanceof" +%token New "new" +%token Return "return" +%token Super "super" +%token Switch "switch" +%token This "this" +%token Throw "throw" +%token Try "try" +%token TypeOf "typeof" +%token Var "var" +%token Void "void" +%token While "while" +%token With "with" -// ES3 Future %token Abstract "abstract" +%token Await "await" %token Boolean "boolean" %token Byte "byte" %token Char "char" @@ -287,24 +309,29 @@ int cylex(YYSTYPE *, cy::location *, void *); %token Final "final" %token Float "float" %token Goto "goto" +%token Implements "implements" %token Int "int" +%token Interface "interface" +%token Let "let" %token Long "long" %token Native "native" +%token Package "package" +%token Private "private" +%token Protected "protected" +%token Public "public" %token Short "short" +%token Static "static" %token Synchronized "synchronized" %token Throws "throws" %token Transient "transient" %token Volatile "volatile" - -// ES5 Strict -%token Let "let" %token Yield "yield" -// Woah?! +%token Auto "auto" %token Each "each" +%token Of "of" @begin E4X -// E4X Conditional %token Namespace "namespace" %token XML "xml" @end @@ -317,45 +344,45 @@ int cylex(YYSTYPE *, cy::location *, void *); %token RegularExpressionLiteral %type AdditiveExpression -%type AdditiveExpressionNoBF -%type ArgumentList %type ArgumentList_ +%type ArgumentList %type ArgumentListOpt %type Arguments +%type ArrayComprehension +%type ArrayInitialiser %type ArrayLiteral -%type AssigneeExpression -%type AssigneeExpressionNoBF +%type ArrowFunction +%type ArrowParameters %type AssignmentExpression -%type AssignmentExpression_ -%type AssignmentExpressionNoBF -%type AssignmentExpressionNoIn +%type Binding +%type BindingIdentifier %type BitwiseANDExpression -%type BitwiseANDExpressionNoBF -%type BitwiseANDExpressionNoIn -%type Block %type Block_ +%type Block %type BooleanLiteral +%type BindingElement %type BitwiseORExpression -%type BitwiseORExpressionNoBF -%type BitwiseORExpressionNoIn %type BitwiseXORExpression -%type BitwiseXORExpressionNoBF -%type BitwiseXORExpressionNoIn %type BreakStatement +%type BreakableStatement +%type CallExpression_ %type CallExpression -%type CallExpressionNoBF %type CaseBlock %type CaseClause %type CaseClausesOpt %type CatchOpt -%type ComprehensionList -%type ComprehensionListOpt +%type Comprehension +%type ComprehensionFor +%type ComprehensionIf +%type ComprehensionTail %type ConditionalExpression -%type ConditionalExpressionNoBF -%type ConditionalExpressionNoIn %type ContinueStatement +%type ConciseBody +%type DebuggerStatement +%type Declaration__ +%type Declaration_ +%type Declaration %type DefaultClause -%type DoWhileStatement %type Element %type ElementOpt %type ElementList @@ -363,125 +390,109 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ElseStatementOpt %type EmptyStatement %type EqualityExpression -%type EqualityExpressionNoBF -%type EqualityExpressionNoIn %type Expression %type ExpressionOpt -%type Expression_ -%type ExpressionNoBF -%type ExpressionNoIn -%type ExpressionNoIn_ -%type ExpressionNoInOpt %type ExpressionStatement %type FinallyOpt -%type ForComprehension -%type ForStatement %type ForStatementInitialiser -%type ForInStatement %type ForInStatementInitialiser -%type FormalParameterList +%type FormalParameter %type FormalParameterList_ +%type FormalParameterList +%type FormalParameterListOpt %type FunctionBody %type FunctionDeclaration %type FunctionExpression %type Identifier %type IdentifierOpt -%type IfComprehension +%type IdentifierType +%type IdentifierName %type IfStatement %type Initialiser %type InitialiserOpt -%type InitialiserNoIn -%type InitialiserNoInOpt %type IterationStatement %type LabelledStatement %type LeftHandSideExpression -%type LeftHandSideExpressionNoBF -//%type LetStatement +%type LetStatement +%type LexicalDeclaration %type Literal -%type LiteralNoRE -%type LiteralRE +%type ValueLiteral %type LogicalANDExpression -%type LogicalANDExpressionNoBF -%type LogicalANDExpressionNoIn %type LogicalORExpression -%type LogicalORExpressionNoBF -%type LogicalORExpressionNoIn %type MemberAccess -%type MemberExpression %type MemberExpression_ -%type MemberExpressionNoBF +%type MemberExpression +%type Module %type MultiplicativeExpression -%type MultiplicativeExpressionNoBF %type NewExpression -%type NewExpression_ -%type NewExpressionNoBF %type NullLiteral %type ObjectLiteral +%type Parenthetical %type PostfixExpression -%type PostfixExpressionNoBF %type PrimaryExpression -%type PrimaryExpressionNo -%type PrimaryExpressionNoBF -%type PrimaryExpressionNoRE -%type PrimaryExpressionBF %type Program -%type PropertyName +%type ProgramBody +%type ProgramBodyOpt %type PropertyName_ -%type PropertyNameAndValueList -%type PropertyNameAndValueList_ -%type PropertyNameAndValueListOpt +%type PropertyName +%type PropertyDefinition +%type PropertyDefinitionList_ +%type PropertyDefinitionList +%type PropertyDefinitionListOpt %type RelationalExpression -%type RelationalExpression_ -%type RelationalExpressionNoBF -%type RelationalExpressionNoIn -%type RelationalExpressionNoIn_ %type ReturnStatement %type RubyProcExpression -%type RubyProcParameterList %type RubyProcParameterList_ +%type RubyProcParameterList +%type RubyProcParameters %type RubyProcParametersOpt %type ShiftExpression -%type ShiftExpressionNoBF -%type SourceElement -%type SourceElement_ -%type SourceElements -%type Statement +%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 UnaryExpressionNoBF +%type UnaryExpression %type VariableDeclaration -%type VariableDeclarationNoIn -%type VariableDeclarationList %type VariableDeclarationList_ -%type VariableDeclarationListNoIn -%type VariableDeclarationListNoIn_ +%type VariableDeclarationList %type VariableStatement -%type WhileStatement %type WithStatement +%type Word +@begin ObjectiveC +%type WordOpt +@end +%type Variable @begin C -%type AssigneeExpressionNoRE -%type CallExpressionNoRE -%type LeftHandSideExpressionNoRE -%type MemberExpressionNoRE -%type NewExpressionNoRE -%type PostfixExpressionNoRE -%type UnaryAssigneeExpression -%type UnaryExpressionNoRE +%type IntegerType +%type IntegerTypeOpt +%type PrefixedType +%type PrimitiveType +%type SuffixedType +%type TypeSignifier +%type TypeQualifierLeft +%type TypeQualifierRight +%type TypedIdentifier +%type TypedParameterList_ +%type TypedParameterList +%type TypedParameterListOpt @end @begin ObjectiveC +%type BoxableExpression %type CategoryStatement %type ClassExpression +%type ClassFieldListOpt +%type ClassFields %type ClassStatement %type ClassSuperOpt -%type ClassFieldList %type ClassMessageDeclaration %type ClassMessageDeclarationListOpt %type ClassName @@ -495,25 +506,23 @@ 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 -%type TypeOpt +%type TypeOpt %type VariadicCall -%type Word -%type WordOpt @end @begin E4X %type PropertyIdentifier_ -%type PropertySelector %type PropertySelector_ -%type QualifiedIdentifier +%type PropertySelector %type QualifiedIdentifier_ +%type QualifiedIdentifier %type WildcardIdentifier %type XMLComment %type XMLCDATA @@ -528,214 +537,255 @@ int cylex(YYSTYPE *, cy::location *, void *); %type XMLListInitialiser %type XMLInitialiser @end - -%nonassoc Identifier_ "abstract" "boolean" "break" "byte" "case" "catch" "char" "class" "const" "continue" "debugger" "default" "delete" "do" "double" "each" "enum" "export" "extends" "false" "final" "finally" "float" /*"for"*/ "function" "goto" "implements" "import" /*"in"*/ /*"instanceof"*/ "int" "interface" "let" "long" "namespace" "native" "new" "null" "package" "private" "protected" "public" "return" "short" "super" "static" "switch" "synchronized" "this" "throw" "throws" "transient" "true" "try" "typeof" "var" "void" "volatile" "while" "with" "xml" "yield" +/* }}} */ +/* Token Priorities {{{ */ +%nonassoc "" +%left "++" "--" %nonassoc "if" %nonassoc "else" - -%nonassoc "++" "--" -%nonassoc "(" "[" - -%left "*" "/" "%" -%left "+" "-" -%left "<<" ">>" ">>>" -%left "<" ">" "<=" ">=" "instanceof" "in" -%left "==" "!=" "===" "!==" -%left "&" -%left "^" -%left "|" -%left "&&" -%left "||" - -%right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|=" +/* }}} */ %start Program %% /* Lexer State {{{ */ +LexPushInOn + : { driver.in_.push(true); } + ; + +LexPushInOff + : { driver.in_.push(false); } + ; + +LexPopIn + : { driver.in_.pop(); } + ; + LexSetRegExp : { driver.SetCondition(CYDriver::RegExpCondition); } ; -/* }}} */ -Brace - : "{" - | "\n{" +LexNoBrace + : { if (yyla.empty()) driver.no_.OpenBrace = true; else if (yyla.type == yytranslate_(token::OpenBrace) || yyla.type == yytranslate_(token::OpenBrace_)) yyla.type = yytranslate_(token::OpenBrace__); } ; -StrictSemi - : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); } +LexNoFunction + : { if (yyla.empty()) driver.no_.Function = true; else if (yyla.type == yytranslate_(token::Function)) yyla.type = yytranslate_(token::Function_); } ; -Terminator_ - : ";" - | "\n" StrictSemi +LexNoAtImplementation : +@begin ObjectiveC + { if (yyla.empty()) driver.no_.AtImplementation = true; else if (yyla.type == yytranslate_(token::AtImplementation)) yyla.type = yytranslate_(token::AtImplementation_); } +@end ; -TerminatorOpt - : Terminator_ - | error { yyerrok; driver.errors_.pop_back(); } StrictSemi +LexSetStatement + : LexNoBrace LexNoFunction LexNoAtImplementation + ; +/* }}} */ +/* Virtual Tokens {{{ */ +BRACE + : "{" + | "\n{" ; -Terminator - : Terminator_ - | error { if (yychar != 0 && yychar != cy::parser::token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi +Var_ + : "var" ; +/* }}} */ -/*CommaOpt - : "," - | - ;*/ +/* 7.6 Identifier Names and Identifiers {{{ */ +IdentifierName + : Word { $$ = $1; } + ; -@begin ObjectiveC NewLineOpt : "\n" | ; +Word + : Identifier { $$ = $1; } + + | "auto" { $$ = CYNew CYWord("auto"); } + | "break" NewLineOpt { $$ = CYNew CYWord("break"); } + | "case" { $$ = CYNew CYWord("case"); } + | "catch" { $$ = CYNew CYWord("catch"); } + | "class" { $$ = CYNew CYWord("class"); } + | "const" { $$ = CYNew CYWord("const"); } + | "continue" NewLineOpt { $$ = CYNew CYWord("continue"); } + | "debugger" { $$ = CYNew CYWord("debugger"); } + | "default" { $$ = CYNew CYWord("default"); } + | "delete" LexSetRegExp { $$ = CYNew CYWord("delete"); } + | "do" { $$ = CYNew CYWord("do"); } + | "else" { $$ = CYNew CYWord("else"); } + | "enum" { $$ = CYNew CYWord("enum"); } + | "export" { $$ = CYNew CYWord("export"); } + | "extends" { $$ = CYNew CYWord("extends"); } + | "false" { $$ = CYNew CYWord("false"); } + | "finally" { $$ = CYNew CYWord("finally"); } + /* XXX: | "for" { $$ = CYNew CYWord("for"); } */ + | "function" { $$ = CYNew CYWord("function"); } + | "if" { $$ = CYNew CYWord("if"); } + | "import" { $$ = CYNew CYWord("import"); } + /* XXX: | "in" { $$ = CYNew CYWord("in"); } */ + | "!in" { $$ = CYNew CYWord("in"); } + /* XXX: | "instanceof" { $$ = CYNew CYWord("instanceof"); } */ + + // XXX: as it currently is not an Identifier + | "let" { $$ = $1; } + + | "new" LexSetRegExp { $$ = CYNew CYWord("new"); } + | "null" { $$ = CYNew CYWord("null"); } + | "return" NewLineOpt { $$ = CYNew CYWord("return"); } + | "super" { $$ = CYNew CYWord("super"); } + | "switch" { $$ = CYNew CYWord("switch"); } + | "this" { $$ = CYNew CYWord("this"); } + | "throw" NewLineOpt { $$ = CYNew CYWord("throw"); } + | "true" { $$ = CYNew CYWord("true"); } + | "try" { $$ = CYNew CYWord("try"); } + | "typeof" LexSetRegExp { $$ = CYNew CYWord("typeof"); } + | "var" { $$ = CYNew CYWord("var"); } + | "void" LexSetRegExp { $$ = CYNew CYWord("void"); } + | "while" { $$ = CYNew CYWord("while"); } + | "with" { $$ = CYNew CYWord("with"); } + ; + +@begin ObjectiveC WordOpt : Word { $$ = $1; } | { $$ = NULL; } ; - -Word - : Identifier { $$ = $1; } - | "break" NewLineOpt { $$ = $1; } - | "case" { $$ = $1; } - | "catch" { $$ = $1; } - | "class" { $$ = $1; } - | "const" { $$ = $1; } - | "continue" NewLineOpt { $$ = $1; } - | "debugger" { $$ = $1; } - | "default" { $$ = $1; } - | "delete" { $$ = $1; } - | "do" { $$ = $1; } - | "else" { $$ = $1; } - | "enum" { $$ = $1; } - | "export" { $$ = $1; } - | "extends" { $$ = $1; } - | "false" { $$ = $1; } - | "finally" { $$ = $1; } - /* XXX: | "for" { $$ = $1; } */ - | "function" { $$ = $1; } - | "if" { $$ = $1; } - | "import" { $$ = $1; } - /* XXX: | "in" { $$ = $1; } */ - /* XXX: | "instanceof" { $$ = $1; } */ - | "new" { $$ = $1; } - | "null" { $$ = $1; } - | "return" NewLineOpt { $$ = $1; } - | "super" { $$ = $1; } - | "switch" { $$ = $1; } - | "this" { $$ = $1; } - | "throw" NewLineOpt { $$ = $1; } - | "true" { $$ = $1; } - | "try" { $$ = $1; } - | "typeof" { $$ = $1; } - | "var" { $$ = $1; } - | "void" { $$ = $1; } - | "while" { $$ = $1; } - | "with" { $$ = $1; } - ; @end -Identifier +IdentifierType : Identifier_ { $$ = $1; } - | "implements" { $$ = $1; } - | "interface" { $$ = $1; } - | "package" { $$ = $1; } - | "private" { $$ = $1; } - | "protected" { $$ = $1; } - | "public" { $$ = $1; } - | "static" { $$ = $1; } - | "abstract" { $$ = $1; } + | "await" { $$ = $1; } | "boolean" { $$ = $1; } | "byte" { $$ = $1; } - | "char" { $$ = $1; } | "double" { $$ = $1; } | "final" { $$ = $1; } | "float" { $$ = $1; } | "goto" { $$ = $1; } - | "int" { $$ = $1; } - | "long" { $$ = $1; } + | "implements" { $$ = $1; } + | "interface" { $$ = $1; } | "native" { $$ = $1; } - | "short" { $$ = $1; } + | "package" { $$ = $1; } + | "private" { $$ = $1; } + | "protected" { $$ = $1; } + | "public" { $$ = $1; } + | "static" { $$ = $1; } | "synchronized" { $$ = $1; } | "throws" { $$ = $1; } | "transient" { $$ = $1; } - | "volatile" { $$ = $1; } - | "let" { $$ = $1; } - | "yield" { $$ = $1; } + // XXX: currently I only have this as Word + // | "let" { $$ = $1; } + + | "yield" NewLineOpt { $$ = $1; } | "each" { $$ = $1; } + | "of" { $$ = $1; } + ; + +Identifier + : IdentifierType + | "char" { $$ = $1; } + | "int" { $$ = $1; } + | "long" { $$ = $1; } + | "short" { $$ = $1; } + | "volatile" { $$ = $1; } +@begin C + | "extern" { $$ = $1; } + | "signed" { $$ = $1; } + | "typedef" { $$ = $1; } + | "unsigned" { $$ = $1; } +@end +@begin ObjectiveC + | "NO" { $$ = $1; } + | "YES" { $$ = $1; } +@end ; IdentifierOpt : Identifier { $$ = $1; } | { $$ = NULL; } ; +/* }}} */ -LiteralNoRE +/* 7.8 Literals {{{ */ +Literal : NullLiteral { $$ = $1; } - | BooleanLiteral { $$ = $1; } + | ValueLiteral { $$ = $1; } + ; + +ValueLiteral + : BooleanLiteral { $$ = $1; } | NumericLiteral { $$ = $1; } | StringLiteral { $$ = $1; } - | "@" StringLiteral { $$ = $2; } + | RegularExpressionLiteral { $$ = $1; } ; - -LiteralRE - : RegularExpressionLiteral { $$ = $1; } +/* }}} */ +/* 7.8.1 Null Literals {{{ */ +NullLiteral + : "null" { $$ = CYNew CYNull(); } ; - -Literal - : LiteralNoRE { $$ = $1; } - | LiteralRE { $$ = $1; } +/* }}} */ +/* 7.8.2 Boolean Literals {{{ */ +BooleanLiteral + : "true" { $$ = CYNew CYTrue(); } + | "false" { $$ = CYNew CYFalse(); } ; +/* }}} */ -NullLiteral - : "null" { $$ = $1; } +/* 7.9 Automatic Semicolon Insertion {{{ */ +StrictSemi + : { driver.Warning(@$, "warning, automatic semi-colon insertion required"); } ; -BooleanLiteral - : "true" { $$ = $1; } - | "false" { $$ = $1; } +Terminator + : ";" + | error { if (yyla.type_get() != yyeof_ && yyla.type != yytranslate_(token::CloseBrace) && !yyla.value.newline_) { error(@1, "required semi-colon"); } else { yyerrok; driver.errors_.pop_back(); } } StrictSemi ; -/* 11.1 Primary Expressions {{{ */ -PrimaryExpression - : LexSetRegExp PrimaryExpressionNoRE { $$ = $2; } +TerminatorOpt + : ";" + | error { yyerrok; driver.errors_.pop_back(); } StrictSemi ; +/* }}} */ -PrimaryExpressionNoBF - : PrimaryExpressionNo { $$ = $1; } +/* 11.1 Primary Expressions {{{ */ +Parenthetical + : "(" LexPushInOff Expression ")" LexPopIn { $$ = CYNew CYParenthetical($3); } ; -PrimaryExpressionNoRE - : PrimaryExpressionBF { $$ = $1; } - | PrimaryExpressionNo { $$ = $1; } +Variable + : Identifier { $$ = CYNew CYVariable($1); } ; -PrimaryExpressionNo - : "this" { $$ = $1; } - | Identifier { $$ = CYNew CYVariable($1); } - | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; } +PrimaryExpression + : "this" { $$ = CYNew CYThis(); } + | Variable { $$ = $1; } | Literal { $$ = $1; } - | ArrayLiteral { $$ = $1; } - | "(" Expression ")" { $$ = $2; } + | ArrayInitialiser { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | Parenthetical { $$ = $1; } + | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; } ; - -PrimaryExpressionBF - : ObjectLiteral { $$ = $1; } +/* }}} */ +/* 11.1.4 Array Initializer {{{ */ +ArrayInitialiser + : ArrayLiteral { $$ = $1; } + | ArrayComprehension { $$ = $1; } ; /* }}} */ -/* 11.1.4 Array Initialiser {{{ */ +/* 11.1.4.1 Array Literal {{{ */ ArrayLiteral - : "[" ElementListOpt "]" { $$ = CYNew CYArray($2); } + : "[" LexPushInOff ElementListOpt "]" LexPopIn { $$ = CYNew CYArray($3); } ; Element @@ -747,37 +797,68 @@ ElementOpt | LexSetRegExp { $$ = NULL; } ; +ElementList + : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); } + | Element { $$ = CYNew CYElement($1, NULL); } + ; + ElementListOpt : ElementList { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; +/* }}} */ +/* 11.1.4.2 Array Comprehension {{{ */ +ArrayComprehension + : "[" LexPushInOff Comprehension "]" LexPopIn { $$ = $3; } + ; -ElementList - : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); } - | Element { $$ = CYNew CYElement($1, NULL); } +Comprehension + : LexSetRegExp ComprehensionFor ComprehensionTail AssignmentExpression { $$ = CYNew CYArrayComprehension($4, $2->Modify($3)); } + ; + +ComprehensionTail + : { $$ = NULL; } + | ComprehensionFor ComprehensionTail { $$ = $1->Modify($2); } + | ComprehensionIf ComprehensionTail { $$ = $1->Modify($2); } + ; + +ComprehensionFor + : "for" "(" Binding "of" Expression ")" { $$ = CYNew CYForOfComprehension($3, $5); } + ; + +ComprehensionIf + : "if" "(" AssignmentExpression ")" { $$ = CYNew CYIfComprehension($3); } ; /* }}} */ /* 11.1.5 Object Initialiser {{{ */ ObjectLiteral - : OpenBrace PropertyNameAndValueListOpt "}" { $$ = CYNew CYObject($2); } + : BRACE LexPushInOff PropertyDefinitionListOpt "}" LexPopIn { $$ = CYNew CYObject($3); } ; -PropertyNameAndValueList_ - : "," PropertyNameAndValueList { $$ = $2; } +PropertyDefinitionList_ + : "," PropertyDefinitionList { $$ = $2; } + | "," LexSetRegExp { $$ = NULL; } | { $$ = NULL; } ; -PropertyNameAndValueListOpt - : PropertyNameAndValueList { $$ = $1; } - | { $$ = NULL; } +PropertyDefinitionList + : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; } + ; + +PropertyDefinitionListOpt + : PropertyDefinitionList { $$ = $1; } + | LexSetRegExp { $$ = NULL; } ; -PropertyNameAndValueList - : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); } +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; } ; @@ -788,134 +869,69 @@ 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)); } + : "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYDirectMember(NULL, $3); } + | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); } | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; } ; -MemberExpression - : PrimaryExpression { $$ = $1; } - | LexSetRegExp FunctionExpression { $$ = $2; } - | MemberExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - | LexSetRegExp MemberExpression_ { $$ = $2; } - ; - -MemberExpressionNoBF - : PrimaryExpressionNoBF { $$ = $1; } - | MemberExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - | MemberExpression_ { $$ = $1; } - ; - -@begin C -MemberExpressionNoRE - : PrimaryExpressionNoRE { $$ = $1; } - | FunctionExpression { $$ = $1; } - | MemberExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } - | MemberExpression_ { $$ = $1; } +MemberExpression_ + : MemberExpression { $$ = $1; } + //| "super" { $$ = $1; } ; -@end -NewExpression_ - : "new" NewExpression { $$ = CYNew cy::Syntax::New($2, NULL); } +MemberExpression + : LexSetRegExp PrimaryExpression { $$ = $2; } + | LexSetRegExp FunctionExpression { $$ = $2; } + | MemberExpression_ { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } + | LexSetRegExp "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($3, $4); } ; NewExpression : MemberExpression { $$ = $1; } - | LexSetRegExp NewExpression_ { $$ = $2; } + | LexSetRegExp "new" NewExpression { $$ = CYNew cy::Syntax::New($3, NULL); } ; -NewExpressionNoBF - : MemberExpressionNoBF { $$ = $1; } - | NewExpression_ { $$ = $1; } +CallExpression_ + : MemberExpression_ + | CallExpression ; -@begin C -NewExpressionNoRE - : MemberExpressionNoRE { $$ = $1; } - | NewExpression_ { $$ = $1; } - ; -@end - CallExpression - : MemberExpression Arguments { $$ = CYNew CYCall($1, $2); } - | CallExpression Arguments { $$ = CYNew CYCall($1, $2); } + : CallExpression_ Arguments { $$ = CYNew CYCall($1, $2); } | CallExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } ; -CallExpressionNoBF - : 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 { $$ = CYNew CYCall($1, $2); } - | CallExpressionNoRE Arguments { $$ = CYNew CYCall($1, $2); } - | CallExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; } +Arguments + : "(" LexPushInOff ArgumentListOpt ")" LexPopIn { $$ = $3; } ; -@end ArgumentList_ : "," ArgumentList { $$ = $2; } | { $$ = NULL; } ; -ArgumentListOpt - : ArgumentList { $$ = $1; } - | LexSetRegExp { $$ = NULL; } - ; - ArgumentList : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); } + | LexSetRegExp Word ":" AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument($2, $4, $5); } ; -Arguments - : "(" ArgumentListOpt ")" { $$ = $2; } +ArgumentListOpt + : ArgumentList { $$ = $1; } + | LexSetRegExp { $$ = NULL; } ; LeftHandSideExpression : NewExpression { $$ = $1; } | CallExpression { $$ = $1; } ; - -LeftHandSideExpressionNoBF - : NewExpressionNoBF { $$ = $1; } - | CallExpressionNoBF { $$ = $1; } - ; - -@begin C -LeftHandSideExpressionNoRE - : NewExpressionNoRE { $$ = $1; } - | CallExpressionNoRE { $$ = $1; } - ; -@end /* }}} */ /* 11.3 Postfix Expressions {{{ */ PostfixExpression - : AssigneeExpression { $$ = $1; } + : %prec "" LeftHandSideExpression { $$ = $1; } | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); } | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); } ; - -PostfixExpressionNoBF - : AssigneeExpressionNoBF { $$ = $1; } - | LeftHandSideExpressionNoBF "++" { $$ = CYNew CYPostIncrement($1); } - | LeftHandSideExpressionNoBF "--" { $$ = CYNew CYPostDecrement($1); } - ; - -@begin C -PostfixExpressionNoRE - : AssigneeExpressionNoRE { $$ = $1; } - | LeftHandSideExpressionNoRE "++" { $$ = CYNew CYPostIncrement($1); } - | LeftHandSideExpressionNoRE "--" { $$ = CYNew CYPostDecrement($1); } - ; -@end /* }}} */ /* 11.4 Unary Operators {{{ */ UnaryExpression_ @@ -936,18 +952,6 @@ UnaryExpression : PostfixExpression { $$ = $1; } | LexSetRegExp UnaryExpression_ { $$ = $2; } ; - -UnaryExpressionNoBF - : PostfixExpressionNoBF { $$ = $1; } - | UnaryExpression_ { $$ = $1; } - ; - -@begin C -UnaryExpressionNoRE - : PostfixExpressionNoRE { $$ = $1; } - | UnaryExpression_ { $$ = $1; } - ; -@end /* }}} */ /* 11.5 Multiplicative Operators {{{ */ MultiplicativeExpression @@ -956,13 +960,6 @@ MultiplicativeExpression | MultiplicativeExpression "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); } | MultiplicativeExpression "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); } ; - -MultiplicativeExpressionNoBF - : UnaryExpressionNoBF { $$ = $1; } - | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); } - | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); } - | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); } - ; /* }}} */ /* 11.6 Additive Operators {{{ */ AdditiveExpression @@ -970,12 +967,6 @@ AdditiveExpression | AdditiveExpression "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); } | AdditiveExpression "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); } ; - -AdditiveExpressionNoBF - : MultiplicativeExpressionNoBF { $$ = $1; } - | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); } - | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); } - ; /* }}} */ /* 11.7 Bitwise Shift Operators {{{ */ ShiftExpression @@ -984,41 +975,16 @@ ShiftExpression | ShiftExpression ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); } | ShiftExpression ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); } ; - -ShiftExpressionNoBF - : AdditiveExpressionNoBF { $$ = $1; } - | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); } - | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); } - | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); } - ; /* }}} */ /* 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); } - ; - RelationalExpression : ShiftExpression { $$ = $1; } - | RelationalExpression RelationalExpression_ { $2->SetLeft($1); $$ = $2; } - ; - -RelationalExpressionNoIn - : ShiftExpression { $$ = $1; } - | RelationalExpressionNoIn RelationalExpressionNoIn_ { $2->SetLeft($1); $$ = $2; } - ; - -RelationalExpressionNoBF - : ShiftExpressionNoBF { $$ = $1; } - | RelationalExpressionNoBF RelationalExpression_ { $2->SetLeft($1); $$ = $2; } + | RelationalExpression "<" ShiftExpression { $$ = CYNew CYLess($1, $3); } + | RelationalExpression ">" ShiftExpression { $$ = CYNew CYGreater($1, $3); } + | RelationalExpression "<=" ShiftExpression { $$ = CYNew CYLessOrEqual($1, $3); } + | RelationalExpression ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual($1, $3); } + | RelationalExpression "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf($1, $3); } + | RelationalExpression "in" ShiftExpression { $$ = CYNew CYIn($1, $3); } ; /* }}} */ /* 11.9 Equality Operators {{{ */ @@ -1029,22 +995,6 @@ EqualityExpression | EqualityExpression "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); } | EqualityExpression "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); } ; - -EqualityExpressionNoIn - : RelationalExpressionNoIn { $$ = $1; } - | 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 { $$ = 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 @@ -1052,44 +1002,14 @@ BitwiseANDExpression | BitwiseANDExpression "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); } ; -BitwiseANDExpressionNoIn - : EqualityExpressionNoIn { $$ = $1; } - | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = CYNew CYBitwiseAnd($1, $3); } - ; - -BitwiseANDExpressionNoBF - : EqualityExpressionNoBF { $$ = $1; } - | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); } - ; - BitwiseXORExpression : BitwiseANDExpression { $$ = $1; } | BitwiseXORExpression "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); } ; -BitwiseXORExpressionNoIn - : BitwiseANDExpressionNoIn { $$ = $1; } - | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = CYNew CYBitwiseXOr($1, $3); } - ; - -BitwiseXORExpressionNoBF - : BitwiseANDExpressionNoBF { $$ = $1; } - | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); } - ; - -BitwiseORExpression - : BitwiseXORExpression { $$ = $1; } - | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); } - ; - -BitwiseORExpressionNoIn - : BitwiseXORExpressionNoIn { $$ = $1; } - | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = CYNew CYBitwiseOr($1, $3); } - ; - -BitwiseORExpressionNoBF - : BitwiseXORExpressionNoBF { $$ = $1; } - | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); } +BitwiseORExpression + : BitwiseXORExpression { $$ = $1; } + | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); } ; /* }}} */ /* 11.11 Binary Logical Operators {{{ */ @@ -1098,187 +1018,140 @@ LogicalANDExpression | LogicalANDExpression "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); } ; -LogicalANDExpressionNoIn - : BitwiseORExpressionNoIn { $$ = $1; } - | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = CYNew CYLogicalAnd($1, $3); } - ; - -LogicalANDExpressionNoBF - : BitwiseORExpressionNoBF { $$ = $1; } - | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); } - ; - LogicalORExpression : LogicalANDExpression { $$ = $1; } | LogicalORExpression "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); } ; - -LogicalORExpressionNoIn - : LogicalANDExpressionNoIn { $$ = $1; } - | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = CYNew CYLogicalOr($1, $3); } - ; - -LogicalORExpressionNoBF - : LogicalANDExpressionNoBF { $$ = $1; } - | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); } - ; /* }}} */ /* 11.12 Conditional Operator ( ? : ) {{{ */ ConditionalExpression : LogicalORExpression { $$ = $1; } - | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); } - ; - -ConditionalExpressionNoIn - : LogicalORExpressionNoIn { $$ = $1; } - | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = CYNew CYCondition($1, $3, $5); } - ; - -ConditionalExpressionNoBF - : LogicalORExpressionNoBF { $$ = $1; } - | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); } + | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); } + | LogicalORExpression "?" LexPushInOff LexSetRegExp ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $1, $7); } ; /* }}} */ /* 11.13 Assignment Operators {{{ */ -AssignmentExpression_ - : "=" 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 - : LeftHandSideExpression { $$ = $1; } -@begin C - | LexSetRegExp UnaryAssigneeExpression { $$ = $2; } -@end - ; - -AssigneeExpressionNoBF - : LeftHandSideExpressionNoBF { $$ = $1; } -@begin C - | UnaryAssigneeExpression { $$ = $1; } -@end - ; - -@begin C -AssigneeExpressionNoRE - : LeftHandSideExpressionNoRE { $$ = $1; } - | UnaryAssigneeExpression { $$ = $1; } - ; -@end - AssignmentExpression : ConditionalExpression { $$ = $1; } - | AssigneeExpression AssignmentExpression_ { $2->SetLeft($1); $$ = $2; } - ; - -AssignmentExpressionNoIn - : ConditionalExpressionNoIn { $$ = $1; } - | 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 - : ConditionalExpressionNoBF { $$ = $1; } - | AssigneeExpressionNoBF AssignmentExpression_ { $2->SetLeft($1); $$ = $2; } + | ArrowFunction { $$ = $1; } + | LeftHandSideExpression "=" AssignmentExpression { $$ = CYNew CYAssign($1, $3); } + | LeftHandSideExpression "*=" AssignmentExpression { $$ = CYNew CYMultiplyAssign($1, $3); } + | LeftHandSideExpression "/=" AssignmentExpression { $$ = CYNew CYDivideAssign($1, $3); } + | LeftHandSideExpression "%=" AssignmentExpression { $$ = CYNew CYModulusAssign($1, $3); } + | LeftHandSideExpression "+=" AssignmentExpression { $$ = CYNew CYAddAssign($1, $3); } + | LeftHandSideExpression "-=" AssignmentExpression { $$ = CYNew CYSubtractAssign($1, $3); } + | LeftHandSideExpression "<<=" AssignmentExpression { $$ = CYNew CYShiftLeftAssign($1, $3); } + | LeftHandSideExpression ">>=" AssignmentExpression { $$ = CYNew CYShiftRightSignedAssign($1, $3); } + | LeftHandSideExpression ">>>=" AssignmentExpression { $$ = CYNew CYShiftRightUnsignedAssign($1, $3); } + | LeftHandSideExpression "&=" AssignmentExpression { $$ = CYNew CYBitwiseAndAssign($1, $3); } + | LeftHandSideExpression "^=" AssignmentExpression { $$ = CYNew CYBitwiseXOrAssign($1, $3); } + | LeftHandSideExpression "|=" AssignmentExpression { $$ = CYNew CYBitwiseOrAssign($1, $3); } ; /* }}} */ /* 11.14 Comma Operator {{{ */ -Expression_ - : "," Expression { $$ = CYNew CYCompound($2); } - | { $$ = NULL; } - ; - -ExpressionNoIn_ - : "," ExpressionNoIn { $$ = CYNew CYCompound($2); } - | { $$ = NULL; } +Expression + : AssignmentExpression { $$ = $1; } + | AssignmentExpression "," Expression { $$ = CYNew CYCompound($1, $3); } ; ExpressionOpt : Expression { $$ = $1; } | LexSetRegExp { $$ = NULL; } ; - -ExpressionNoInOpt - : ExpressionNoIn { $$ = $1; } - | LexSetRegExp { $$ = NULL; } - ; - -Expression - : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; } - ; - -ExpressionNoIn - : AssignmentExpressionNoIn ExpressionNoIn_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; } - ; - -ExpressionNoBF - : AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; } - ; /* }}} */ /* 12 Statements {{{ */ -Statement_ +Statement__ : Block { $$ = $1; } | VariableStatement { $$ = $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; } + | ExpressionStatement { $$ = $1; } ; Statement - : LexSetRegExp Statement_ { $$ = $2; } + : LexSetStatement Statement_ { $$ = $2; } + ; + +Declaration__ + : FunctionDeclaration { $$ = $1; } + | LexicalDeclaration { $$ = $1; } + ; + +Declaration_ + : LexSetRegExp Declaration__ { $$ = $2; } + ; + +Declaration + : LexSetStatement Declaration_ { $$ = $2; } + ; + +BreakableStatement + : IterationStatement { $$ = $1; } + | SwitchStatement { $$ = $1; } ; /* }}} */ /* 12.1 Block {{{ */ Block_ - : Brace StatementListOpt "}" { $$ = $2; } + : BRACE StatementListOpt "}" { $$ = $2; } ; Block - : Block_ { if ($1) $$ = CYNew CYBlock($1); else $$ = CYNew CYEmpty(); } + : ";{" StatementListOpt "}" { $$ = CYNew CYBlock($2); } ; StatementList - : Statement StatementListOpt { $1->SetNext($2); $$ = $1; } + : StatementListItem StatementListOpt { $1->SetNext($2); $$ = $1; } ; StatementListOpt : StatementList { $$ = $1; } - | LexSetRegExp { $$ = NULL; } + | LexSetStatement LexSetRegExp { $$ = NULL; } + ; + +StatementListItem + : Statement { $$ = $1; } + | Declaration { $$ = $1; } + ; +/* }}} */ + +/* 12.2 Declarations {{{ */ +BindingIdentifier + : Identifier { $$ = $1; } + ; + +Binding + : BindingIdentifier + ; + +// XXX: BindingPattern +/* }}} */ +/* 12.2.1 Let and Const Declarations {{{ */ +LexicalDeclaration + : LetOrConst VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } + ; + +LetOrConst + : "let" + | "const" ; /* }}} */ -/* 12.2 Variable Statement {{{ */ +/* 12.2.2 Variable Statement {{{ */ VariableStatement - : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } + : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } ; VariableDeclarationList_ @@ -1286,45 +1159,36 @@ VariableDeclarationList_ | { $$ = NULL; } ; -VariableDeclarationListNoIn_ - : "," VariableDeclarationListNoIn { $$ = $2; } - | { $$ = NULL; } - ; - VariableDeclarationList : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); } ; -VariableDeclarationListNoIn - : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = CYNew CYDeclarations($1, $2); } - ; - VariableDeclaration - : Identifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } + : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } + // XXX: | BindingPattern Initialiser { $$ = CYNew CYDeclaration($1, $2); } ; -VariableDeclarationNoIn - : Identifier InitialiserNoInOpt { $$ = CYNew CYDeclaration($1, $2); } +Initialiser + : "=" AssignmentExpression { $$ = $2; } ; InitialiserOpt : Initialiser { $$ = $1; } | { $$ = NULL; } ; +/* }}} */ +/* 12.2.4 Destructuring Binding Patterns {{{ */ +// XXX: * -InitialiserNoInOpt - : InitialiserNoIn { $$ = $1; } - | { $$ = NULL; } - ; - -Initialiser - : "=" AssignmentExpression { $$ = $2; } +BindingElement + : SingleNameBinding { $$ = $1; } ; -InitialiserNoIn - : "=" AssignmentExpressionNoIn { $$ = $2; } +SingleNameBinding + : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } ; /* }}} */ + /* 12.3 Empty Statement {{{ */ EmptyStatement : ";" { $$ = CYNew CYEmpty(); } @@ -1332,7 +1196,7 @@ EmptyStatement /* }}} */ /* 12.4 Expression Statement {{{ */ ExpressionStatement - : ExpressionNoBF Terminator { $$ = CYNew CYExpress($1); } + : Expression Terminator { $$ = CYNew CYExpress($1); } ; /* }}} */ /* 12.5 The if Statement {{{ */ @@ -1346,58 +1210,54 @@ IfStatement ; /* }}} */ -/* 12.6 Iteration Statements {{{ */ -IterationStatement - : DoWhileStatement { $$ = $1; } - | WhileStatement { $$ = $1; } - | ForStatement { $$ = $1; } - | ForInStatement { $$ = $1; } - ; -/* }}} */ /* 12.6.1 The do-while Statement {{{ */ -DoWhileStatement +IterationStatement : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); } ; /* }}} */ /* 12.6.2 The while Statement {{{ */ -WhileStatement +IterationStatement : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); } ; /* }}} */ /* 12.6.3 The for Statement {{{ */ -ForStatement - : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($3, $5, $7, $9); } +IterationStatement + : "for" "(" LexPushInOn ForStatementInitialiser ";" LexPopIn ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); } ; ForStatementInitialiser - : ExpressionNoInOpt { $$ = $1; } - | LexSetRegExp "var" VariableDeclarationListNoIn { $$ = $3; } + : ExpressionOpt { $$ = $1; } + | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); } ; /* }}} */ -/* 12.6.4 The for-in Statement {{{ */ -ForInStatement - : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForIn($3, $5, $7); } +/* 12.6.4 The for-in and for-of Statements {{{ */ +IterationStatement + : "for" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); } + | "for" "(" LexPushInOn ForInStatementInitialiser "of" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); } ; ForInStatementInitialiser : LeftHandSideExpression { $$ = $1; } - | LexSetRegExp "var" VariableDeclarationNoIn { $$ = $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 {{{ */ @@ -1412,7 +1272,11 @@ SwitchStatement ; CaseBlock - : Brace CaseClausesOpt "}" { $$ = $2; } + : BRACE CaseClausesOpt "}" { $$ = $2; } + ; + +CaseClause + : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } ; CaseClausesOpt @@ -1421,10 +1285,6 @@ CaseClausesOpt | { $$ = NULL; } ; -CaseClause - : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); } - ; - DefaultClause : "default" ":" StatementListOpt { $$ = CYNew CYClause(NULL, $3); } ; @@ -1436,7 +1296,8 @@ LabelledStatement /* }}} */ /* 12.13 The throw Statement {{{ */ ThrowStatement - : "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } + : "throw" LexSetRegExp "\n" StrictSemi { error(@1, "throw without exception"); } + | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } ; /* }}} */ /* 12.14 The try Statement {{{ */ @@ -1454,14 +1315,19 @@ FinallyOpt | { $$ = NULL; } ; /* }}} */ +/* 12.14 The debugger Statement {{{ */ +DebuggerStatement + : "debugger" Terminator { $$ = CYNew CYDebugger(); } + ; +/* }}} */ -/* 13 Function Definition {{{ */ +/* 13.1 Function Definitions {{{ */ FunctionDeclaration - : "function" Identifier "(" FormalParameterList ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); } + : ";function" Identifier "(" FormalParameterListOpt ")" BRACE FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); } ; FunctionExpression - : "function" IdentifierOpt "(" FormalParameterList ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionExpression($2, $4, $7); } + : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYFunctionExpression($2, $5, $10); } ; FormalParameterList_ @@ -1470,53 +1336,138 @@ FormalParameterList_ ; FormalParameterList - : Identifier FormalParameterList_ { $$ = CYNew 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; } + ; +/* }}} */ +/* 13.2 Arrow Function Definitions {{{ */ +ArrowFunction + : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); } + ; + +ArrowParameters + : BindingIdentifier { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1)); } + | "(" LexPushInOff LexSetRegExp ")" LexPopIn { $$ = NULL; } + | Parenthetical { $$ = $1->expression_->Parameter(); if ($$ == NULL) error(@1, "invalid parameter list"); } + ; + +ConciseBody + : AssignmentExpression { $$ = CYNew CYReturn($1); } + | LexSetRegExp ";{" LexPushInOff FunctionBody "}" LexPopIn { $$ = $4; } ; /* }}} */ /* 14 Program {{{ */ Program - : SourceElements { driver.program_ = CYNew CYProgram($1); } + : ProgramBodyOpt { driver.program_ = CYNew CYProgram($1); } ; -SourceElements - : SourceElement SourceElements { $1->SetNext($2); $$ = $1; } - | LexSetRegExp { $$ = NULL; } +ProgramBody + : StatementList { $$ = $1; } + ; + +ProgramBodyOpt + : ProgramBody { $$ = $1; } + | LexSetStatement LexSetRegExp { $$ = NULL; } + ; +/* }}} */ + +@begin C +/* Cycript (C): Type Encoding {{{ */ +TypeSignifier + : IdentifierType { $$ = CYNew CYTypedIdentifier(@1, $1); } + | "(" LexPushInOff "*" TypeQualifierRight ")" LexPopIn { $$ = $4; } + ; + +SuffixedType + : SuffixedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); } + | "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); } + | TypeSignifier "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $1; $$->modifier_ = CYNew CYTypeFunctionWith($4, $$->modifier_); } + | "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypedIdentifier(@1); $$->modifier_ = CYNew CYTypeFunctionWith($3, $$->modifier_); } + | TypeSignifier { $$ = $1; } + | { $$ = CYNew CYTypedIdentifier(@$); } + ; + +PrefixedType + : "*" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); } + ; + +TypeQualifierLeft + : { $$ = NULL; } + | "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); } + | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); } + ; + +TypeQualifierRight + : PrefixedType { $$ = $1; } + | SuffixedType { $$ = $1; } + | "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); } + | "volatile" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeVolatile($$->modifier_); } + ; + +IntegerType + : "int" { $$ = CYNew CYTypeVariable("int"); } + | "unsigned" IntegerTypeOpt { $$ = CYNew CYTypeUnsigned($2); } + | "signed" IntegerTypeOpt { $$ = CYNew CYTypeSigned($2); } + | "long" IntegerTypeOpt { $$ = CYNew CYTypeLong($2); } + | "short" IntegerTypeOpt { $$ = CYNew CYTypeShort($2); } + ; + +IntegerTypeOpt + : IntegerType { $$ = $1; } + | { $$ = CYNew CYTypeVariable("int"); } + ; + +PrimitiveType + : IdentifierType { $$ = CYNew CYTypeVariable($1); } + | IntegerType { $$ = $1; } + | "void" { $$ = CYNew CYTypeVoid(); } + | "char" { $$ = CYNew CYTypeVariable("char"); } + | "signed" "char" { $$ = CYNew CYTypeSigned(CYNew CYTypeVariable("char")); } + | "unsigned" "char" { $$ = CYNew CYTypeUnsigned(CYNew CYTypeVariable("char")); } ; -SourceElement_ - : Statement_ { $$ = $1; } - | FunctionDeclaration { $$ = $1; } +TypedIdentifier + : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->specifier_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; } ; -SourceElement - : LexSetRegExp SourceElement_ { $$ = $2; } +PrimaryExpression + : "@encode" "(" TypedIdentifier ")" { $$ = CYNew CYEncodedType($3); } ; /* }}} */ +@end @begin ObjectiveC /* Cycript (Objective-C): @class Declaration {{{ */ ClassSuperOpt - /* XXX: why the hell did I choose MemberExpressionNoBF? */ - : ":" LexSetRegExp MemberExpressionNoBF { $$ = $3; } + /* XXX: why the hell did I choose MemberExpression? */ + : ":" LexSetRegExp MemberExpression { $$ = $3; } | { $$ = NULL; } ; -ClassField - : Expression Identifier ";" - ; - ClassFieldListOpt - : ClassFieldListOpt ClassField - | + : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYClassField($1, $3); } + | LexSetRegExp { $$ = NULL; } ; -ClassFieldList - : Brace ClassFieldListOpt "}" { $$ = NULL; } +ClassFields + : BRACE ClassFieldListOpt "}" { $$ = $2; } ; MessageScope @@ -1525,13 +1476,16 @@ MessageScope ; TypeOpt - : "(" Expression ")" { $$ = $2; } - | "(" LexSetRegExp "void" ")" { $$ = NULL; } - | { $$ = NULL; } + : "(" LexSetRegExp TypedIdentifier ")" { if ($3->identifier_ != NULL) error($3->location_, "unexpected identifier"); $$ = $3; } + | { $$ = CYNew CYTypedIdentifier(CYNew CYTypeVariable("id")); } ; MessageParameter - : Word ":" TypeOpt Identifier { $$ = CYNew CYMessageParameter($1, $3, $4); } + : Word ":" TypeOpt Identifier { $3->identifier_ = $4; $$ = CYNew CYMessageParameter($1, $3); } + ; + +MessageParameterList + : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } ; MessageParameterListOpt @@ -1539,17 +1493,13 @@ MessageParameterListOpt | { $$ = NULL; } ; -MessageParameterList - : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; } - ; - MessageParameters : MessageParameterList { $$ = $1; } - | Word { $$ = CYNew CYMessageParameter($1, NULL, NULL); } + | Word { $$ = CYNew CYMessageParameter($1, NULL); } ; ClassMessageDeclaration - : MessageScope TypeOpt MessageParameters Brace FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); } + : MessageScope TypeOpt MessageParameters BRACE FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); } ; ClassMessageDeclarationListOpt @@ -1584,26 +1534,26 @@ ClassProtocolListOpt ; ClassExpression - : "@implementation" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassExpression($2, $3, $4, $5, $6); } + : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields ClassMessageDeclarationListOpt "@end" LexPopIn { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); } ; 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 - : "(" Word ")" + : "(" WordOpt ")" ; CategoryStatement - : "@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); } + : ";@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); } ; -PrimaryExpressionBF +PrimaryExpression : ClassExpression { $$ = $1; } ; -Statement_ +Statement__ : ClassStatement { $$ = $1; } | CategoryStatement { $$ = $1; } ; @@ -1614,18 +1564,18 @@ 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); } + : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYWord(""), $3, $4); } ; SelectorList @@ -1634,13 +1584,8 @@ SelectorList ; MessageExpression - : "[" AssignmentExpression { driver.contexts_.push_back($2); } SelectorList "]" { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($2, $4); } - | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = CYNew CYSendSuper($5); } - ; - -SelectorExpressionOpt - : SelectorExpression_ { $$ = $1; } - | { $$ = NULL; } + : "[" LexPushInOff AssignmentExpression { driver.contexts_.push_back($3); } SelectorList "]" LexPopIn { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($3, $5); } + | "[" LexPushInOff LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" LexPopIn { $$ = CYNew CYSendSuper($6); } ; SelectorExpression_ @@ -1652,34 +1597,68 @@ SelectorExpression | Word { $$ = CYNew CYSelectorPart($1, false, NULL); } ; -PrimaryExpressionNo +SelectorExpressionOpt + : SelectorExpression_ { $$ = $1; } + | { $$ = NULL; } + ; + +PrimaryExpression : MessageExpression { $$ = $1; } - | "@selector" "(" SelectorExpression ")" { $$ = CYNew CYSelector($3); } + | "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); } ; /* }}} */ -/* Cycript (Objective-C): @import Directive {{{ */ -PathName - : "/" PathName - | "." PathName - | Word PathName - | +@end + +/* Cycript: @import Directive {{{ */ +Module + : Module "." Word { $$ = CYNew CYModule($3, $1); } + | Word { $$ = CYNew CYModule($1); } ; -ImportPath - : "<" PathName ">" - | StringLiteral +Declaration__ + : "@import" Module { $$ = CYNew CYImport($2); } + ; +/* }}} */ + +@begin ObjectiveC +/* Cycript (Objective-C): Boxed Expressions {{{ */ +BoxableExpression + : NullLiteral { $$ = $1; } + | BooleanLiteral { $$ = $1; } + | NumericLiteral { $$ = $1; } + | StringLiteral { $$ = $1; } + | ArrayLiteral { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | Parenthetical { $$ = $1; } + | "YES" { $$ = CYNew CYTrue(); } + | "NO" { $$ = CYNew CYFalse(); } ; -SourceElement_ - : "@import" ImportPath { $$ = CYNew CYImport(); } +PrimaryExpression + : "@" BoxableExpression { $$ = CYNew CYBox($2); } + | "@YES" { $$ = CYNew CYBox(CYNew CYTrue()); } + | "@NO" { $$ = CYNew CYBox(CYNew CYFalse()); } + | "@true" { $$ = CYNew CYBox(CYNew CYTrue()); } + | "@false" { $$ = CYNew CYBox(CYNew CYFalse()); } + | "@null" { $$ = CYNew CYBox(CYNew CYNull()); } + ; +/* }}} */ +/* Cycript (Objective-C): Block Expressions {{{ */ +PrimaryExpression + : "^" TypedIdentifier { if ($2->identifier_ != NULL) error($2->location_, "unexpected identifier"); } BRACE LexPushInOff FunctionBody "}" LexPopIn { if (CYTypeFunctionWith *function = $2->Function()) $$ = CYNew CYObjCBlock($2, function->parameters_, $6); else error($2->location_, "expected parameters"); } + ; +/* }}} */ +/* Cycript (Objective-C): Instance Literals {{{ */ +PrimaryExpression + : "#" NumericLiteral { $$ = CYNew CYInstanceLiteral($2); } ; /* }}} */ @end @begin C /* Cycript (C): Pointer Indirection/Addressing {{{ */ -UnaryAssigneeExpression - : "*" UnaryExpressionNoRE { $$ = CYNew CYIndirect($2); } +LeftHandSideExpression + : LexSetRegExp "*" UnaryExpression { $$ = CYNew CYIndirect($3); } ; UnaryExpression_ @@ -1688,14 +1667,49 @@ UnaryExpression_ 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" + ; +/* }}} */ +/* Cycript (C): Lambda Expressions {{{ */ +TypedParameterList_ + : "," TypedParameterList { $$ = $2; } + | { $$ = NULL; } + ; + +TypedParameterList + : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); } + ; + +TypedParameterListOpt + : TypedParameterList { $$ = $1; } + | { $$ = NULL; } + ; + +PrimaryExpression + : "[" LexPushInOff LexSetRegExp "&" LexSetRegExp "]" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn "->" TypedIdentifier BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYLambda($14, $10, $17); } + ; +/* }}} */ +/* Cycript (C): Type Definitions {{{ */ +Statement__ + : "typedef" TypedIdentifier { if ($2->identifier_ == NULL) error($2->location_, "expected identifier"); } Terminator { $$ = CYNew CYTypeDefinition($2); } + ; +/* }}} */ +/* Cycript (C): extern "C" {{{ */ +Statement__ + : "extern" StringLiteral { if (strcmp($2->Value(), "C") != 0) error(@2, "unknown extern binding"); } TypedIdentifier { if ($4->identifier_ == NULL) error($4->location_, "expected identifier"); } Terminator { $$ = CYNew CYExternal($2, $4); } + ; +/* }}} */ + @end /* YUI: Documentation Comments {{{ */ -Statement_ +Statement__ : Comment { $$ = $1; } ; /* }}} */ @@ -1726,11 +1740,12 @@ LexSetXMLTag : { driver.SetCondition(CYDriver::XMLTagCondition); } ; /* }}} */ - +/* Virtual Tokens {{{ */ XMLWhitespaceOpt : XMLWhitespace | ; +/* }}} */ /* 8.1 Context Keywords {{{ */ Identifier @@ -1745,8 +1760,9 @@ XMLMarkup | XMLPI { $$ = $1; } ; /* }}} */ + /* 11.1 Primary Expressions {{{ */ -PrimaryExpressionNo +PrimaryExpression : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); } | XMLInitialiser { $$ = $1; } | XMLListInitialiser { $$ = $1; } @@ -1765,7 +1781,7 @@ AttributeIdentifier PropertySelector_ : PropertySelector { $$ = $1; } - | "[" Expression "]" { $$ = CYNew CYSelector($2); } + | "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYSelector($3); } ; PropertySelector @@ -1795,8 +1811,8 @@ XMLInitialiser ; XMLElement - : "<" XMLTagContent "/>" LexPop - | "<" XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" LexPop + : "<" LexPushInOff XMLTagContent LexPop "/>" LexPopIn + | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" LexPopIn ; XMLTagContent @@ -1804,7 +1820,7 @@ XMLTagContent ; XMLExpression - : Brace LexPushRegExp Expression "}" LexPop + : BRACE LexPushRegExp Expression LexPop "}" ; XMLTagName @@ -1845,9 +1861,10 @@ XMLElementContentOpt /* }}} */ /* 11.1.5 XMLList Initialiser {{{ */ XMLListInitialiser - : "<>" LexPushXMLContent XMLElementContent "" LexPop { $$ = CYNew CYXMLList($3); } + : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop "" LexPopIn { $$ = CYNew CYXMLList($4); } ; /* }}} */ + /* 11.2 Left-Hand-Side Expressions {{{ */ PropertyIdentifier_ : Identifier { $$ = $1; } @@ -1865,67 +1882,37 @@ MemberAccess : "default" "xml" "namespace" "=" Expression Terminator { $$ = CYNew CYDefaultXMLNamespace($5); } ; -Statement_ +Statement__ : DefaultXMLNamespaceStatement { $$ = $1; } ; */ /* }}} */ @end -/* ECMAScript5: Object Literal Trailing Comma {{{ */ -PropertyNameAndValueList_ - : "," { $$ = NULL; } - ; -/* }}} */ - /* JavaScript 1.7: Array Comprehensions {{{ */ -IfComprehension - : "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); } - ; - -ForComprehension - : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); } - | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForEachInComprehension($4, $6); } - ; - -ComprehensionListOpt - : ComprehensionList { $$ = $1; } - | IfComprehension { $$ = $1; } - | { $$ = NULL; } - ; - -ComprehensionList - : ForComprehension ComprehensionListOpt { $1->SetNext($2); $$ = $1; } +Comprehension + : AssignmentExpression ComprehensionFor ComprehensionTail { $$ = CYNew CYArrayComprehension($1, $2->Modify($3)); } ; -PrimaryExpressionNo - : "[" AssignmentExpression ComprehensionList "]" { $$ = CYNew CYArrayComprehension($2, $3); } +ComprehensionFor + : "for" "(" Binding "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); } + | "for" "each" "(" Binding "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); } ; /* }}} */ /* JavaScript 1.7: for each {{{ */ -ForInStatement - : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForEachIn($4, $6, $8); } +IterationStatement + : "for" "each" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); } ; /* }}} */ -/* JavaScript 1.7: let Statements {{{ *//* +/* JavaScript 1.7: let Statements {{{ */ LetStatement - : "let" "(" VariableDeclarationList ")" Block_ { $$ = CYNew CYLet($3, $5); } + : "let" "(" VariableDeclarationList ")" Statement { $$ = CYNew CYLetStatement($3, $5); } ; -Statement_ +Statement__ : LetStatement ; -*//* }}} */ - -/* JavaScript FTW: Function Statements {{{ */ -Statement - : LexSetRegExp FunctionDeclaration { driver.Warning(yylloc, "warning, FunctionDeclaration is a SourceElement, not a Statement"); } { $$ = $2; } - ; -/* }}} */ -/* JavaScript FTW: Optional Arguments {{{ */ -FormalParameterList - : Identifier "=" AssignmentExpression FormalParameterList_ { $$ = CYNew CYOptionalFunctionParameter($1, $3, $4); } - ; /* }}} */ + /* JavaScript FTW: Ruby Blocks {{{ */ RubyProcParameterList_ : "," RubyProcParameterList { $$ = $2; } @@ -1933,12 +1920,17 @@ RubyProcParameterList_ ; RubyProcParameterList - : Identifier RubyProcParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); } + : Identifier RubyProcParameterList_ { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1), $2); } | { $$ = NULL; } ; -RubyProcParametersOpt +RubyProcParameters : "|" RubyProcParameterList "|" { $$ = $2; } + | "||" { $$ = NULL; } + ; + +RubyProcParametersOpt + : RubyProcParameters | { $$ = NULL; } ; @@ -1946,19 +1938,13 @@ RubyProcExpression : "{" RubyProcParametersOpt StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); } ; -LeftHandSideExpression - : LeftHandSideExpression RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } - ; - -LeftHandSideExpressionNoBF - : LeftHandSideExpressionNoBF RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } +PrimaryExpression + : "{" LexPushInOff RubyProcParameters StatementListOpt "}" LexPopIn { $$ = CYNew CYRubyProc($3, $4); } ; -@begin C -LeftHandSideExpressionNoRE - : LeftHandSideExpressionNoRE RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } +CallExpression + : CallExpression_ RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); } ; -@end /* }}} */ %%