Mark output from ?debug separate from the result.

[cycript.git] / Cycript.yy.in

diff --git a/Cycript.yy.in b/Cycript.yy.in
index 465dd45c8235880afb1a229e18b41909e135e39f..e1408da4ea74983595dcad480c5b09f186d0025f 100644 (file)
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1,20 +1,20 @@
 /* Cycript - Optimizing JavaScript Compiler/Runtime
 /* Cycript - Optimizing JavaScript Compiler/Runtime

- * Copyright (C) 2009-2012  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 <http://www.gnu.org/licenses/>.
 **/
 /* }}} */
  * along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
 **/
 /* }}} */


@@ -28,6 +28,7 @@
 @if Bison24 }
 
 @if Bison24 %code requires {
 @if Bison24 }
 
 @if Bison24 %code requires {

+#include "Driver.hpp"

 #include "Parser.hpp"
 #define CYNew new($pool)
 
 #include "Parser.hpp"
 #define CYNew new($pool)
 


@@ -71,6 +72,7 @@ typedef struct {
         CYInfix *infix_;
         CYLiteral *literal_;
         CYMember *member_;
         CYInfix *infix_;
         CYLiteral *literal_;
         CYMember *member_;

+        CYModule *module_;

         CYNull *null_;
         CYNumber *number_;
         CYProgram *program_;
         CYNull *null_;
         CYNumber *number_;
         CYProgram *program_;


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

-        CYTypeModifier *type_;
-        CYTypedIdentifier *typedIdentifier_;
-        CYTypedParameter *typedParameter_;

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


@@ -93,6 +92,9 @@ typedef struct {
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYSelectorPart *selector_;
         CYMessageParameter *messageParameter_;
         CYProtocol *protocol_;
         CYSelectorPart *selector_;

+        CYTypeModifier *modifier_;
+        CYTypedIdentifier *typedIdentifier_;
+        CYTypedParameter *typedParameter_;

 @end
 
 @begin E4X
 @end
 
 @begin E4X


@@ -223,10 +225,16 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token OpenBracket "["
 %token CloseBracket "]"
 
 %token OpenBracket "["
 %token CloseBracket "]"
 

+%token AtError "@error"
+

 @begin Java
 %token AtClass "@class"
 @end
 
 @begin Java
 %token AtClass "@class"
 @end
 

+@begin C
+%token <identifier_> Typedef "typedef"
+@end
+

 @begin ObjectiveC
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"
 @begin ObjectiveC
 %token AtImplementation "@implementation"
 %token AtImplementation_ ";@implementation"


@@ -234,6 +242,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %token AtEncode "@encode"
 %token AtEnd "@end"
 %token AtSelector "@selector"
 %token AtEncode "@encode"
 %token AtEnd "@end"
 %token AtSelector "@selector"

+%token <identifier_> Yes "YES"
+%token <identifier_> No "NO"

 @end
 
 %token <false_> False "false"
 @end
 
 %token <false_> False "false"


@@ -458,6 +468,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <expression_> Variable
 
 @begin ObjectiveC
 %type <expression_> Variable
 
 @begin ObjectiveC

+%type <typedIdentifier_> ArrayedType

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


@@ -473,16 +484,17 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <protocol_> ClassProtocols
 %type <protocol_> ClassProtocolsOpt
 %type <expression_> EncodedType
 %type <protocol_> ClassProtocols
 %type <protocol_> ClassProtocolsOpt
 %type <expression_> EncodedType

+%type <modifier_> FunctionedType

 %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 <typedIdentifier_> ModifiedType
+%type <module_> Module

 %type <typedIdentifier_> PrefixedType
 %type <expression_> PrimitiveType
 %type <typedIdentifier_> PrefixedType
 %type <expression_> PrimitiveType

-%type <type_> QualifiedType

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


@@ -492,6 +504,10 @@ int cylex(YYSTYPE *, cy::location *, void *);
 %type <word_> SelectorWordOpt
 %type <typedIdentifier_> SuffixedType
 %type <expression_> TypeOpt
 %type <word_> SelectorWordOpt
 %type <typedIdentifier_> SuffixedType
 %type <expression_> TypeOpt

+%type <typedIdentifier_> TypeParenthetical
+%type <modifier_> TypeQualifierLeft
+%type <typedIdentifier_> TypeQualifierRight
+%type <typedIdentifier_> TypeSignifier

 %type <typedIdentifier_> TypedIdentifier
 %type <typedParameter_> TypedParameterList_
 %type <typedParameter_> TypedParameterList
 %type <typedIdentifier_> TypedIdentifier
 %type <typedParameter_> TypedParameterList_
 %type <typedParameter_> TypedParameterList


@@ -557,8 +573,10 @@ LexNoFunction
     : { if (yychar == yyempty_) driver.no_.Function = true; else 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_; }
+LexNoAtImplementation :
+@begin ObjectiveC
+    { if (yychar == yyempty_) driver.no_.AtImplementation = true; else if (yychar == token::AtImplementation) yychar = token::AtImplementation_; }
+@end

     ;
 
 LexSetStatement
     ;
 
 LexSetStatement


@@ -640,6 +658,12 @@ WordOpt
 Identifier
     : Identifier_ { $$ = $1; }
 
 Identifier
     : Identifier_ { $$ = $1; }
 

+@begin C
+    | "typedef" { $$ = $1; }
+    | "YES" { $$ = $1; }
+    | "NO" { $$ = $1; }
+@end
+

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


@@ -723,7 +747,7 @@ TerminatorOpt
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical
 
 /* 11.1 Primary Expressions {{{ */
 Parenthetical

-    : "(" LexPushInOff Expression LexPopIn ")" { $$ = $3; }
+    : "(" LexPushInOff Expression ")" LexPopIn { $$ = $3; }

     ;
 
 ParentheticalOpt
     ;
 
 ParentheticalOpt


@@ -741,14 +765,13 @@ PrimaryExpression
     | Literal { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
     | Literal { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }

-    | FunctionExpression { $$ = $1; }

     | Parenthetical { $$ = $1; }
     | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
     ;
 /* }}} */
 /* 11.1.4.1 Array Initialiser {{{ */
 ArrayLiteral
     | Parenthetical { $$ = $1; }
     | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
     ;
 /* }}} */
 /* 11.1.4.1 Array Initialiser {{{ */
 ArrayLiteral

-    : "[" LexPushInOff ElementListOpt LexPopIn "]" { $$ = CYNew CYArray($3); }
+    : "[" LexPushInOff ElementListOpt "]" LexPopIn { $$ = CYNew CYArray($3); }

     ;
 
 Element
     ;
 
 Element


@@ -772,7 +795,7 @@ ElementListOpt
 /* }}} */
 /* 11.1.4.2 Array Comprehension {{{ */
 PrimaryExpression
 /* }}} */
 /* 11.1.4.2 Array Comprehension {{{ */
 PrimaryExpression

-    : "[" LexPushInOff AssignmentExpression ComprehensionForList LexPopIn "]" { $$ = CYNew CYArrayComprehension($3, $4); }
+    : "[" LexPushInOff AssignmentExpression ComprehensionForList "]" LexPopIn { $$ = CYNew CYArrayComprehension($3, $4); }

     ;
 
 ComprehensionForList
     ;
 
 ComprehensionForList


@@ -788,12 +811,12 @@ ComprehensionForListOpt
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral
 /* }}} */
 /* 11.1.5 Object Initialiser {{{ */
 ObjectLiteral

-    : BRACE LexPushInOff PropertyDefinitionListOpt LexPopIn "}" { $$ = CYNew CYObject($3); }
+    : BRACE LexPushInOff PropertyDefinitionListOpt "}" LexPopIn { $$ = CYNew CYObject($3); }

     ;
 
 PropertyDefinitionList_
     : "," PropertyDefinitionList { $$ = $2; }
     ;
 
 PropertyDefinitionList_
     : "," PropertyDefinitionList { $$ = $2; }

-    | "," { $$ = NULL; }
+    | "," LexSetRegExp { $$ = NULL; }

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


@@ -803,7 +826,7 @@ PropertyDefinitionList
 
 PropertyDefinitionListOpt
     : PropertyDefinitionList { $$ = $1; }
 
 PropertyDefinitionListOpt
     : PropertyDefinitionList { $$ = $1; }

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

     ;
 
 PropertyDefinition
     ;
 
 PropertyDefinition


@@ -826,7 +849,7 @@ PropertyName
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 MemberAccess
 
 /* 11.2 Left-Hand-Side Expressions {{{ */
 MemberAccess

-    : "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYDirectMember(NULL, $3); }
+    : "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYDirectMember(NULL, $3); }

     | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
     | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
     ;
     | "." IdentifierName { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
     | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
     ;


@@ -838,6 +861,7 @@ MemberExpression_
 
 MemberExpression
     : LexSetRegExp PrimaryExpression { $$ = $2; }
 
 MemberExpression
     : LexSetRegExp PrimaryExpression { $$ = $2; }

+    | LexSetRegExp FunctionExpression { $$ = $2; }

     | MemberExpression_ { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
     | LexSetRegExp "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($3, $4); }
     ;
     | MemberExpression_ { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
     | LexSetRegExp "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($3, $4); }
     ;


@@ -858,7 +882,7 @@ CallExpression
     ;
 
 Arguments
     ;
 
 Arguments

-    : "(" LexPushInOff ArgumentListOpt LexPopIn ")" { $$ = $3; }
+    : "(" LexPushInOff ArgumentListOpt ")" LexPopIn { $$ = $3; }

     ;
 
 ArgumentList_
     ;
 
 ArgumentList_


@@ -980,7 +1004,7 @@ LogicalORExpression
 /* 11.12 Conditional Operator ( ? : ) {{{ */
 ConditionalExpression
     : LogicalORExpression { $$ = $1; }
 /* 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 {{{ */
     ;
 /* }}} */
 /* 11.13 Assignment Operators {{{ */


@@ -1179,7 +1203,7 @@ IterationStatement
 /* }}} */
 /* 12.6.3 The for Statement {{{ */
 IterationStatement
 /* }}} */
 /* 12.6.3 The for Statement {{{ */
 IterationStatement

-    : "for" "(" LexPushInOn ForStatementInitialiser LexPopIn ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }
+    : "for" "(" LexPushInOn ForStatementInitialiser ";" LexPopIn ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($4, $7, $9, $11); }

     ;
 
 ForStatementInitialiser
     ;
 
 ForStatementInitialiser


@@ -1189,8 +1213,8 @@ ForStatementInitialiser
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */
 IterationStatement
 /* }}} */
 /* 12.6.4 The for-in and for-of Statements {{{ */
 IterationStatement

-    : "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForIn($4, $7, $9); }
-    | "for" "(" LexPushInOn ForInStatementInitialiser LexPopIn "of" Expression ")" Statement { $$ = CYNew CYForOf($4, $7, $9); }
+    : "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
     ;
 
 ForInStatementInitialiser


@@ -1284,7 +1308,7 @@ FunctionDeclaration
     ;
 
 FunctionExpression
     ;
 
 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_
     ;
 
 FormalParameterList_


@@ -1326,7 +1350,7 @@ ArrowParameters
 
 ConciseBody
     : AssignmentExpression { $$ = CYNew CYReturn($1); }
 
 ConciseBody
     : AssignmentExpression { $$ = CYNew CYReturn($1); }

-    | LexSetRegExp ";{" LexPushInOff FunctionBody LexPopIn "}" { $$ = $4; }
+    | LexSetRegExp ";{" LexPushInOff FunctionBody "}" LexPopIn { $$ = $4; }

     ;
 /* }}} */
 /* 14 Program {{{ */
     ;
 /* }}} */
 /* 14 Program {{{ */


@@ -1346,40 +1370,59 @@ ProgramBodyOpt
 
 @begin ObjectiveC
 /* Cycript (Objective-C): Type Encoding {{{ */
 
 @begin ObjectiveC
 /* Cycript (Objective-C): Type Encoding {{{ */

+TypeParenthetical
+    : "(" LexPushInOff PrefixedType ")" LexPopIn { $$ = $3; }
+    ;
+
+TypeSignifier
+    : Identifier { $$ = 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); }
+    ;
+

 SuffixedType
 SuffixedType

-    : IdentifierOpt { $$ = CYNew CYTypedIdentifier($1); }
-    | "(" LexPushInOff PrefixedType LexPopIn ")" { $$ = $3; }
-    | SuffixedType "[" NumericLiteral "]" { CYSetLast($1->type_) = CYNew CYTypeArrayOf($3->Value()); $$ = $1; }
+    : ArrayedType { $$ = $1; }
+    | "(" 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; }

     ;
 
 PrefixedType
     ;
 
 PrefixedType

-    : SuffixedType { $$ = $1; }
-    | "const" PrefixedType { CYSetLast($2->type_) = CYNew CYTypeConstant(); $$ = $2; }
-    | "*" PrefixedType { CYSetLast($2->type_) = CYNew CYTypePointerTo(); $$ = $2; }
+    : "*" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }

     ;
 
     ;
 

-PrimitiveType
-    : Variable { $$ = $1; }
-    | "void" { $$  = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); }
+TypeQualifierLeft
+    : "const" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeConstant(); }
+    /* XXX: | "volatile" TypeQualifierLeft { $$ = $2; CYSetLast($$) = CYNew CYTypeVolatile(); } */
+    | { $$ = NULL; }

     ;
 
     ;
 

