Commit a generally useful -gtiming implementation.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index d9b9a1da9c8e3e64ae8609b1610f3a03f5bfc569..8b00100fe3a8371339306010165da79b31f8f19a 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-2014  Jay Freeman (saurik)
+ * Copyright (C) 2009-2015  Jay Freeman (saurik)

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


@@ -19,18 +19,16 @@
 **/
 /* }}} */
 
 **/
 /* }}} */
 

-@if Bison23 %{
-
-@if Bison24 %code top {
+%code top {

 #define cyscanner driver.scanner_
 #define YYSTACKEXPANDABLE 1
 #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"
 #include "Driver.hpp"
 #include "Parser.hpp"

-#define CYNew new($pool)
+#include "Stack.hpp"
+#define CYNew new(driver.pool_)

 
 @begin ObjectiveC
 #include "ObjectiveC/Syntax.hpp"
 
 @begin ObjectiveC
 #include "ObjectiveC/Syntax.hpp"


@@ -58,7 +56,6 @@ typedef struct {
         cy::Syntax::Catch *catch_;
         CYComment *comment_;
         CYComprehension *comprehension_;
         cy::Syntax::Catch *catch_;
         CYComment *comment_;
         CYComprehension *comprehension_;

-        CYCompound *compound_;

         CYDeclaration *declaration_;
         CYDeclarations *declarations_;
         CYElement *element_;
         CYDeclaration *declaration_;
         CYDeclarations *declarations_;
         CYElement *element_;


@@ -75,6 +72,7 @@ typedef struct {
         CYModule *module_;
         CYNull *null_;
         CYNumber *number_;
         CYModule *module_;
         CYNull *null_;
         CYNumber *number_;

+        CYParenthetical *parenthetical_;

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


@@ -94,7 +92,7 @@ typedef struct {
 
 @begin ObjectiveC
         CYClassName *className_;
 
 @begin ObjectiveC
         CYClassName *className_;

-        CYField *field_;
+        CYClassField *classField_;

         CYMessage *message_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYMessage *message_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;


@@ -110,23 +108,15 @@ typedef struct {
 } YYSTYPE;
 
 #define YYSTYPE YYSTYPE
 } YYSTYPE;
 
 #define YYSTYPE YYSTYPE

+}

 
 

-@if Bison24 %code provides {
-int cylex(YYSTYPE *, cy::location *, void *);
-@if Bison24 }
-
-@if Bison23 %}
-@if Bison23 %union {
-@if Bison23 }
-@if Bison23 %{
-
-@if Bison24 }
-@if Bison23 %}
+%code provides {
+int cylex(YYSTYPE *, CYLocation *, void *);
+}

 
 

-%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_;
 
 %initial-action {
     @$.begin.filename = @$.end.filename = &driver.filename_;


@@ -135,6 +125,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %locations
 %defines
 
 %locations
 %defines
 

+%define api.location.type { CYLocation }
+

 //%glr-parser
 //%expect 1
 
 //%glr-parser
 //%expect 1
 


@@ -181,6 +173,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token EqualEqual "=="
 %token EqualEqualEqual "==="
 %token EqualRight "=>"
 %token EqualEqual "=="
 %token EqualEqualEqual "==="
 %token EqualRight "=>"

+%token EqualRight_ "\n=>"

 %token Exclamation "!"
 %token ExclamationEqual "!="
 %token ExclamationEqualEqual "!=="
 %token Exclamation "!"
 %token ExclamationEqual "!="
 %token ExclamationEqualEqual "!=="


@@ -245,6 +238,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token <identifier_> Typedef "typedef"
 %token <identifier_> Unsigned "unsigned"
 %token <identifier_> Signed "signed"
 %token <identifier_> Typedef "typedef"
 %token <identifier_> Unsigned "unsigned"
 %token <identifier_> Signed "signed"

+%token <identifier_> Extern "extern"

 @end
 
 @begin C
 @end
 
 @begin C


@@ -257,69 +251,57 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token AtImport "@import"
 %token AtEnd "@end"
 %token AtSelector "@selector"
 %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 <identifier_> Yes "YES"
 %token <identifier_> No "NO"
 @end
 
 %token <identifier_> Yes "YES"
 %token <identifier_> No "NO"
 @end
 

-%token <false_> False "false"
-%token <null_> Null "null"
-%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_> Continue "continue"
-%token <word_> Default "default"
-%token <word_> Delete "delete"
-%token <word_> Do "do"
-%token <word_> Else "else"
-%token <word_> Finally "finally"
-%token <word_> For "for"
-%token <word_> Function "function"
-%token <word_> Function_ ";function"
-%token <word_> If "if"
-%token <word_> In "in"
-%token <word_> In_ "!in"
-%token <word_> InstanceOf "instanceof"
-%token <word_> New "new"
-%token <word_> Return "return"
-%token <word_> Switch "switch"
-%token <this_> This "this"
-%token <word_> Throw "throw"
-%token <word_> Try "try"
-%token <word_> TypeOf "typeof"
-%token <word_> Var "var"
-%token <word_> Void "void"
-%token <word_> While "while"
-%token <word_> With "with"
-
-// ES3/IE6 Future, ES5/JSC Reserved
-%token <word_> Debugger "debugger"
-
-// ES3/ES5/IE6 Future, JSC Reserved
-%token <word_> Const "const"
-
-// ES3/ES5/IE6/JSC Future
-%token <word_> Class "class"
-%token <word_> Enum "enum"
-%token <word_> Export "export"
-%token <word_> Extends "extends"
-%token <word_> Import "import"
-%token <word_> Super "super"
-
-// ES3 Future, ES5 Strict Future
-%token <identifier_> Implements "implements"
-%token <identifier_> Interface "interface"
-%token <identifier_> Package "package"
-%token <identifier_> Private "private"
-%token <identifier_> Protected "protected"
-%token <identifier_> Public "public"
-%token <identifier_> 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 <identifier_> Abstract "abstract"
 %token <identifier_> Abstract "abstract"

+%token <identifier_> Await "await"

 %token <identifier_> Boolean "boolean"
 %token <identifier_> Byte "byte"
 %token <identifier_> Char "char"
 %token <identifier_> Boolean "boolean"
 %token <identifier_> Byte "byte"
 %token <identifier_> Char "char"


@@ -327,25 +309,29 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token <identifier_> Final "final"
 %token <identifier_> Float "float"
 %token <identifier_> Goto "goto"
 %token <identifier_> Final "final"
 %token <identifier_> Float "float"
 %token <identifier_> Goto "goto"

+%token <identifier_> Implements "implements"

 %token <identifier_> Int "int"
 %token <identifier_> Int "int"

+%token <identifier_> Interface "interface"
+%token <identifier_> Let "let"

 %token <identifier_> Long "long"
 %token <identifier_> Native "native"
 %token <identifier_> Long "long"
 %token <identifier_> Native "native"

+%token <identifier_> Package "package"
+%token <identifier_> Private "private"
+%token <identifier_> Protected "protected"
+%token <identifier_> Public "public"

 %token <identifier_> Short "short"
 %token <identifier_> Short "short"

+%token <identifier_> Static "static"

 %token <identifier_> Synchronized "synchronized"
 %token <identifier_> Throws "throws"
 %token <identifier_> Transient "transient"
 %token <identifier_> Volatile "volatile"
 %token <identifier_> Synchronized "synchronized"
 %token <identifier_> Throws "throws"
 %token <identifier_> Transient "transient"
 %token <identifier_> Volatile "volatile"

-
-// ES5 Strict
-%token <identifier_> Let "let"

 %token <identifier_> Yield "yield"
 
 %token <identifier_> Yield "yield"
 

-// Woah?!
+%token Auto "auto"

 %token <identifier_> Each "each"
 %token <identifier_> Of "of"
 
 @begin E4X
 %token <identifier_> Each "each"
 %token <identifier_> Of "of"
 
 @begin E4X

-// E4X Conditional

 %token <identifier_> Namespace "namespace"
 %token <identifier_> XML "xml"
 @end
 %token <identifier_> Namespace "namespace"
 %token <identifier_> XML "xml"
 @end


@@ -404,8 +390,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> ElseStatementOpt
 %type <statement_> EmptyStatement
 %type <expression_> EqualityExpression
 %type <statement_> ElseStatementOpt
 %type <statement_> EmptyStatement
 %type <expression_> EqualityExpression

-%type <compound_> Expression_
-%type <compound_> Expression
+%type <expression_> Expression

 %type <expression_> ExpressionOpt
 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt
 %type <expression_> ExpressionOpt
 %type <statement_> ExpressionStatement
 %type <finally_> FinallyOpt


@@ -442,8 +427,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> NewExpression
 %type <null_> NullLiteral
 %type <literal_> ObjectLiteral
 %type <expression_> NewExpression
 %type <null_> NullLiteral
 %type <literal_> ObjectLiteral

-%type <compound_> Parenthetical
-%type <compound_> ParentheticalOpt
+%type <parenthetical_> Parenthetical

 %type <expression_> PostfixExpression
 %type <expression_> PrimaryExpression
 %type <statement_> Program
 %type <expression_> PostfixExpression
 %type <expression_> PrimaryExpression
 %type <statement_> Program


@@ -481,20 +465,18 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <statement_> VariableStatement
 %type <statement_> WithStatement
 %type <word_> Word
 %type <statement_> VariableStatement
 %type <statement_> WithStatement
 %type <word_> Word

+@begin ObjectiveC

 %type <word_> WordOpt
 %type <word_> WordOpt

+@end

 %type <expression_> Variable
 
 @begin C
 %type <expression_> Variable
 
 @begin C

-%type <typedIdentifier_> ArrayedType
-%type <expression_> EncodedType
-%type <modifier_> FunctionedType

 %type <specifier_> IntegerType
 %type <specifier_> IntegerTypeOpt
 %type <typedIdentifier_> PrefixedType
 %type <specifier_> PrimitiveType
 %type <specifier_> IntegerType
 %type <specifier_> IntegerTypeOpt
 %type <typedIdentifier_> PrefixedType
 %type <specifier_> PrimitiveType

-%type <typedIdentifier_> TypeParenthetical
-%type <typedIdentifier_> TypeSignifier

 %type <typedIdentifier_> SuffixedType
 %type <typedIdentifier_> SuffixedType

+%type <typedIdentifier_> TypeSignifier

 %type <modifier_> TypeQualifierLeft
 %type <typedIdentifier_> TypeQualifierRight
 %type <typedIdentifier_> TypedIdentifier
 %type <modifier_> TypeQualifierLeft
 %type <typedIdentifier_> TypeQualifierRight
 %type <typedIdentifier_> TypedIdentifier


@@ -507,8 +489,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> BoxableExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression
 %type <expression_> BoxableExpression
 %type <statement_> CategoryStatement
 %type <expression_> ClassExpression

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

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


@@ -524,7 +506,6 @@ 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 <typedIdentifier_> ModifiedType

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


@@ -532,7 +513,7 @@ 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 <expression_> TypeOpt
+%type <typedIdentifier_> TypeOpt

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


@@ -587,16 +568,16 @@ LexSetRegExp
     ;
 
 LexNoBrace
     ;
 
 LexNoBrace

-    : { if (yychar == yyempty_) driver.no_.OpenBrace = true; else if (yychar == token::OpenBrace || yychar == token::OpenBrace_) yychar = token::OpenBrace__; }
+    : { if (yyla.empty()) driver.no_.OpenBrace = true; else if (yyla.type == yytranslate_(token::OpenBrace) || yyla.type == yytranslate_(token::OpenBrace_)) yyla.type = yytranslate_(token::OpenBrace__); }

     ;
 
 LexNoFunction
     ;
 
 LexNoFunction

-    : { if (yychar == yyempty_) driver.no_.Function = true; else if (yychar == token::Function) yychar = token::Function_; }
+    : { if (yyla.empty()) driver.no_.Function = true; else if (yyla.type == yytranslate_(token::Function)) yyla.type = yytranslate_(token::Function_); }

     ;
 
 LexNoAtImplementation :
 @begin ObjectiveC
     ;
 
 LexNoAtImplementation :
 @begin ObjectiveC

-    { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+    { if (yyla.empty()) driver.no_.AtImplementation = true; else if (yyla.type == yytranslate_(token::AtImplementation)) yyla.type = yytranslate_(token::AtImplementation_); }

 @end
     ;
 
 @end
     ;
 


@@ -627,74 +608,77 @@ NewLineOpt
 
 Word
     : Identifier { $$ = $1; }
 
 Word
     : Identifier { $$ = $1; }

-    | "auto" { $$ = $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; } */
-    | "!in" { $$ = $1; }
-    /* XXX: | "instanceof" { $$ = $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; }
 
 
     // XXX: as it currently is not an Identifier
     | "let" { $$ = $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; }
+    | "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; }
     ;
 WordOpt
     : Word { $$ = $1; }
     | { $$ = NULL; }
     ;

+@end

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

-    | "implements" { $$ = $1; }
-    | "interface" { $$ = $1; }
-    | "package" { $$ = $1; }
-    | "private" { $$ = $1; }
-    | "protected" { $$ = $1; }
-    | "public" { $$ = $1; }
-    | "static" { $$ = $1; }
-

     | "abstract" { $$ = $1; }
     | "abstract" { $$ = $1; }

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

     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }
     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }
     | "boolean" { $$ = $1; }
     | "byte" { $$ = $1; }
     | "double" { $$ = $1; }
     | "final" { $$ = $1; }
     | "float" { $$ = $1; }
     | "goto" { $$ = $1; }

+    | "implements" { $$ = $1; }
+    | "interface" { $$ = $1; }

     | "native" { $$ = $1; }
     | "native" { $$ = $1; }

+    | "package" { $$ = $1; }
+    | "private" { $$ = $1; }
+    | "protected" { $$ = $1; }
+    | "public" { $$ = $1; }
+    | "static" { $$ = $1; }

     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }
     | "synchronized" { $$ = $1; }
     | "throws" { $$ = $1; }
     | "transient" { $$ = $1; }


@@ -702,7 +686,7 @@ IdentifierType
     // XXX: currently I only have this as Word
     // | "let" { $$ = $1; }
 
     // XXX: currently I only have this as Word
     // | "let" { $$ = $1; }
 

-    | "yield" { $$ = $1; }
+    | "yield" NewLineOpt { $$ = $1; }

 
     | "each" { $$ = $1; }
     | "of" { $$ = $1; }
 
     | "each" { $$ = $1; }
     | "of" { $$ = $1; }


@@ -716,13 +700,14 @@ Identifier
     | "short" { $$ = $1; }
     | "volatile" { $$ = $1; }
 @begin C
     | "short" { $$ = $1; }
     | "volatile" { $$ = $1; }
 @begin C

+    | "extern" { $$ = $1; }
+    | "signed" { $$ = $1; }

     | "typedef" { $$ = $1; }
     | "unsigned" { $$ = $1; }
     | "typedef" { $$ = $1; }
     | "unsigned" { $$ = $1; }

-    | "signed" { $$ = $1; }

 @end
 @begin ObjectiveC
 @end
 @begin ObjectiveC

-    | "YES" { $$ = $1; }

     | "NO" { $$ = $1; }
     | "NO" { $$ = $1; }

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

 @end
     ;
 
 @end
     ;
 


@@ -747,24 +732,24 @@ ValueLiteral
 /* }}} */
 /* 7.8.1 Null Literals {{{ */
 NullLiteral
 /* }}} */
 /* 7.8.1 Null Literals {{{ */
 NullLiteral

-    : "null" { $$ = $1; }
+    : "null" { $$ = CYNew CYNull(); }

     ;
 /* }}} */
 /* 7.8.2 Boolean Literals {{{ */
 BooleanLiteral
     ;
 /* }}} */
 /* 7.8.2 Boolean Literals {{{ */
 BooleanLiteral

-    : "true" { $$ = $1; }
-    | "false" { $$ = $1; }
+    : "true" { $$ = CYNew CYTrue(); }
+    | "false" { $$ = CYNew CYFalse(); }

     ;
 /* }}} */
 
 /* 7.9 Automatic Semicolon Insertion {{{ */
 StrictSemi
     ;
 /* }}} */
 
 /* 7.9 Automatic Semicolon Insertion {{{ */
 StrictSemi

-    : { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
+    : { driver.Warning(@$, "warning, automatic semi-colon insertion required"); }

     ;
 
 Terminator
     : ";"
     ;
 
 Terminator
     : ";"

-    | error { if (yychar != yyeof_ && yychar != token::CloseBrace && !yylval.newline_) YYABORT; else { yyerrok; driver.errors_.pop_back(); } } StrictSemi
+    | 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

     ;
 
 TerminatorOpt
     ;
 
 TerminatorOpt


@@ -775,12 +760,7 @@ TerminatorOpt
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical

-    : "(" LexPushInOff Expression ")" LexPopIn { $$ = $3; }
-    ;
-
-ParentheticalOpt
-    : Parenthetical { $$ = $1; }
-    | { $$ = NULL; }
+    : "(" LexPushInOff Expression ")" LexPopIn { $$ = CYNew CYParenthetical($3); }

     ;
 
 Variable
     ;
 
 Variable


@@ -788,7 +768,7 @@ Variable
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

-    : "this" { $$ = $1; }
+    : "this" { $$ = CYNew CYThis(); }

     | Variable { $$ = $1; }
     | Literal { $$ = $1; }
     | ArrayInitialiser { $$ = $1; }
     | Variable { $$ = $1; }
     | Literal { $$ = $1; }
     | ArrayInitialiser { $$ = $1; }


@@ -933,6 +913,7 @@ ArgumentList_
 
 ArgumentList
     : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); }
 
 ArgumentList
     : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); }

+    | LexSetRegExp Word ":" AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument($2, $4, $5); }

     ;
 
 ArgumentListOpt
     ;
 
 ArgumentListOpt


