Reorganize typed identifier storage for other uses.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index e8ca6b4920407559e077e02f91ab7346bd677c3d..90588f78237c3aa455e1675fb36f747f63973200 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -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_;


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

+        CYTypeModifier *type_;
+        CYTypedIdentifier *typed_;

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


@@ -225,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


@@ -234,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"


@@ -333,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_


@@ -349,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


@@ -444,14 +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
 %type <expression_> BoxableExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression
 
 @begin ObjectiveC
 %type <expression_> BoxableExpression
 %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


@@ -459,12 +471,15 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <protocol_> ClassProtocolListOpt
 %type <protocol_> ClassProtocols
 %type <protocol_> ClassProtocolsOpt
 %type <protocol_> ClassProtocolListOpt
 %type <protocol_> ClassProtocols
 %type <protocol_> ClassProtocolsOpt

+%type <expression_> EncodedType

 %type <expression_> MessageExpression
 %type <messageParameter_> MessageParameter
 %type <messageParameter_> MessageParameters
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope
 %type <expression_> MessageExpression
 %type <messageParameter_> MessageParameter
 %type <messageParameter_> MessageParameters
 %type <messageParameter_> MessageParameterList
 %type <messageParameter_> MessageParameterListOpt
 %type <bool_> MessageScope

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

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


@@ -472,7 +487,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 <typed_> SuffixedType

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

+%type <typed_> TypedIdentifier

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


@@ -527,15 +544,19 @@ 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 {{{ */
     ;
 /* }}} */
 /* Virtual Tokens {{{ */


@@ -543,6 +564,10 @@ BRACE
     : "{"
     | "\n{"
     ;
     : "{"
     | "\n{"
     ;

+
+Var_
+    : "var"
+    ;

 /* }}} */
 
 /* 7.6 Identifier Names and Identifiers {{{ */
 /* }}} */
 
 /* 7.6 Identifier Names and Identifiers {{{ */


@@ -557,6 +582,7 @@ NewLineOpt
 
 Word
     : Identifier { $$ = $1; }
 
 Word
     : Identifier { $$ = $1; }

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

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


@@ -699,9 +725,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; }


@@ -734,6 +764,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); }


@@ -1024,7 +1070,7 @@ StatementList
 
 StatementListOpt
     : StatementList { $$ = $1; }
 
 StatementListOpt
     : StatementList { $$ = $1; }

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

     ;
 
 StatementListItem
     ;
 
 StatementListItem


@@ -1038,6 +1084,10 @@ BindingIdentifier
     : Identifier { $$ = $1; }
     ;
 
     : Identifier { $$ = $1; }
     ;
 

+Binding
+    : BindingIdentifier
+    ;
+

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


@@ -1052,7 +1102,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_


@@ -1128,7 +1178,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 {{{ */


@@ -1139,7 +1189,7 @@ IterationStatement
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }

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

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


@@ -1260,7 +1310,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


@@ -1284,11 +1334,41 @@ ProgramBody
 
 ProgramBodyOpt
     : ProgramBody { $$ = $1; }
 
 ProgramBodyOpt
     : ProgramBody { $$ = $1; }

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

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

+/* Cycript (Objective-C): Type Encoding {{{ */
+SuffixedType
+    : IdentifierOpt { $$ = CYNew CYTypedIdentifier($1); }
+    | "(" PrefixedType ")" { $$ = $2; }
+    | SuffixedType "[" NumericLiteral "]" { CYSetLast($1->type_) = CYNew CYTypeArrayOf($3->Value()); $$ = $1; }
+    ;
+
+PrefixedType
+    : SuffixedType { $$ = $1; }
+    | "const" PrefixedType { CYSetLast($2->type_) = CYNew CYTypeConstant(); $$ = $2; }
+    | "*" PrefixedType { CYSetLast($2->type_) = CYNew CYTypePointerTo(); $$ = $2; }
+    ;
+
+ModifiedType
+    : Variable { $$ = CYNew CYTypeVariable($1); }
+    | "const" ModifiedType { $$ = CYNew CYTypeConstant($2); }
+    ;
+
+TypedIdentifier
+    : ModifiedType 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? */
 /* Cycript (Objective-C): @class Declaration {{{ */
 ClassSuperOpt
     /* XXX: why the hell did I choose MemberExpression? */


@@ -1296,17 +1376,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


@@ -1315,8 +1391,8 @@ MessageScope
     ;
 
 TypeOpt
     ;
 
 TypeOpt

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

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


@@ -1374,11 +1450,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


@@ -1461,7 +1537,7 @@ ImportPath
     ;
 
 StatementListItem
     ;
 
 StatementListItem

-    : "@import" ImportPath { $$ = CYNew CYImport(); }
+    : LexSetStatement LexSetRegExp "@import" ImportPath { $$ = CYNew CYImport(); }

     ;
 /* }}} */
 /* Cycript (Objective-C): Boxed Expressions {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): Boxed Expressions {{{ */


@@ -1497,6 +1573,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 {{{ */


@@ -1685,8 +1766,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