-QualifiedType
-    : PrimitiveType { $$ = CYNew CYTypeVariable($1); }
-    | "const" QualifiedType { $$ = CYNew CYTypeConstant($2); }
+TypeQualifierRight
+    : "const" TypeQualifierRight { $$ = $2; $$->modifier_ = CYNew CYTypeConstant($$->modifier_); }
+    | PrefixedType { $$ = $1; }
+    | SuffixedType { $$ = $1; }

     ;
 
     ;
 

-ModifiedType
-    : QualifiedType { $$ = $1; }
-    | QualifiedType "*" { $$ = CYNew CYTypePointerTo($1); }
-    | QualifiedType "const" { $$ = CYNew CYTypeConstant($1); }
+PrimitiveType
+    : Variable { $$ = $1; }
+    | "void" { $$  = CYNew cy::Syntax::New(CYNew CYVariable(CYNew CYIdentifier("Type")), CYNew CYArgument(CYNew CYString("v"))); }

     ;
 
 TypedIdentifier
     ;
 
 TypedIdentifier

-    : QualifiedType PrefixedType { CYSetLast($2->type_) = $1; $$ = $2;}
+    : TypeQualifierLeft PrimitiveType TypeQualifierRight { $$ = $3; $$->type_ = $2; CYSetLast($1) = $$->modifier_; $$->modifier_ = $1; }

     ;
 
 EncodedType
     ;
 
 EncodedType