@@ -1068,13 +1049,9 @@ AssignmentExpression
     ;
 /* }}} */
 /* 11.14 Comma Operator {{{ */
     ;
 /* }}} */
 /* 11.14 Comma Operator {{{ */

-Expression_
-    : "," Expression { $$ = $2; }
-    | { $$ = NULL; }
-    ;
-

 Expression
 Expression

-    : AssignmentExpression Expression_ { $$ = CYNew CYCompound($1, $2); }
+    : AssignmentExpression { $$ = $1; }
+    | AssignmentExpression "," Expression { $$ = CYNew CYCompound($1, $3); }

     ;
 
 ExpressionOpt
     ;
 
 ExpressionOpt


@@ -1319,7 +1296,7 @@ LabelledStatement
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement
 /* }}} */
 /* 12.13 The throw Statement {{{ */
 ThrowStatement

-    : "throw" LexSetRegExp "\n" StrictSemi { YYABORT; }
+    : "throw" LexSetRegExp "\n" StrictSemi { error(@1, "throw without exception"); }

     | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }
     ;
 /* }}} */
     | "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }
     ;
 /* }}} */


@@ -1387,7 +1364,8 @@ ArrowFunction
 
 ArrowParameters
     : BindingIdentifier { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1)); }
 
 ArrowParameters
     : BindingIdentifier { $$ = CYNew CYFunctionParameter(CYNew CYDeclaration($1)); }

