X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/c34648c04bd7eef35fba5ff65363330922def888..c5e3cd6963207eebaeb3ddd81992179cd7da1274:/Cycript.yy.in diff --git a/Cycript.yy.in b/Cycript.yy.in index 241d93f..047983b 100644 --- a/Cycript.yy.in +++ b/Cycript.yy.in @@ -1,20 +1,20 @@ /* Cycript - Optimizing JavaScript Compiler/Runtime - * Copyright (C) 2009-2010 Jay Freeman (saurik) + * Copyright (C) 2009-2013 Jay Freeman (saurik) */ -/* GNU Lesser General Public License, Version 3 {{{ */ +/* GNU 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 free software: you can redistribute it and/or modify + * it under the terms of the GNU 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. + * 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 General Public License for more details. * - * You should have received a copy of the GNU Lesser General Public License + * You should have received a copy of the GNU General Public License * along with Cycript. If not, see . **/ /* }}} */ @@ -39,8 +39,11 @@ #include "E4X/Syntax.hpp" @end +#include "Highlight.hpp" + typedef struct { bool newline_; + hi::Value highlight_; union { bool bool_; @@ -87,6 +90,9 @@ typedef struct { CYMessageParameter *messageParameter_; CYProtocol *protocol_; CYSelectorPart *selector_; + CYTypeModifier *type_; + CYTypedIdentifier *typedIdentifier_; + CYTypedParameter *typedParameter_; @end @begin E4X @@ -126,6 +132,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %parse-param { CYDriver &driver } %lex-param { void *cyscanner } +/* Token Declarations {{{ */ @begin E4X %token XMLCDATA %token XMLComment @@ -224,6 +231,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token AtImplementation "@implementation" %token AtImplementation_ ";@implementation" %token AtImport "@import" +%token AtEncode "@encode" %token AtEnd "@end" %token AtSelector "@selector" @end @@ -233,6 +241,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %token True "true" // ES3/ES5/WIE/JSC Reserved +%token Auto "auto" %token Break "break" %token Case "case" %token Catch "catch" @@ -308,6 +317,7 @@ int cylex(YYSTYPE *, cy::location *, void *); // Woah?! %token Each "each" +%token Of "of" @begin E4X // E4X Conditional @@ -331,6 +341,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ArrowFunction %type ArrowParameters %type AssignmentExpression +%type Binding %type BindingIdentifier %type BitwiseANDExpression %type Block_ @@ -347,6 +358,8 @@ int cylex(YYSTYPE *, cy::location *, void *); %type CaseClause %type CaseClausesOpt %type CatchOpt +%type ComprehensionForList +%type ComprehensionForListOpt %type ComprehensionList %type ComprehensionListOpt %type ConditionalExpression @@ -357,7 +370,6 @@ int cylex(YYSTYPE *, cy::location *, void *); %type Declaration_ %type Declaration %type DefaultClause -%type DoWhileStatement %type Element %type ElementOpt %type ElementList @@ -371,9 +383,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ExpressionStatement %type FinallyOpt %type ForComprehension -%type ForStatement %type ForStatementInitialiser -%type ForInStatement %type ForInStatementInitialiser %type FormalParameter %type FormalParameterList_ @@ -384,6 +394,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %type FunctionExpression %type Identifier %type IdentifierOpt +%type IdentifierName %type IfComprehension %type IfStatement %type Initialiser @@ -394,7 +405,7 @@ int cylex(YYSTYPE *, cy::location *, void *); %type LetStatement %type LexicalDeclaration %type Literal -%type LiteralNoRE +%type ValueLiteral %type LogicalANDExpression %type LogicalORExpression %type MemberAccess @@ -413,9 +424,10 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ProgramBodyOpt %type PropertyName_ %type PropertyName -%type PropertyNameAndValueList_ -%type PropertyNameAndValueList -%type PropertyNameAndValueListOpt +%type PropertyDefinition +%type PropertyDefinitionList_ +%type PropertyDefinitionList +%type PropertyDefinitionListOpt %type RelationalExpression %type ReturnStatement %type RubyProcExpression @@ -440,15 +452,19 @@ int cylex(YYSTYPE *, cy::location *, void *); %type VariableDeclarationList_ %type VariableDeclarationList %type VariableStatement -%type WhileStatement %type WithStatement +%type Word +%type WordOpt +%type Variable @begin ObjectiveC +%type BoxableExpression %type CategoryStatement %type ClassExpression +%type ClassFieldListOpt +%type ClassFields %type ClassStatement %type ClassSuperOpt -%type ClassFieldList %type ClassMessageDeclaration %type ClassMessageDeclarationListOpt %type ClassName @@ -456,12 +472,17 @@ int cylex(YYSTYPE *, cy::location *, void *); %type ClassProtocolListOpt %type ClassProtocols %type ClassProtocolsOpt +%type EncodedType %type MessageExpression %type MessageParameter %type MessageParameters %type MessageParameterList %type MessageParameterListOpt %type MessageScope +%type ModifiedType +%type PrefixedType +%type PrimitiveType +%type QualifiedType %type SelectorCall_ %type SelectorCall %type SelectorExpression_ @@ -469,10 +490,13 @@ int cylex(YYSTYPE *, cy::location *, void *); %type SelectorExpressionOpt %type SelectorList %type SelectorWordOpt +%type SuffixedType %type TypeOpt +%type TypedIdentifier +%type TypedParameterList_ +%type TypedParameterList +%type TypedParameterListOpt %type VariadicCall -%type Word -%type WordOpt @end @begin E4X @@ -495,12 +519,14 @@ int cylex(YYSTYPE *, cy::location *, void *); %type XMLListInitialiser %type XMLInitialiser @end - +/* }}} */ +/* Token Priorities {{{ */ %nonassoc "" %left "++" "--" %nonassoc "if" %nonassoc "else" +/* }}} */ %start Program @@ -524,48 +550,39 @@ LexSetRegExp ; LexNoBrace - : { if (yychar == yyempty_) driver.nobrace_ = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; } + : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; } ; LexNoFunction - : { if (yychar == token::Function) yychar = token::Function_; } + : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; } + ; + +LexNoAtImplementation : +@begin ObjectiveC + { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; } +@end ; LexSetStatement - : LexNoBrace LexNoFunction + : LexNoBrace LexNoFunction LexNoAtImplementation ; /* }}} */ - +/* Virtual Tokens {{{ */ BRACE : "{" | "\n{" ; -StrictSemi - : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); } - ; - -Terminator_ - : ";" - | "\n" StrictSemi - ; - -Terminator - : Terminator_ - | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi +Var_ + : "var" ; +/* }}} */ -TerminatorOpt - : Terminator_ - | error { yyerrok; driver.errors_.pop_back(); } StrictSemi +/* 7.6 Identifier Names and Identifiers {{{ */ +IdentifierName + : Word { $$ = $1; } ; -/*CommaOpt - : "," - | - ;*/ - -@begin ObjectiveC NewLineOpt : "\n" | @@ -573,6 +590,7 @@ NewLineOpt Word : Identifier { $$ = $1; } + | "auto" { $$ = $1; } | "break" NewLineOpt { $$ = $1; } | "case" { $$ = $1; } | "catch" { $$ = $1; } @@ -594,7 +612,12 @@ Word | "if" { $$ = $1; } | "import" { $$ = $1; } /* XXX: | "in" { $$ = $1; } */ + | "!in" { $$ = $1; } /* XXX: | "instanceof" { $$ = $1; } */ + + // XXX: as it currently is not an Identifier + | "let" { $$ = $1; } + | "new" { $$ = $1; } | "null" { $$ = $1; } | "return" NewLineOpt { $$ = $1; } @@ -616,14 +639,6 @@ WordOpt | { $$ = NULL; } ; -PrimaryExpression - : "@" LiteralNoRE { $$ = CYNew CYBox($2); } - | "@" ArrayLiteral { $$ = CYNew CYBox($2); } - | "@" ObjectLiteral { $$ = CYNew CYBox($2); } - | "@" Parenthetical { $$ = CYNew CYBox($2); } - ; -@end - Identifier : Identifier_ { $$ = $1; } @@ -652,41 +667,65 @@ Identifier | "transient" { $$ = $1; } | "volatile" { $$ = $1; } - // XXX: is this allowed?! | "let" { $$ = $1; } + // XXX: currently I only have this as Word + // | "let" { $$ = $1; } + | "yield" { $$ = $1; } | "each" { $$ = $1; } + | "of" { $$ = $1; } ; IdentifierOpt : Identifier { $$ = $1; } | { $$ = NULL; } ; +/* }}} */ -LiteralNoRE +/* 7.8 Literals {{{ */ +Literal : NullLiteral { $$ = $1; } - | BooleanLiteral { $$ = $1; } - | NumericLiteral { $$ = $1; } - | StringLiteral { $$ = $1; } + | ValueLiteral { $$ = $1; } ; -Literal - : LiteralNoRE { $$ = $1; } +ValueLiteral + : BooleanLiteral { $$ = $1; } + | NumericLiteral { $$ = $1; } + | StringLiteral { $$ = $1; } | RegularExpressionLiteral { $$ = $1; } ; - +/* }}} */ +/* 7.8.1 Null Literals {{{ */ NullLiteral : "null" { $$ = $1; } ; - +/* }}} */ +/* 7.8.2 Boolean Literals {{{ */ BooleanLiteral : "true" { $$ = $1; } | "false" { $$ = $1; } ; +/* }}} */ + +/* 7.9 Automatic Semicolon Insertion {{{ */ +StrictSemi + : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); } + ; + +Terminator + : ";" + | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi + ; + +TerminatorOpt + : ";" + | error { yyerrok; driver.errors_.pop_back(); } StrictSemi + ; +/* }}} */ /* 11.1 Primary Expressions {{{ */ Parenthetical - : "(" LexPushInOff Expression LexPopIn ")" { $$ = $3; } + : "(" LexPushInOff Expression ")" LexPopIn { $$ = $3; } ; ParentheticalOpt @@ -694,9 +733,13 @@ ParentheticalOpt | { $$ = NULL; } ; +Variable + : Identifier { $$ = CYNew CYVariable($1); } + ; + PrimaryExpression : "this" { $$ = $1; } - | Identifier { $$ = CYNew CYVariable($1); } + | Variable { $$ = $1; } | Literal { $$ = $1; } | ArrayLiteral { $$ = $1; } | ObjectLiteral { $$ = $1; } @@ -707,7 +750,7 @@ PrimaryExpression /* }}} */ /* 11.1.4.1 Array Initialiser {{{ */ ArrayLiteral - : "[" LexPushInOff ElementListOpt LexPopIn "]" { $$ = CYNew CYArray($3); } + : "[" LexPushInOff ElementListOpt "]" LexPopIn { $$ = CYNew CYArray($3); } ; Element @@ -729,27 +772,51 @@ ElementListOpt | LexSetRegExp { $$ = NULL; } ; /* }}} */ +/* 11.1.4.2 Array Comprehension {{{ */ +PrimaryExpression + : "[" LexPushInOff AssignmentExpression ComprehensionForList "]" LexPopIn { $$ = CYNew CYArrayComprehension($3, $4); } + ; + +ComprehensionForList + : "for" Binding "in" Expression ComprehensionForListOpt { $$ = CYNew CYForInComprehension($2, $4, $5); } + | "for" Binding "of" Expression ComprehensionForListOpt { $$ = CYNew CYForOfComprehension($2, $4, $5); } + ; + +ComprehensionForListOpt + : ComprehensionForList { $$ = $1; } + | "if" Expression { $$ = CYNew CYIfComprehension($2); } + | { $$ = NULL; } + ; +/* }}} */ /* 11.1.5 Object Initialiser {{{ */ ObjectLiteral - : BRACE LexPushInOff PropertyNameAndValueListOpt LexPopIn "}" { $$ = CYNew CYObject($3); } + : BRACE LexPushInOff PropertyDefinitionListOpt "}" LexPopIn { $$ = CYNew CYObject($3); } ; -PropertyNameAndValueList_ - : "," PropertyNameAndValueList { $$ = $2; } +PropertyDefinitionList_ + : "," PropertyDefinitionList { $$ = $2; } + | "," LexSetRegExp { $$ = NULL; } | { $$ = NULL; } ; -PropertyNameAndValueList - : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); } +PropertyDefinitionList + : PropertyDefinition PropertyDefinitionList_ { $1->SetNext($2); $$ = $1; } ; -PropertyNameAndValueListOpt - : PropertyNameAndValueList { $$ = $1; } - | { $$ = NULL; } +PropertyDefinitionListOpt + : PropertyDefinitionList { $$ = $1; } + | LexSetRegExp { $$ = NULL; } + ; + +PropertyDefinition + // XXX: this should be IdentifierName + : LexSetRegExp Identifier { $$ = CYNew CYProperty($2, CYNew CYVariable($2)); } + | PropertyName ":" AssignmentExpression { $$ = CYNew CYProperty($1, $3); } + //| MethodDefinition ; PropertyName_ - : Identifier { $$ = $1; } + : IdentifierName { $$ = $1; } | StringLiteral { $$ = $1; } | NumericLiteral { $$ = $1; } ; @@ -761,8 +828,8 @@ PropertyName /* 11.2 Left-Hand-Side Expressions {{{ */ MemberAccess - : "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYDirectMember(NULL, $3); } - | "." 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; } ; @@ -793,7 +860,7 @@ CallExpression ; Arguments - : "(" LexPushInOff ArgumentListOpt LexPopIn ")" { $$ = $3; } + : "(" LexPushInOff ArgumentListOpt ")" LexPopIn { $$ = $3; } ; ArgumentList_ @@ -915,7 +982,7 @@ LogicalORExpression /* 11.12 Conditional Operator ( ? : ) {{{ */ ConditionalExpression : LogicalORExpression { $$ = $1; } - | LogicalORExpression "?" LexPushInOff AssignmentExpression LexPopIn ":" AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); } + | LogicalORExpression "?" LexPushInOff AssignmentExpression ":" LexPopIn AssignmentExpression { $$ = CYNew CYCondition($1, $4, $7); } ; /* }}} */ /* 11.13 Assignment Operators {{{ */ @@ -1011,7 +1078,7 @@ StatementList StatementListOpt : StatementList { $$ = $1; } - | LexSetRegExp { $$ = NULL; } + | LexSetStatement LexSetRegExp { $$ = NULL; } ; StatementListItem @@ -1019,11 +1086,16 @@ StatementListItem | Declaration { $$ = $1; } ; /* }}} */ + /* 12.2 Declarations {{{ */ BindingIdentifier : Identifier { $$ = $1; } ; +Binding + : BindingIdentifier + ; + // XXX: BindingPattern /* }}} */ /* 12.2.1 Let and Const Declarations {{{ */ @@ -1038,7 +1110,7 @@ LetOrConst /* }}} */ /* 12.2.2 Variable Statement {{{ */ VariableStatement - : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } + : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); } ; VariableDeclarationList_ @@ -1075,6 +1147,7 @@ SingleNameBinding : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); } ; /* }}} */ + /* 12.3 Empty Statement {{{ */ EmptyStatement : ";" { $$ = CYNew CYEmpty(); } @@ -1096,58 +1169,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" "(" LexPushInOn ForStatementInitialiser LexPopIn ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); } +IterationStatement + : "for" "(" LexPushInOn ForStatementInitialiser ";" LexPopIn ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); } ; ForStatementInitialiser : ExpressionOpt { $$ = $1; } - | LexSetRegExp "var" VariableDeclarationList { $$ = CYNew CYForDeclarations($3); } + | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); } ; /* }}} */ -/* 12.6.4 The for-in Statement {{{ */ -ForInStatement - : "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); } +/* 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" VariableDeclaration { $$ = $3; } + | LexSetRegExp Var_ VariableDeclaration { $$ = $3; } ; /* }}} */ /* 12.7 The continue Statement {{{ */ ContinueStatement - : "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); } + : "continue" "\n" StrictSemi { $$ = CYNew CYContinue(NULL); } + | "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); } ; /* }}} */ /* 12.8 The break Statement {{{ */ BreakStatement - : "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); } + : "break" "\n" StrictSemi { $$ = CYNew CYBreak(NULL); } + | "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); } ; /* }}} */ /* 12.9 The return Statement {{{ */ ReturnStatement - : "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); } + : "return" LexSetRegExp "\n" StrictSemi { $$ = CYNew CYReturn(NULL); } + | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); } ; /* }}} */ /* 12.10 The with Statement {{{ */ @@ -1186,7 +1255,8 @@ LabelledStatement /* }}} */ /* 12.13 The throw Statement {{{ */ ThrowStatement - : "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } + : "throw" LexSetRegExp "\n" StrictSemi { YYABORT; } + | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); } ; /* }}} */ /* 12.14 The try Statement {{{ */ @@ -1216,7 +1286,7 @@ FunctionDeclaration ; FunctionExpression - : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt LexPopIn ")" BRACE LexPushInOff FunctionBody LexPopIn "}" { $$ = CYNew CYFunctionExpression($2, $5, $10); } + : "function" IdentifierOpt "(" LexPushInOff FormalParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYFunctionExpression($2, $5, $10); } ; FormalParameterList_ @@ -1248,7 +1318,7 @@ FunctionBody /* }}} */ /* 13.2 Arrow Function Definitions {{{ */ ArrowFunction - : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFunctionExpression(NULL, $2, $5); } + : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); } ; ArrowParameters @@ -1258,7 +1328,7 @@ ArrowParameters ConciseBody : AssignmentExpression { $$ = CYNew CYReturn($1); } - | ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $3; } + | LexSetRegExp ";{" LexPushInOff FunctionBody "}" LexPopIn { $$ = $4; } ; /* }}} */ /* 14 Program {{{ */ @@ -1272,11 +1342,52 @@ ProgramBody ProgramBodyOpt : ProgramBody { $$ = $1; } - | { $$ = NULL; } + | LexSetStatement LexSetRegExp { $$ = NULL; } ; /* }}} */ @begin ObjectiveC +/* Cycript (Objective-C): Type Encoding {{{ */ +SuffixedType + : IdentifierOpt { $$ = CYNew CYTypedIdentifier($1); } + | "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; } + | SuffixedType "[" NumericLiteral "]" { CYSetLast($1->type_) = CYNew CYTypeArrayOf($3); $$ = $1; } + ; + +PrefixedType + : SuffixedType { $$ = $1; } + | "const" PrefixedType { CYSetLast($2->type_) = CYNew CYTypeConstant(); $$ = $2; } + | "*" PrefixedType { CYSetLast($2->type_) = CYNew CYTypePointerTo(); $$ = $2; } + ; + +PrimitiveType + : Variable { $$ = $1; } + | "void" { $$ = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); } + ; + +QualifiedType + : PrimitiveType { $$ = CYNew CYTypeVariable($1); } + | "const" QualifiedType { $$ = CYNew CYTypeConstant($2); } + ; + +ModifiedType + : QualifiedType { $$ = $1; } + | QualifiedType "*" { $$ = CYNew CYTypePointerTo($1); } + | QualifiedType "const" { $$ = CYNew CYTypeConstant($1); } + ; + +TypedIdentifier + : QualifiedType PrefixedType { CYSetLast($2->type_) = $1; $$ = $2;} + ; + +EncodedType + : TypedIdentifier { $$ = CYNew CYEncodedType($1->type_); } + ; + +PrimaryExpression + : AtEncode "(" EncodedType ")" { $$ = $3; } + ; +/* }}} */ /* Cycript (Objective-C): @class Declaration {{{ */ ClassSuperOpt /* XXX: why the hell did I choose MemberExpression? */ @@ -1284,17 +1395,13 @@ ClassSuperOpt | { $$ = NULL; } ; -ClassField - : Expression Identifier ";" - ; - -ClassFieldList - : BRACE ClassFieldListOpt "}" { $$ = NULL; } +ClassFieldListOpt + : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); } + | LexSetRegExp { $$ = NULL; } ; -ClassFieldListOpt - : ClassFieldListOpt ClassField - | +ClassFields + : BRACE ClassFieldListOpt "}" { $$ = $2; } ; MessageScope @@ -1303,8 +1410,7 @@ MessageScope ; TypeOpt - : "(" Expression ")" { $$ = $2; } - | "(" LexSetRegExp "void" ")" { $$ = NULL; } + : "(" LexSetRegExp EncodedType ")" { $$ = $3; } | { $$ = NULL; } ; @@ -1362,11 +1468,11 @@ ClassProtocolListOpt ; ClassExpression - : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt LexPopIn "@end" { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); } + : "@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 @@ -1412,8 +1518,8 @@ SelectorList ; MessageExpression - : "[" 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); } + : "[" 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_ @@ -1432,7 +1538,7 @@ SelectorExpressionOpt PrimaryExpression : MessageExpression { $$ = $1; } - | "@selector" "(" LexPushInOff SelectorExpression LexPopIn ")" { $$ = CYNew CYSelector($4); } + | "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); } ; /* }}} */ /* Cycript (Objective-C): @import Directive {{{ */ @@ -1449,7 +1555,41 @@ ImportPath ; StatementListItem - : "@import" ImportPath { $$ = CYNew CYImport(); } + : LexSetStatement LexSetRegExp "@import" ImportPath { $$ = CYNew CYImport(); } + ; +/* }}} */ +/* Cycript (Objective-C): Boxed Expressions {{{ */ +BoxableExpression + : NullLiteral { $$ = $1; } + | BooleanLiteral { $$ = $1; } + | NumericLiteral { $$ = $1; } + | StringLiteral { $$ = $1; } + | ArrayLiteral { $$ = $1; } + | ObjectLiteral { $$ = $1; } + | Parenthetical { $$ = $1; } + ; + +PrimaryExpression + : "@" BoxableExpression { $$ = CYNew CYBox($2); } + ; +/* }}} */ +/* Cycript (Objective-C): Block Expressions {{{ */ +TypedParameterList_ + : "," TypedParameterList { $$ = $2; } + | { $$ = NULL; } + ; + +TypedParameterList + : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); } + ; + +TypedParameterListOpt + : TypedParameterList { $$ = $1; } + | { $$ = NULL; } + ; + +PrimaryExpression + : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); } ; /* }}} */ @end @@ -1466,10 +1606,15 @@ 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" + ; +/* }}} */ @end /* YUI: Documentation Comments {{{ */ @@ -1504,11 +1649,12 @@ LexSetXMLTag : { driver.SetCondition(CYDriver::XMLTagCondition); } ; /* }}} */ - +/* Virtual Tokens {{{ */ XMLWhitespaceOpt : XMLWhitespace | ; +/* }}} */ /* 8.1 Context Keywords {{{ */ Identifier @@ -1523,6 +1669,7 @@ XMLMarkup | XMLPI { $$ = $1; } ; /* }}} */ + /* 11.1 Primary Expressions {{{ */ PrimaryExpression : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); } @@ -1543,7 +1690,7 @@ AttributeIdentifier PropertySelector_ : PropertySelector { $$ = $1; } - | "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYSelector($3); } + | "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYSelector($3); } ; PropertySelector @@ -1573,8 +1720,8 @@ XMLInitialiser ; XMLElement - : "<" LexPushInOff XMLTagContent LexPop LexPopIn "/>" - | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" + : "<" LexPushInOff XMLTagContent LexPop "/>" LexPopIn + | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "" LexPopIn ; XMLTagContent @@ -1623,9 +1770,10 @@ XMLElementContentOpt /* }}} */ /* 11.1.5 XMLList Initialiser {{{ */ XMLListInitialiser - : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop LexPopIn "" { $$ = CYNew CYXMLList($4); } + : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop "" LexPopIn { $$ = CYNew CYXMLList($4); } ; /* }}} */ + /* 11.2 Left-Hand-Side Expressions {{{ */ PropertyIdentifier_ : Identifier { $$ = $1; } @@ -1649,20 +1797,14 @@ Statement__ /* }}} */ @end -/* ECMAScript5: Object Literal Trailing Comma {{{ */ -PropertyNameAndValueList_ - : "," { $$ = NULL; } - ; -/* }}} */ - /* JavaScript 1.7: Array Comprehensions {{{ */ IfComprehension : "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); } ; ForComprehension - : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); } - | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForEachInComprehension($5, $8); } + : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); } + | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); } ; ComprehensionList @@ -1676,12 +1818,12 @@ ComprehensionListOpt ; PrimaryExpression - : "[" LexPushInOff AssignmentExpression ComprehensionList LexPopIn "]" { $$ = CYNew CYArrayComprehension($3, $4); } + : "[" LexPushInOff AssignmentExpression ComprehensionList "]" LexPopIn { $$ = CYNew CYArrayComprehension($3, $4); } ; /* }}} */ /* JavaScript 1.7: for each {{{ */ -ForInStatement - : "for" "each" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForEachIn($5, $8, $10); } +IterationStatement + : "for" "each" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); } ; /* }}} */ /* JavaScript 1.7: let Statements {{{ */ @@ -1720,7 +1862,7 @@ RubyProcExpression ; PrimaryExpression - : "{" LexPushInOff RubyProcParameters StatementListOpt LexPopIn "}" { $$ = CYNew CYRubyProc($3, $4); } + : "{" LexPushInOff RubyProcParameters StatementListOpt "}" LexPopIn { $$ = CYNew CYRubyProc($3, $4); } ; CallExpression