-    : TypedIdentifier { $$ = CYNew CYEncodedType($1->type_); }
+    : TypedIdentifier { $$ = CYNew CYEncodedType($1); }

     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression


@@ -1395,7 +1438,7 @@ ClassSuperOpt
 
 ClassFieldListOpt
     : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }
 
 ClassFieldListOpt
     : Expression Identifier ";" ClassFieldListOpt { $$ = CYNew CYField($1, $2, $4); }

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

     ;
 
 ClassFields
     ;
 
 ClassFields


@@ -1466,7 +1509,7 @@ ClassProtocolListOpt
     ;
 
 ClassExpression
     ;
 
 ClassExpression

-    : "@implementation" LexPushInOff ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFields 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
     ;
 
 ClassStatement


@@ -1516,8 +1559,8 @@ SelectorList
     ;
 
 MessageExpression
     ;
 
 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_
     ;
 
 SelectorExpression_


@@ -1536,24 +1579,17 @@ SelectorExpressionOpt
 
 PrimaryExpression
     : MessageExpression { $$ = $1; }
 
 PrimaryExpression
     : MessageExpression { $$ = $1; }

-    | "@selector" "(" LexPushInOff SelectorExpression LexPopIn ")" { $$ = CYNew CYSelector($4); }
+    | "@selector" "(" LexPushInOff SelectorExpression ")" LexPopIn { $$ = CYNew CYSelector($4); }

     ;
 /* }}} */
 /* Cycript (Objective-C): @import Directive {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): @import Directive {{{ */