-    //| ParentheticalOpt { $$ = $1; }
+    | "(" LexPushInOff LexSetRegExp ")" LexPopIn { $$ = NULL; }
+    | Parenthetical { $$ = $1->expression_->Parameter(); if ($$ == NULL) error(@1, "invalid parameter list"); }

     ;
 
 ConciseBody
     ;
 
 ConciseBody


@@ -1412,30 +1390,18 @@ ProgramBodyOpt
 
 @begin C
 /* Cycript (C): Type Encoding {{{ */
 
 @begin C
 /* Cycript (C): Type Encoding {{{ */

-TypeParenthetical
-    : "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; }
-    ;
-

 TypeSignifier
 TypeSignifier

-    : IdentifierType { $$ = CYNew CYTypedIdentifier($1); }
-    | TypeParenthetical { $$ = $1; }
-    ;
-
-ArrayedType
-    : ArrayedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); }
-    | TypeSignifier { $$ = $1; }
-    | { $$ = CYNew CYTypedIdentifier(); }
-    ;
-
-FunctionedType
-    : "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = CYNew CYTypeFunctionWith($3); }
+    : IdentifierType { $$ = CYNew CYTypedIdentifier(@1, $1); }
+    | "(" LexPushInOff "*" TypeQualifierRight ")" LexPopIn { $$ = $4; }

     ;
 
 SuffixedType
     ;
 
 SuffixedType

