Add @encode() support and use its grammar for types.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index f4c6a20aa2c188b9f56d141f9a8246e0c7245c1b..92d57f68bdfc733727ca99cf000e23778b03d8ea 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1,5 +1,5 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2010  Jay Freeman (saurik)
+ * Copyright (C) 2009-2012  Jay Freeman (saurik)

 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */
 */
 
 /* GNU Lesser General Public License, Version 3 {{{ */


@@ -39,8 +39,11 @@
 #include "E4X/Syntax.hpp"
 @end
 
 #include "E4X/Syntax.hpp"
 @end
 

+#include "Highlight.hpp"
+

 typedef struct {
     bool newline_;
 typedef struct {
     bool newline_;

+    hi::Value highlight_;

 
     union {
         bool bool_;
 
     union {
         bool bool_;


@@ -70,6 +73,7 @@ typedef struct {
         CYMember *member_;
         CYNull *null_;
         CYNumber *number_;
         CYMember *member_;
         CYNull *null_;
         CYNumber *number_;

+        CYEncodedPart *part_;

         CYProgram *program_;
         CYProperty *property_;
         CYPropertyName *propertyName_;
         CYProgram *program_;
         CYProperty *property_;
         CYPropertyName *propertyName_;


@@ -78,6 +82,7 @@ typedef struct {
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;

+        CYEncodedType *type_;

         CYWord *word_;
 
 @begin ObjectiveC
         CYWord *word_;
 
 @begin ObjectiveC


@@ -126,6 +131,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %parse-param { CYDriver &driver }
 %lex-param { void *cyscanner }
 
 %parse-param { CYDriver &driver }
 %lex-param { void *cyscanner }
 

+/* Token Declarations {{{ */

 @begin E4X
 %token XMLCDATA
 %token XMLComment
 @begin E4X
 %token XMLCDATA
 %token XMLComment


@@ -224,6 +230,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 %token AtImport "@import"
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 %token AtImport "@import"

+%token AtEncode "@encode"

 %token AtEnd "@end"
 %token AtSelector "@selector"
 @end
 %token AtEnd "@end"
 %token AtSelector "@selector"
 @end


@@ -233,6 +240,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token <true_> True "true"
 
 // ES3/ES5/WIE/JSC Reserved
 %token <true_> True "true"
 
 // ES3/ES5/WIE/JSC Reserved

+%token <word_> Auto "auto"

 %token <word_> Break "break"
 %token <word_> Case "case"
 %token <word_> Catch "catch"
 %token <word_> Break "break"
 %token <word_> Case "case"
 %token <word_> Catch "catch"


@@ -332,6 +340,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> ArrowFunction
 %type <functionParameter_> ArrowParameters
 %type <expression_> AssignmentExpression
 %type <expression_> ArrowFunction
 %type <functionParameter_> ArrowParameters
 %type <expression_> AssignmentExpression

+%type <identifier_> Binding

 %type <identifier_> BindingIdentifier
 %type <expression_> BitwiseANDExpression
 %type <statement_> Block_
 %type <identifier_> BindingIdentifier
 %type <expression_> BitwiseANDExpression
 %type <statement_> Block_


@@ -348,6 +357,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt

+%type <comprehension_> ComprehensionForList
+%type <comprehension_> ComprehensionForListOpt

 %type <comprehension_> ComprehensionList
 %type <comprehension_> ComprehensionListOpt
 %type <expression_> ConditionalExpression
 %type <comprehension_> ComprehensionList
 %type <comprehension_> ComprehensionListOpt
 %type <expression_> ConditionalExpression


@@ -393,7 +404,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> LetStatement
 %type <statement_> LexicalDeclaration
 %type <literal_> Literal
 %type <statement_> LetStatement
 %type <statement_> LexicalDeclaration
 %type <literal_> Literal

-%type <literal_> LiteralNoRE
+%type <literal_> ValueLiteral

 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalORExpression
 %type <member_> MemberAccess
 %type <expression_> LogicalANDExpression
 %type <expression_> LogicalORExpression
 %type <member_> MemberAccess


@@ -443,13 +454,16 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> WithStatement
 %type <word_> Word
 %type <word_> WordOpt
 %type <statement_> WithStatement
 %type <word_> Word
 %type <word_> WordOpt

+%type <expression_> Variable

 
 @begin ObjectiveC
 
 @begin ObjectiveC

+%type <expression_> BoxableExpression

 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression

+%type <field_> ClassFieldListOpt
+%type <field_> ClassFields

 %type <statement_> ClassStatement
 %type <expression_> ClassSuperOpt
 %type <statement_> ClassStatement
 %type <expression_> ClassSuperOpt

-%type <field_> ClassFieldList

 %type <message_> ClassMessageDeclaration
 %type <message_> ClassMessageDeclarationListOpt
 %type <className_> ClassName
 %type <message_> ClassMessageDeclaration
 %type <message_> ClassMessageDeclarationListOpt
 %type <className_> ClassName


@@ -463,6 +477,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope

+%type <type_> ModifiedType
+%type <part_> PrefixedType

 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_
 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_


@@ -470,7 +486,9 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt
 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt

+%type <part_> SuffixedType

 %type <expression_> TypeOpt
 %type <expression_> TypeOpt

+%type <type_> TypedIdentifier

 %type <argument_> VariadicCall
 @end
 
 %type <argument_> VariadicCall
 @end
 


@@ -494,12 +512,14 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end
 %type <expression_> XMLListInitialiser
 %type <expression_> XMLInitialiser
 @end

-
+/* }}} */
+/* Token Priorities {{{ */

 %nonassoc ""
 %left "++" "--"
 
 %nonassoc "if"
 %nonassoc "else"
 %nonassoc ""
 %left "++" "--"
 
 %nonassoc "if"
 %nonassoc "else"

+/* }}} */

 
 %start Program
 
 
 %start Program
 


@@ -523,53 +543,45 @@ LexSetRegExp
     ;
 
 LexNoBrace
     ;
 
 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
     ;
 
 LexNoFunction

-    : { if (yychar == token::Function) yychar = token::Function_; }
+    : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
+    ;
+
+LexNoAtImplementation
+    : { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }

     ;
 
 LexSetStatement
     ;
 
 LexSetStatement

-    : LexNoBrace LexNoFunction
+    : LexNoBrace LexNoFunction LexNoAtImplementation

     ;
 /* }}} */
     ;
 /* }}} */

-
+/* Virtual Tokens {{{ */

 BRACE
     : "{"
     | "\n{"
     ;
 
 BRACE
     : "{"
     | "\n{"
     ;
 

-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
+Var_
+    : "var"

     ;
     ;

+/* }}} */

 
 

-TerminatorOpt
-    : ";"
-    | error { yyerrok; driver.errors_.pop_back(); } StrictSemi
+/* 7.6 Identifier Names and Identifiers {{{ */
+IdentifierName
+    : Word { $$ = $1; }

     ;
 
     ;
 

-/*CommaOpt
-    : ","
-    |
-    ;*/
-

 NewLineOpt
     : "\n"
     |
     ;
 
 NewLineOpt
     : "\n"
     |
     ;
 

-IdentifierName
-    : Word { $$ = $1; }
-    ;
-

 Word
     : Identifier { $$ = $1; }
 Word
     : Identifier { $$ = $1; }

+    | "auto" { $$ = $1; }

     | "break" NewLineOpt { $$ = $1; }
     | "case" { $$ = $1; }
     | "catch" { $$ = $1; }
     | "break" NewLineOpt { $$ = $1; }
     | "case" { $$ = $1; }
     | "catch" { $$ = $1; }


@@ -618,15 +630,6 @@ WordOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-@begin ObjectiveC
-PrimaryExpression
-    : "@" LiteralNoRE { $$ = CYNew CYBox($2); }
-    | "@" ArrayLiteral { $$ = CYNew CYBox($2); }
-    | "@" ObjectLiteral { $$ = CYNew CYBox($2); }
-    | "@" Parenthetical { $$ = CYNew CYBox($2); }
-    ;
-@end
-

 Identifier
     : Identifier_ { $$ = $1; }
 
 Identifier
     : Identifier_ { $$ = $1; }
 


@@ -668,27 +671,48 @@ IdentifierOpt
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
     ;
     : Identifier { $$ = $1; }
     | { $$ = NULL; }
     ;

+/* }}} */

 
 

-LiteralNoRE
+/* 7.8 Literals {{{ */
+Literal

     : NullLiteral { $$ = $1; }
     : NullLiteral { $$ = $1; }

-    | BooleanLiteral { $$ = $1; }
-    | NumericLiteral { $$ = $1; }
-    | StringLiteral { $$ = $1; }
+    | ValueLiteral { $$ = $1; }

     ;
 
     ;
 

-Literal
-    : LiteralNoRE { $$ = $1; }
+ValueLiteral
+    : BooleanLiteral { $$ = $1; }
+    | NumericLiteral { $$ = $1; }
+    | StringLiteral { $$ = $1; }

     | RegularExpressionLiteral { $$ = $1; }
     ;
     | RegularExpressionLiteral { $$ = $1; }
     ;

-
+/* }}} */
+/* 7.8.1 Null Literals {{{ */

 NullLiteral
     : "null" { $$ = $1; }
     ;
 NullLiteral
     : "null" { $$ = $1; }
     ;

-
+/* }}} */
+/* 7.8.2 Boolean Literals {{{ */

 BooleanLiteral
     : "true" { $$ = $1; }
     | "false" { $$ = $1; }
     ;
 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
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical


@@ -700,9 +724,13 @@ ParentheticalOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

+Variable
+    : Identifier { $$ = CYNew CYVariable($1); }
+    ;
+

 PrimaryExpression
     : "this" { $$ = $1; }
 PrimaryExpression
     : "this" { $$ = $1; }

-    | Identifier { $$ = CYNew CYVariable($1); }
+    | Variable { $$ = $1; }

     | Literal { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
     | Literal { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }


@@ -735,6 +763,22 @@ ElementListOpt
     | LexSetRegExp { $$ = NULL; }
     ;
 /* }}} */
     | 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 PropertyDefinitionListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral
     : BRACE LexPushInOff PropertyDefinitionListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }


@@ -1025,7 +1069,7 @@ StatementList
 
 StatementListOpt
     : StatementList { $$ = $1; }
 
 StatementListOpt
     : StatementList { $$ = $1; }

-    | LexSetRegExp { $$ = NULL; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }

     ;
 
 StatementListItem
     ;
 
 StatementListItem


@@ -1033,11 +1077,16 @@ StatementListItem
     | Declaration { $$ = $1; }
     ;
 /* }}} */
     | Declaration { $$ = $1; }
     ;
 /* }}} */

+

 /* 12.2 Declarations {{{ */
 BindingIdentifier
     : Identifier { $$ = $1; }
     ;
 
 /* 12.2 Declarations {{{ */
 BindingIdentifier
     : Identifier { $$ = $1; }
     ;
 

+Binding
+    : BindingIdentifier
+    ;
+

 // XXX: BindingPattern
 /* }}} */
 /* 12.2.1 Let and Const Declarations {{{ */
 // XXX: BindingPattern
 /* }}} */
 /* 12.2.1 Let and Const Declarations {{{ */


@@ -1052,7 +1101,7 @@ LetOrConst
 /* }}} */
 /* 12.2.2 Variable Statement {{{ */
 VariableStatement
 /* }}} */
 /* 12.2.2 Variable Statement {{{ */
 VariableStatement

-    : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
+    : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }

     ;
 
 VariableDeclarationList_
     ;
 
 VariableDeclarationList_


@@ -1089,6 +1138,7 @@ SingleNameBinding
     : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
     ;
 /* }}} */
     : BindingIdentifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
     ;
 /* }}} */

+

 /* 12.3 Empty Statement {{{ */
 EmptyStatement
     : ";" { $$ = CYNew CYEmpty(); }
 /* 12.3 Empty Statement {{{ */
 EmptyStatement
     : ";" { $$ = CYNew CYEmpty(); }


@@ -1127,7 +1177,7 @@ IterationStatement
 
 ForStatementInitialiser
     : ExpressionOpt { $$ = $1; }
 
 ForStatementInitialiser
     : ExpressionOpt { $$ = $1; }

-    | LexSetRegExp "var" VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }
+    | LexSetRegExp Var_ VariableDeclarationList { $$ = CYNew CYForDeclarations($3); }

     ;
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */
     ;
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */


@@ -1138,7 +1188,7 @@ IterationStatement
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }

-    | LexSetRegExp "var" VariableDeclaration { $$ = $3; }
+    | LexSetRegExp Var_ VariableDeclaration { $$ = $3; }

     ;
 /* }}} */
 
     ;
 /* }}} */
 


@@ -1259,7 +1309,7 @@ FunctionBody
 /* }}} */
 /* 13.2 Arrow Function Definitions {{{ */
 ArrowFunction
 /* }}} */
 /* 13.2 Arrow Function Definitions {{{ */
 ArrowFunction

-    : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFunctionExpression(NULL, $2, $5); }
+    : LexSetRegExp ArrowParameters "=>" LexNoBrace ConciseBody { $$ = CYNew CYFatArrow($2, $5); }

     ;
 
 ArrowParameters
     ;
 
 ArrowParameters


@@ -1283,11 +1333,36 @@ ProgramBody
 
 ProgramBodyOpt
     : ProgramBody { $$ = $1; }
 
 ProgramBodyOpt
     : ProgramBody { $$ = $1; }

-    | { $$ = NULL; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }

     ;
 /* }}} */
 
 @begin ObjectiveC
     ;
 /* }}} */
 
 @begin ObjectiveC

+/* Cycript (Objective-C): Type Encoding {{{ */
+SuffixedType
+    : { $$ = NULL; }
+    | "(" PrefixedType ")" { $$ = $2; }
+    | SuffixedType "[" NumericLiteral "]" { $$ = CYNew CYEncodedPart($1, "arrayOf", CYNew CYArgument($3)); }
+    ;
+
+PrefixedType
+    : SuffixedType { $$ = $1; }
+    | "*" PrefixedType { $$ = CYNew CYEncodedPart($2, "pointerTo"); }
+    ;
+
+ModifiedType
+    : Variable { $$ = CYNew CYEncodedType($1); }
+    | "const" ModifiedType { $2->base_ = CYNew CYCall(CYNew CYDirectMember($2->base_, CYNew CYString("constant"))); $$ = $2; }
+    ;
+
+TypedIdentifier
+    : ModifiedType PrefixedType { $1->parts_ = $2; $$ = $1;}
+    ;
+
+PrimaryExpression
+    : AtEncode "(" TypedIdentifier ")" { $$ = $3; }
+    ;
+/* }}} */

 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt
     /* XXX: why the hell did I choose MemberExpression? */
 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt
     /* XXX: why the hell did I choose MemberExpression? */


@@ -1295,17 +1370,13 @@ ClassSuperOpt
     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 

-ClassField
-    : Expression Identifier ";"
-    ;
-
-ClassFieldList
-    : BRACE ClassFieldListOpt "}" { $$ = NULL; }
+ClassFieldListOpt
+    : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
+    | { $$ = NULL; }

     ;
 
     ;
 

-ClassFieldListOpt
-    : ClassFieldListOpt ClassField
-    |
+ClassFields
+    : BRACE ClassFieldListOpt "}" { $$ = $2; }

     ;
 
 MessageScope
     ;
 
 MessageScope


@@ -1314,8 +1385,8 @@ MessageScope
     ;
 
 TypeOpt
     ;
 
 TypeOpt

-    : "(" Expression ")" { $$ = $2; }
-    | "(" LexSetRegExp "void" ")" { $$ = NULL; }
+    : "(" TypedIdentifier ")" { $$ = $2; }
+    | "(" LexSetRegExp "void" ")" { $$ = CYNew CYString("v"); }

     | { $$ = NULL; }
     ;
 
     | { $$ = NULL; }
     ;
 


@@ -1373,11 +1444,11 @@ ClassProtocolListOpt
     ;
 
 ClassExpression
     ;
 
 ClassExpression

-    : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt LexPopIn "@end" { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); }
+    : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields ClassMessageDeclarationListOpt LexPopIn "@end" { $$ = CYNew CYClassExpression($3, $4, $5, $6, $7); }

     ;
 
 ClassStatement
     ;
 
 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
     ;
 
 CategoryName


@@ -1460,7 +1531,22 @@ ImportPath
     ;
 
 StatementListItem
     ;
 
 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); }

     ;
 /* }}} */
 @end
     ;
 /* }}} */
 @end