-PathName
-    : "/" PathName
-    | "." PathName
-    | Word PathName
-    |
-    ;
-
-ImportPath
-    : "<" PathName ">"
-    | StringLiteral
+Module
+    : Module "." Word { $$ = CYNew CYModule($3, $1); }
+    | Word { $$ = CYNew CYModule($1); }

     ;
 
     ;
 

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

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


@@ -1565,6 +1601,8 @@ BoxableExpression
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
     | Parenthetical { $$ = $1; }
     | ArrayLiteral { $$ = $1; }
     | ObjectLiteral { $$ = $1; }
     | Parenthetical { $$ = $1; }

+    | "YES" { $$ = CYNew CYTrue(); }
+    | "NO" { $$ = CYNew CYFalse(); }

     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression


@@ -1572,22 +1610,13 @@ PrimaryExpression
     ;
 /* }}} */
 /* Cycript (Objective-C): Block Expressions {{{ */
     ;
 /* }}} */
 /* Cycript (Objective-C): Block Expressions {{{ */

-TypedParameterList_
-    : "," TypedParameterList { $$ = $2; }
-    | { $$ = NULL; }
-    ;
-
-TypedParameterList
-    : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); }
-    ;
-
-TypedParameterListOpt
-    : TypedParameterList { $$ = $1; }
-    | { $$ = NULL; }
+ModifiedType
+    : TypeQualifierLeft PrimitiveType { $$ = CYNew CYTypedIdentifier(); $$->type_ = $2; $$->modifier_ = $1; }
+    | ModifiedType "*" { $$ = $1; $$->modifier_ = CYNew CYTypePointerTo($$->modifier_); }

     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

-    : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt LexPopIn ")" BRACE LexPushInOff FunctionBody LexPopIn "}" { $$ = CYNew CYObjCBlock($2, $5, $10); }
+    : "^" ModifiedType "(" LexPushInOff TypedParameterListOpt ")" LexPopIn BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYObjCBlock($2, $5, $10); }

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