-    : ArrayedType { $$ = $1; }
+    : SuffixedType "[" NumericLiteral "]" { $$ = $1; $$->modifier_ = CYNew CYTypeArrayOf($3, $$->modifier_); }

     | "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); }
     | "(" LexPushInOff "^" TypeQualifierRight ")" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn { $$ = $4; $$->modifier_ = CYNew CYTypeBlockWith($9, $$->modifier_); }

-    | TypeParenthetical FunctionedType { $$ = $1; CYSetLast($2) = $$->modifier_; $$->modifier_ = $2; }
-    | FunctionedType { $$ = CYNew CYTypedIdentifier(); CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
+    | 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
     ;
 
 PrefixedType


@@ -1481,12 +1447,8 @@ TypedIdentifier
     : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->specifier_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
     ;
 
     : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->specifier_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }
     ;
 

-EncodedType
-    : TypedIdentifier { $$ = CYNew CYEncodedType($1); }
-    ;
-

 PrimaryExpression
 PrimaryExpression

-    : "@encode" "(" EncodedType ")" { $$ = $3; }
+    : "@encode" "(" TypedIdentifier ")" { $$ = CYNew CYEncodedType($3); }

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


@@ -1500,7 +1462,7 @@ ClassSuperOpt
     ;
 
 ClassFieldListOpt
     ;
 
 ClassFieldListOpt

