Parse bison output to prevent LexSetRegExp mistakes.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 15b76736674b407b3fdeedf2ca19d7c40a7257e3..fe1873fe13f763d346b633f53c86547433746283 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -39,8 +39,11 @@
 #include "E4X/Syntax.hpp"
 @end
 
+#include "Highlight.hpp"
+
 typedef struct {
     bool newline_;
+    hi::Value highlight_;
 
     union {
         bool bool_;
@@ -78,6 +81,9 @@ typedef struct {
         CYString *string_;
         CYThis *this_;
         CYTrue *true_;
+        CYTypeModifier *type_;
+        CYTypedIdentifier *typedIdentifier_;
+        CYTypedParameter *typedParameter_;
         CYWord *word_;
 
 @begin ObjectiveC
@@ -225,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
@@ -234,6 +241,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %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"
@@ -333,6 +341,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> ArrowFunction
 %type <functionParameter_> ArrowParameters
 %type <expression_> AssignmentExpression
+%type <identifier_> Binding
 %type <identifier_> BindingIdentifier
 %type <expression_> BitwiseANDExpression
 %type <statement_> Block_
@@ -349,6 +358,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
+%type <comprehension_> ComprehensionForList
+%type <comprehension_> ComprehensionForListOpt
 %type <comprehension_> ComprehensionList
 %type <comprehension_> ComprehensionListOpt
 %type <expression_> ConditionalExpression
@@ -444,6 +455,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> WithStatement
 %type <word_> Word
 %type <word_> WordOpt
+%type <expression_> Variable
 
 @begin ObjectiveC
 %type <expression_> BoxableExpression
@@ -460,12 +472,17 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %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 <type_> ModifiedType
+%type <typedIdentifier_> PrefixedType
+%type <expression_> PrimitiveType
+%type <type_> QualifiedType
 %type <argument_> SelectorCall_
 %type <argument_> SelectorCall
 %type <selector_> SelectorExpression_
@@ -473,7 +490,12 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <selector_> SelectorExpressionOpt
 %type <argument_> SelectorList
 %type <word_> SelectorWordOpt
+%type <typedIdentifier_> SuffixedType
 %type <expression_> TypeOpt
+%type <typedIdentifier_> TypedIdentifier
+%type <typedParameter_> TypedParameterList_
+%type <typedParameter_> TypedParameterList
+%type <typedParameter_> TypedParameterListOpt
 %type <argument_> VariadicCall
 @end
 
@@ -528,15 +550,15 @@ 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
-    : { if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+    : { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
     ;
 
 LexSetStatement
@@ -548,6 +570,10 @@ BRACE
     : "{"
     | "\n{"
     ;
+
+Var_
+    : "var"
+    ;
 /* }}} */
 
 /* 7.6 Identifier Names and Identifiers {{{ */
@@ -562,6 +588,7 @@ NewLineOpt
 
 Word
     : Identifier { $$ = $1; }
+    | "auto" { $$ = $1; }
     | "break" NewLineOpt { $$ = $1; }
     | "case" { $$ = $1; }
     | "catch" { $$ = $1; }
@@ -704,9 +731,13 @@ ParentheticalOpt
     | { $$ = NULL; }
     ;
 
+Variable
+    : Identifier { $$ = CYNew CYVariable($1); }
+    ;
+
 PrimaryExpression
     : "this" { $$ = $1; }
-    | Identifier { $$ = CYNew CYVariable($1); }
+    | Variable { $$ = $1; }
     | Literal { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
@@ -739,6 +770,22 @@ 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 PropertyDefinitionListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }
@@ -746,7 +793,7 @@ ObjectLiteral
 
 PropertyDefinitionList_
     : "," PropertyDefinitionList { $$ = $2; }
-    | "," { $$ = NULL; }
+    | "," LexSetRegExp { $$ = NULL; }
     | { $$ = NULL; }
     ;
 
@@ -756,7 +803,7 @@ PropertyDefinitionList
 
 PropertyDefinitionListOpt
     : PropertyDefinitionList { $$ = $1; }
-    | { $$ = NULL; }
+    | LexSetRegExp { $$ = NULL; }
     ;
 
 PropertyDefinition
@@ -1029,7 +1076,7 @@ StatementList
 
 StatementListOpt
     : StatementList { $$ = $1; }
-    | LexSetRegExp { $$ = NULL; }
+    | LexSetStatement LexSetRegExp { $$ = NULL; }
     ;
 
 StatementListItem
@@ -1043,6 +1090,10 @@ BindingIdentifier
     : Identifier { $$ = $1; }
     ;
 
+Binding
+    : BindingIdentifier
+    ;
+
 // XXX: BindingPattern
 /* }}} */
 /* 12.2.1 Let and Const Declarations {{{ */
@@ -1057,7 +1108,7 @@ LetOrConst
 /* }}} */
 /* 12.2.2 Variable Statement {{{ */
 VariableStatement
-    : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
+    : Var_ VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
     ;
 
 VariableDeclarationList_
@@ -1133,7 +1184,7 @@ IterationStatement
 
 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 {{{ */
@@ -1144,7 +1195,7 @@ IterationStatement
 
 ForInStatementInitialiser
     : LeftHandSideExpression { $$ = $1; }
-    | LexSetRegExp "var" VariableDeclaration { $$ = $3; }
+    | LexSetRegExp Var_ VariableDeclaration { $$ = $3; }
     ;
 /* }}} */
 
@@ -1162,7 +1213,7 @@ BreakStatement
 /* }}} */
 /* 12.9 The return Statement {{{ */
 ReturnStatement
-    : "return" "\n" StrictSemi { $$ = CYNew CYReturn(NULL); }
+    : "return" LexSetRegExp "\n" StrictSemi { $$ = CYNew CYReturn(NULL); }
     | "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); }
     ;
 /* }}} */
@@ -1202,7 +1253,7 @@ LabelledStatement
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement
-    : "throw" "\n" StrictSemi { YYABORT; }
+    : "throw" LexSetRegExp "\n" StrictSemi { YYABORT; }
     | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }
     ;
 /* }}} */
@@ -1265,7 +1316,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
@@ -1275,7 +1326,7 @@ ArrowParameters
 
 ConciseBody
     : AssignmentExpression { $$ = CYNew CYReturn($1); }
-    | ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $3; }
+    | LexSetRegExp ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $4; }
     ;
 /* }}} */
 /* 14 Program {{{ */
@@ -1289,11 +1340,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->Value()); $$ = $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? */
@@ -1303,7 +1395,7 @@ ClassSuperOpt
 
 ClassFieldListOpt
     : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
-    | { $$ = NULL; }
+    | LexSetRegExp { $$ = NULL; }
     ;
 
 ClassFields
@@ -1316,8 +1408,7 @@ MessageScope
     ;
 
 TypeOpt
-    : "(" Expression ")" { $$ = $2; }
-    | "(" LexSetRegExp "void" ")" { $$ = CYNew CYString("v"); }
+    : "(" LexSetRegExp EncodedType ")" { $$ = $3; }
     | { $$ = NULL; }
     ;
 
@@ -1462,7 +1553,7 @@ ImportPath
     ;
 
 StatementListItem
-    : "@import" ImportPath { $$ = CYNew CYImport(); }
+    : LexSetStatement LexSetRegExp "@import" ImportPath { $$ = CYNew CYImport(); }
     ;
 /* }}} */
 /* Cycript (Objective-C): Boxed Expressions {{{ */
@@ -1480,6 +1571,25 @@ 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
 
 @begin C
@@ -1498,6 +1608,11 @@ MemberAccess
     | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
     ;
 /* }}} */
+/* Cycript (C): auto Compatibility {{{ */
+Var_
+    : "auto"
+    ;
+/* }}} */
 @end
 
 /* YUI: Documentation Comments {{{ */
@@ -1686,8 +1801,8 @@ IfComprehension
     ;
 
 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