Drastic improvements to memory management, handle many more minimization corner cases...

[cycript.git] / Cycript.y

diff --git a/Cycript.y b/Cycript.y
index 31fd1bc9d49bbfde70725c235b1e5cc5b3c519be..e51a0ec95b40893081bea2a8886f93761dcbc14e 100644 (file)
--- a/Cycript.y
+++ b/Cycript.y
@@ -11,23 +11,29 @@ typedef struct {
     bool newline_;
 
     union {
     bool newline_;
 
     union {

+        bool bool_;
+

         CYArgument *argument_;
         CYBoolean *boolean_;
         CYClause *clause_;
         CYCatch *catch_;
         CYArgument *argument_;
         CYBoolean *boolean_;
         CYClause *clause_;
         CYCatch *catch_;

+        CYCompound *compound_;

         CYDeclaration *declaration_;
         CYDeclarations *declarations_;
         CYElement *element_;
         CYExpression *expression_;
         CYFalse *false_;
         CYDeclaration *declaration_;
         CYDeclarations *declarations_;
         CYElement *element_;
         CYExpression *expression_;
         CYFalse *false_;

+        CYField *field_;

         CYForInitialiser *for_;
         CYForInInitialiser *forin_;
         CYForInitialiser *for_;
         CYForInInitialiser *forin_;

+        CYFunctionParameter *functionParameter_;

         CYIdentifier *identifier_;
         CYLiteral *literal_;
         CYIdentifier *identifier_;
         CYLiteral *literal_;

+        CYMessage *message_;
+        CYMessageParameter *messageParameter_;

         CYName *name_;
         CYNull *null_;
         CYNumber *number_;
         CYName *name_;
         CYNull *null_;
         CYNumber *number_;

-        CYParameter *parameter_;

         CYProperty *property_;
         CYSelectorPart *selector_;
         CYSource *source_;
         CYProperty *property_;
         CYSelectorPart *selector_;
         CYSource *source_;


@@ -119,7 +125,9 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %token OpenBracket "["
 %token CloseBracket "]"
 
 %token OpenBracket "["
 %token CloseBracket "]"
 

+%token AtClass "@class"

 %token AtSelector "@selector"
 %token AtSelector "@selector"

+%token AtEnd "@end"

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


@@ -150,6 +158,38 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %token <word_> While "while"
 %token <word_> With "with"
 
 %token <word_> While "while"
 %token <word_> With "with"
 

+%token <word_> Abstract "abstract"
+%token <word_> Boolean "boolean"
+%token <word_> Byte "byte"
+%token <word_> Char "char"
+%token <word_> Class "class"
+%token <word_> Const "const"
+%token <word_> Debugger "debugger"
+%token <word_> Double "double"
+%token <word_> Enum "enum"
+%token <word_> Export "export"
+%token <word_> Extends "extends"
+%token <word_> Final "final"
+%token <word_> Float "float"
+%token <word_> Goto "goto"
+%token <word_> Implements "implements"
+%token <word_> Import "import"
+%token <word_> Int "int"
+%token <word_> Interface "interface"
+%token <word_> Long "long"
+%token <word_> Native "native"
+%token <word_> Package "package"
+%token <word_> Private "private"
+%token <word_> Protected "protected"
+%token <word_> Public "public"
+%token <word_> Short "short"
+%token <word_> Static "static"
+%token <word_> Super "super"
+%token <word_> Synchronized "synchronized"
+%token <word_> Throws "throws"
+%token <word_> Transient "transient"
+%token <word_> Volatile "volatile"
+

 %token <identifier_> Identifier
 %token <number_> NumericLiteral
 %token <string_> StringLiteral
 %token <identifier_> Identifier
 %token <number_> NumericLiteral
 %token <string_> StringLiteral


@@ -182,6 +222,11 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt
 %type <clause_> CaseClause
 %type <clause_> CaseClausesOpt
 %type <catch_> CatchOpt

+%type <source_> ClassDeclaration
+%type <message_> ClassMessageDeclaration
+%type <message_> ClassMessageDeclarationListOpt
+%type <expression_> ClassSuperOpt
+%type <field_> ClassFieldList

 %type <expression_> ConditionalExpression
 %type <expression_> ConditionalExpressionNoBF
 %type <expression_> ConditionalExpressionNoIn
 %type <expression_> ConditionalExpression
 %type <expression_> ConditionalExpressionNoBF
 %type <expression_> ConditionalExpressionNoIn


@@ -199,10 +244,10 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> EqualityExpressionNoIn
 %type <expression_> Expression
 %type <expression_> ExpressionOpt
 %type <expression_> EqualityExpressionNoIn
 %type <expression_> Expression
 %type <expression_> ExpressionOpt

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

 %type <expression_> ExpressionNoBF
 %type <expression_> ExpressionNoIn
 %type <expression_> ExpressionNoBF
 %type <expression_> ExpressionNoIn

-%type <expression_> ExpressionNoIn_
+%type <compound_> ExpressionNoIn_

 %type <expression_> ExpressionNoInOpt
 %type <statement_> ExpressionStatement
 %type <statement_> FinallyOpt
 %type <expression_> ExpressionNoInOpt
 %type <statement_> ExpressionStatement
 %type <statement_> FinallyOpt


@@ -210,8 +255,8 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <for_> ForStatementInitialiser
 %type <statement_> ForInStatement
 %type <forin_> ForInStatementInitialiser
 %type <for_> ForStatementInitialiser
 %type <statement_> ForInStatement
 %type <forin_> ForInStatementInitialiser

-%type <parameter_> FormalParameterList
-%type <parameter_> FormalParameterList_
+%type <functionParameter_> FormalParameterList
+%type <functionParameter_> FormalParameterList_

 %type <source_> FunctionBody
 %type <source_> FunctionDeclaration
 %type <expression_> FunctionExpression
 %type <source_> FunctionBody
 %type <source_> FunctionDeclaration
 %type <expression_> FunctionExpression


@@ -236,6 +281,11 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <expression_> MemberExpression
 %type <expression_> MemberExpression_
 %type <expression_> MemberExpressionNoBF
 %type <expression_> MemberExpression
 %type <expression_> MemberExpression_
 %type <expression_> MemberExpressionNoBF

+%type <messageParameter_> MessageParameter
+%type <messageParameter_> MessageParameters
+%type <messageParameter_> MessageParameterList
+%type <messageParameter_> MessageParameterListOpt
+%type <bool_> MessageScope

 %type <expression_> MultiplicativeExpression
 %type <expression_> MultiplicativeExpressionNoBF
 %type <expression_> NewExpression
 %type <expression_> MultiplicativeExpression
 %type <expression_> MultiplicativeExpressionNoBF
 %type <expression_> NewExpression


@@ -270,6 +320,7 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <statement_> SwitchStatement
 %type <statement_> ThrowStatement
 %type <statement_> TryStatement
 %type <statement_> SwitchStatement
 %type <statement_> ThrowStatement
 %type <statement_> TryStatement

+%type <expression_> TypeOpt

 %type <expression_> UnaryExpression
 %type <expression_> UnaryExpression_
 %type <expression_> UnaryExpressionNoBF
 %type <expression_> UnaryExpression
 %type <expression_> UnaryExpression_
 %type <expression_> UnaryExpressionNoBF


@@ -291,6 +342,19 @@ int cylex(YYSTYPE *lvalp, cy::location *llocp, void *scanner);
 %type <argument_> SelectorList
 %type <argument_> VariadicCall
 
 %type <argument_> SelectorList
 %type <argument_> VariadicCall
 

+%left "*" "/" "%"
+%left "+" "-"
+%left "<<" ">>" ">>>"
+%left "<" ">" "<=" ">=" "instanceof" "in"
+%left "==" "!=" "===" "!=="
+%left "&"
+%left "^"
+%left "|"
+%left "&&"
+%left "||"
+
+%right "=" "*=" "/=" "%=" "+=" "-=" "<<=" ">>=" ">>>=" "&=" "^=" "|="
+

 %nonassoc "if"
 %nonassoc "else"
 
 %nonassoc "if"
 %nonassoc "else"
 


@@ -327,32 +391,63 @@ WordOpt
 
 Word
     : Identifier { $$ = $1; }
 
 Word
     : Identifier { $$ = $1; }

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

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

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

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

+    | "char" { $$ = $1; }
+    | "class" { $$ = $1; }
+    | "const" { $$ = $1; }

     | "continue" NewLineOpt { $$ = $1; }
     | "continue" NewLineOpt { $$ = $1; }

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

     | "default" { $$ = $1; }
     | "delete" { $$ = $1; }
     | "do" { $$ = $1; }
     | "default" { $$ = $1; }
     | "delete" { $$ = $1; }
     | "do" { $$ = $1; }

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

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

+    | "enum" { $$ = $1; }
+    | "export" { $$ = $1; }
+    | "extends" { $$ = $1; }

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

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

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

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

     | "for" { $$ = $1; }
     | "function" { $$ = $1; }
     | "for" { $$ = $1; }
     | "function" { $$ = $1; }

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

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

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

     /* XXX: | "in" { $$ = $1; } */
     /* XXX: | "instanceof" { $$ = $1; } */
     /* XXX: | "in" { $$ = $1; } */
     /* XXX: | "instanceof" { $$ = $1; } */

+    | "int" { $$ = $1; }
+    | "interface" { $$ = $1; }
+    | "long" { $$ = $1; }
+    | "native" { $$ = $1; }

     | "new" { $$ = $1; }
     | "null" { $$ = $1; }
     | "new" { $$ = $1; }
     | "null" { $$ = $1; }

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

     | "return" NewLineOpt { $$ = $1; }
     | "return" NewLineOpt { $$ = $1; }

+    | "short" { $$ = $1; }
+    | "static" { $$ = $1; }
+    | "super" { $$ = $1; }

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

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

     | "this" { $$ = $1; }
     | "throw" NewLineOpt { $$ = $1; }
     | "this" { $$ = $1; }
     | "throw" NewLineOpt { $$ = $1; }

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

     | "true" { $$ = $1; }
     | "try" { $$ = $1; }
     | "typeof" { $$ = $1; }
     | "var" { $$ = $1; }
     | "void" { $$ = $1; }
     | "true" { $$ = $1; }
     | "try" { $$ = $1; }
     | "typeof" { $$ = $1; }
     | "var" { $$ = $1; }
     | "void" { $$ = $1; }

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

     | "while" { $$ = $1; }
     | "with" { $$ = $1; }
     ;
     | "while" { $$ = $1; }
     | "with" { $$ = $1; }
     ;


@@ -398,7 +493,7 @@ PrimaryExpressionNoBF
 /* }}} */
 /* 11.1.4 Array Initialiser {{{ */
 ArrayLiteral
 /* }}} */
 /* 11.1.4 Array Initialiser {{{ */
 ArrayLiteral

-    : "[" ElementList "]" { $$ = new(driver.pool_) CYArray($2); }
+    : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); }

     ;
 
 Element
     ;
 
 Element


@@ -791,12 +886,12 @@ AssignmentExpressionNoBF
     ;
 
 Expression_
     ;
 
 Expression_

-    : "," Expression { $$ = $2; }
+    : "," Expression { $$ = new(driver.pool_) CYCompound($2); }

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

-    : "," ExpressionNoIn { $$ = $2; }
+    : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); }

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