-    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $3); }
+    : TypedIdentifier ";" ClassFieldListOpt { $$ = CYNew CYClassField($1, $3); }

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


@@ -1514,12 +1476,12 @@ MessageScope
     ;
 
 TypeOpt
     ;
 
 TypeOpt

-    : "(" LexSetRegExp EncodedType ")" { $$ = $3; }
-    | { $$ = NULL; }
+    : "(" LexSetRegExp TypedIdentifier ")" { if ($3->identifier_ != NULL) error($3->location_, "unexpected identifier"); $$ = $3; }
+    | { $$ = CYNew CYTypedIdentifier(CYNew CYTypeVariable("id")); }

     ;
 
 MessageParameter
     ;
 
 MessageParameter

-    : Word ":" TypeOpt Identifier { $$ = CYNew CYMessageParameter($1, $3, $4); }
+    : Word ":" TypeOpt Identifier { $3->identifier_ = $4; $$ = CYNew CYMessageParameter($1, $3); }

     ;
 
 MessageParameterList
     ;
 
 MessageParameterList


@@ -1533,7 +1495,7 @@ MessageParameterListOpt
 
 MessageParameters
     : MessageParameterList { $$ = $1; }
 
 MessageParameters
     : MessageParameterList { $$ = $1; }

-    | Word { $$ = CYNew CYMessageParameter($1, NULL, NULL); }
+    | Word { $$ = CYNew CYMessageParameter($1, NULL); }

     ;
 
 ClassMessageDeclaration
     ;
 
 ClassMessageDeclaration


@@ -1613,7 +1575,7 @@ SelectorCall_
     ;
 
 SelectorCall
     ;
 
 SelectorCall

-    : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYBlank(), $3, $4); }
+    : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYWord(""), $3, $4); }

     ;
 
 SelectorList
     ;
 
 SelectorList


@@ -1674,16 +1636,16 @@ BoxableExpression
 
 PrimaryExpression
     : "@" BoxableExpression { $$ = CYNew CYBox($2); }
 
 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 {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): Block Expressions {{{ */

-ModifiedType
-    : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->specifier_ = $2; $$->modifier_ = $1; }
-    | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }
-    ;
-

 PrimaryExpression
 PrimaryExpression

-    : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }
+    : "^" 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 {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): Instance Literals {{{ */


@@ -1735,9 +1697,15 @@ PrimaryExpression
 /* }}} */
 /* Cycript (C): Type Definitions {{{ */
 Statement__
 /* }}} */
 /* Cycript (C): Type Definitions {{{ */
 Statement__

-    : "typedef" TypedIdentifier Terminator { $$ = CYNew CYTypeDefinition($2); }
+    : "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 {{{ */
 @end
 
 /* YUI: Documentation Comments {{{ */