@@ -1481,6 +1567,11 @@ MemberAccess
     | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
     ;
 /* }}} */
     | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
     ;
 /* }}} */

+/* Cycript (C): auto Compatibility {{{ */
+Var_
+    : "auto"
+    ;
+/* }}} */

 @end
 
 /* YUI: Documentation Comments {{{ */
 @end
 
 /* YUI: Documentation Comments {{{ */


@@ -1515,11 +1606,12 @@ LexSetXMLTag
     : { driver.SetCondition(CYDriver::XMLTagCondition); }
     ;
 /* }}} */
     : { driver.SetCondition(CYDriver::XMLTagCondition); }
     ;
 /* }}} */

-
+/* Virtual Tokens {{{ */

 XMLWhitespaceOpt
     : XMLWhitespace
     |
     ;
 XMLWhitespaceOpt
     : XMLWhitespace
     |
     ;

+/* }}} */

 
 /* 8.1 Context Keywords {{{ */
 Identifier
 
 /* 8.1 Context Keywords {{{ */
 Identifier


@@ -1534,6 +1626,7 @@ XMLMarkup
     | XMLPI { $$ = $1; }
     ;
 /* }}} */
     | XMLPI { $$ = $1; }
     ;
 /* }}} */

+

 /* 11.1 Primary Expressions {{{ */
 PrimaryExpression
     : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }
 /* 11.1 Primary Expressions {{{ */
 PrimaryExpression
     : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }


@@ -1637,6 +1730,7 @@ 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; }
 /* 11.2 Left-Hand-Side Expressions {{{ */
 PropertyIdentifier_
     : Identifier { $$ = $1; }


@@ -1666,8 +1760,8 @@ IfComprehension
     ;
 
 ForComprehension
     ;
 
 ForComprehension

-    : "for" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForInComprehension($4, $7); }
-    | "for" "each" "(" LexPushInOn Identifier LexPopIn "!in" Expression ")" { $$ = CYNew CYForOfComprehension($5, $8); }
+    : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); }
+    | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForOfComprehension($4, $6); }

     ;
 
 ComprehensionList
     ;
 
 ComprehensionList