@@ -811,15 +906,15 @@ ExpressionNoInOpt
     ;
 
 Expression
     ;
 
 Expression

-    : AssignmentExpression Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+    : AssignmentExpression Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }

     ;
 
 ExpressionNoIn
     ;
 
 ExpressionNoIn

-    : AssignmentExpressionNoIn ExpressionNoIn_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+    : AssignmentExpressionNoIn ExpressionNoIn_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }

     ;
 
 ExpressionNoBF
     ;
 
 ExpressionNoBF

-    : AssignmentExpressionNoBF Expression_ { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+    : AssignmentExpressionNoBF Expression_ { if ($2) { $2->AddPrev($1); $$ = $2; } else $$ = $1; }

     ;
 
 Statement
     ;
 
 Statement


@@ -1024,7 +1119,7 @@ FormalParameterList_
     ;
 
 FormalParameterList
     ;
 
 FormalParameterList

-    : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYParameter($1, $2); }
+    : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYFunctionParameter($1, $2); }

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


@@ -1047,6 +1142,60 @@ SourceElement
     ;
 
 /* Objective-C Extensions {{{ */
     ;
 
 /* Objective-C Extensions {{{ */

+ClassSuperOpt
+    : ":" MemberExpressionNoBF { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+ClassFieldList
+    : "{" "}" { $$ = NULL; }
+    ;
+
+MessageScope
+    : "+" { $$ = false; }
+    | "-" { $$ = true; }
+    ;
+
+TypeOpt
+    : "(" Expression ")" { $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+MessageParameter
+    : Word ":" TypeOpt Identifier { $$ = new CYMessageParameter($1, $3, $4); }
+    ;
+
+MessageParameterListOpt
+    : MessageParameterList { $$ = $1; }
+    | { $$ = NULL; }
+    ;
+
+MessageParameterList
+    : MessageParameter MessageParameterListOpt { $1->SetNext($2); $$ = $1; }
+    ;
+
+MessageParameters
+    : MessageParameterList { $$ = $1; }
+    | Word { $$ = new CYMessageParameter($1, NULL, NULL); }
+    ;
+
+ClassMessageDeclaration
+    : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new CYMessage($1, $2, $3, $5); }
+    ;
+
+ClassMessageDeclarationListOpt
+    : ClassMessageDeclarationListOpt ClassMessageDeclaration { if ($1) { $1->SetNext($2); $$ = $1; } else $$ = $2; }
+    | { $$ = NULL; }
+    ;
+
+ClassDeclaration
+    : "@class" Identifier ClassSuperOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new CYClass($2, $3, $4, $5); }
+    ;
+
+SourceElement
+    : ClassDeclaration { $$ = $1; }
+    ;
+

 VariadicCall
     : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
     | { $$ = NULL; }
 VariadicCall
     : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
     | { $$ = NULL; }


@@ -1067,7 +1216,7 @@ SelectorList
     ;
 
 MessageExpression
     ;
 
 MessageExpression

-    : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYMessage($2, $3); }
+    : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYSend($2, $3); }

     ;
 
 SelectorExpressionOpt
     ;
 
 SelectorExpressionOpt