@@ -1613,6 +1642,30 @@ Var_
     : "auto"
     ;
 /* }}} */
     : "auto"
     ;
 /* }}} */

+/* Cycript (C): Lambda Expressions {{{ */
+TypedParameterList_
+    : "," TypedParameterList { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+TypedParameterList
+    : TypedIdentifier TypedParameterList_ { $$ = CYNew CYTypedParameter($1, $2); }
+    ;
+
+TypedParameterListOpt
+    : TypedParameterList { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+PrimaryExpression
+    : "[" LexPushInOff LexSetRegExp "&" LexSetRegExp "]" LexPopIn "(" LexPushInOff TypedParameterListOpt ")" LexPopIn "->" TypedIdentifier BRACE LexPushInOff FunctionBody "}" LexPopIn { $$ = CYNew CYLambda($14, $10, $17); }
+    ;
+/* }}} */
+/* Cycript (C): Type Definitions {{{ */
+Statement__
+    : "typedef" TypedIdentifier Terminator { $$ = CYNew CYTypeDefinition($2); }
+    ;
+/* }}} */

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


@@ -1688,7 +1741,7 @@ AttributeIdentifier
 
 PropertySelector_
     : PropertySelector { $$ = $1; }
 
 PropertySelector_
     : PropertySelector { $$ = $1; }

-    | "[" LexPushInOff Expression LexPopIn "]" { $$ = CYNew CYSelector($3); }
+    | "[" LexPushInOff Expression "]" LexPopIn { $$ = CYNew CYSelector($3); }

     ;
 
 PropertySelector
     ;
 
 PropertySelector


@@ -1718,8 +1771,8 @@ XMLInitialiser
     ;
 
 XMLElement
     ;
 
 XMLElement

-    : "<" LexPushInOff XMLTagContent LexPop LexPopIn "/>"
-    | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "</" LexSetXMLTag XMLTagName XMLWhitespaceOpt LexPop LexPopIn ">"
+    : "<" LexPushInOff XMLTagContent LexPop "/>" LexPopIn
+    | "<" LexPushInOff XMLTagContent ">" LexSetXMLContent XMLElementContentOpt "</" LexSetXMLTag XMLTagName XMLWhitespaceOpt LexPop ">" LexPopIn

     ;
 
 XMLTagContent
     ;
 
 XMLTagContent


@@ -1768,7 +1821,7 @@ XMLElementContentOpt
 /* }}} */
 /* 11.1.5 XMLList Initialiser {{{ */
 XMLListInitialiser
 /* }}} */
 /* 11.1.5 XMLList Initialiser {{{ */
 XMLListInitialiser

-    : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop LexPopIn "</>" { $$ = CYNew CYXMLList($4); }
+    : "<>" LexPushInOff LexPushXMLContent XMLElementContent LexPop "</>" LexPopIn { $$ = CYNew CYXMLList($4); }

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


@@ -1816,12 +1869,12 @@ ComprehensionListOpt
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

-    : "[" LexPushInOff AssignmentExpression ComprehensionList LexPopIn "]" { $$ = CYNew CYArrayComprehension($3, $4); }
+    : "[" LexPushInOff AssignmentExpression ComprehensionList "]" LexPopIn { $$ = CYNew CYArrayComprehension($3, $4); }

     ;
 /* }}} */
 /* JavaScript 1.7: for each {{{ */
 IterationStatement
     ;
 /* }}} */
 /* JavaScript 1.7: for each {{{ */
 IterationStatement

-    : "for" "each" "(" LexPushInOn ForInStatementInitialiser LexPopIn "!in" Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); }
+    : "for" "each" "(" LexPushInOn ForInStatementInitialiser "!in" LexPopIn Expression ")" Statement { $$ = CYNew CYForOf($5, $8, $10); }

     ;
 /* }}} */
 /* JavaScript 1.7: let Statements {{{ */
     ;
 /* }}} */
 /* JavaScript 1.7: let Statements {{{ */


@@ -1860,7 +1913,7 @@ RubyProcExpression
     ;
 
 PrimaryExpression
     ;
 
 PrimaryExpression

-    : "{" LexPushInOff RubyProcParameters StatementListOpt LexPopIn "}" { $$ = CYNew CYRubyProc($3, $4); }
+    : "{" LexPushInOff RubyProcParameters StatementListOpt "}" LexPopIn { $$ = CYNew CYRubyProc($3, $4); }

     ;
 
 CallExpression
     ;
 
 CallExpression