X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/7198f00397564ab468b47bdc23b378e2996e6e61..fb726fc55e2a79b03564be97d5057e28805d84f0:/Cycript.yy.in
diff --git a/Cycript.yy.in b/Cycript.yy.in
index 0181676..f289f76 100644
--- a/Cycript.yy.in
+++ b/Cycript.yy.in
@@ -1,40 +1,22 @@
-/* Cycript - Inlining/Optimizing JavaScript Compiler
- * Copyright (C) 2009 Jay Freeman (saurik)
+/* Cycript - Optimizing JavaScript Compiler/Runtime
+ * Copyright (C) 2009-2010 Jay Freeman (saurik)
*/
-/* Modified BSD License {{{ */
+/* GNU Lesser General Public License, Version 3 {{{ */
/*
- * Redistribution and use in source and binary
- * forms, with or without modification, are permitted
- * provided that the following conditions are met:
+ * 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.
*
- * 1. Redistributions of source code must retain the
- * above copyright notice, this list of conditions
- * and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the
- * above copyright notice, this list of conditions
- * and the following disclaimer in the documentation
- * and/or other materials provided with the
- * distribution.
- * 3. The name of the author may not be used to endorse
- * or promote products derived from this software
- * without specific prior written permission.
+ * 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.
*
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING,
- * BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR
- * TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
- * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with Cycript. If not, see .
+**/
/* }}} */
@if Bison23 %{
@@ -47,6 +29,7 @@
@if Bison24 %code requires {
#include "Parser.hpp"
+#define CYNew new($pool)
@begin ObjectiveC
#include "ObjectiveC/Syntax.hpp"
@@ -90,6 +73,7 @@ typedef struct {
CYProgram *program_;
CYProperty *property_;
CYPropertyName *propertyName_;
+ CYRubyProc *rubyProc_;
CYStatement *statement_;
CYString *string_;
CYThis *this_;
@@ -223,14 +207,22 @@ int cylex(YYSTYPE *, cy::location *, void *);
%token CloseParen ")"
%token OpenBrace "{"
+%token OpenBrace_ "\n{"
%token CloseBrace "}"
%token OpenBracket "["
%token CloseBracket "]"
+@begin Java
%token AtClass "@class"
-%token AtSelector "@selector"
+@end
+
+@begin ObjectiveC
+%token AtImplementation "@implementation"
+%token AtImport "@import"
%token AtEnd "@end"
+%token AtSelector "@selector"
+@end
%token False "false"
%token Null "null"
@@ -317,6 +309,8 @@ int cylex(YYSTYPE *, cy::location *, void *);
%token XML "xml"
@end
+%token AutoComplete
+
%token Identifier_
%token NumericLiteral
%token StringLiteral
@@ -442,6 +436,12 @@ int cylex(YYSTYPE *, cy::location *, void *);
%type RelationalExpressionNoIn
%type RelationalExpressionNoIn_
%type ReturnStatement
+%type RubyProcExpression
+%type RubyProcExpressionNoOA
+%type RubyProcParameterList
+%type RubyProcParameterList_
+%type RubyProcParameters
+%type RubyProcParametersOpt
%type ShiftExpression
%type ShiftExpressionNoBF
%type SourceElement
@@ -503,6 +503,7 @@ int cylex(YYSTYPE *, cy::location *, void *);
%type SelectorExpression_
%type SelectorExpressionOpt
%type SelectorList
+%type SelectorWordOpt
%type TypeOpt
%type VariadicCall
%type Word
@@ -561,6 +562,11 @@ LexSetRegExp
;
/* }}} */
+Brace
+ : "{"
+ | "\n{"
+ ;
+
StrictSemi
: { driver.Warning(yylloc, "warning, automatic semi-colon insertion required"); }
;
@@ -718,7 +724,8 @@ PrimaryExpressionNoRE
PrimaryExpressionNo
: "this" { $$ = $1; }
- | Identifier { $$ = new(driver.pool_) CYVariable($1); }
+ | Identifier { $$ = CYNew CYVariable($1); }
+ | AutoComplete { driver.mode_ = CYDriver::AutoPrimary; YYACCEPT; }
| Literal { $$ = $1; }
| ArrayLiteral { $$ = $1; }
| "(" Expression ")" { $$ = $2; }
@@ -730,7 +737,7 @@ PrimaryExpressionBF
/* }}} */
/* 11.1.4 Array Initialiser {{{ */
ArrayLiteral
- : "[" ElementListOpt "]" { $$ = new(driver.pool_) CYArray($2); }
+ : "[" ElementListOpt "]" { $$ = CYNew CYArray($2); }
;
Element
@@ -748,13 +755,13 @@ ElementListOpt
;
ElementList
- : ElementOpt "," ElementListOpt { $$ = new(driver.pool_) CYElement($1, $3); }
- | Element { $$ = new(driver.pool_) CYElement($1, NULL); }
+ : ElementOpt "," ElementListOpt { $$ = CYNew CYElement($1, $3); }
+ | Element { $$ = CYNew CYElement($1, NULL); }
;
/* }}} */
/* 11.1.5 Object Initialiser {{{ */
ObjectLiteral
- : "{" PropertyNameAndValueListOpt "}" { $$ = new(driver.pool_) CYObject($2); }
+ : Brace PropertyNameAndValueListOpt "}" { $$ = CYNew CYObject($2); }
;
PropertyNameAndValueList_
@@ -768,7 +775,7 @@ PropertyNameAndValueListOpt
;
PropertyNameAndValueList
- : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = new(driver.pool_) CYProperty($1, $3, $4); }
+ : PropertyName ":" AssignmentExpression PropertyNameAndValueList_ { $$ = CYNew CYProperty($1, $3, $4); }
;
PropertyName_
@@ -784,24 +791,25 @@ PropertyName
/* 11.2 Left-Hand-Side Expressions {{{ */
MemberExpression_
- : "new" MemberExpression Arguments { $$ = new(driver.pool_) CYNew($2, $3); }
+ : "new" MemberExpression Arguments { $$ = CYNew cy::Syntax::New($2, $3); }
;
MemberAccess
- : "[" Expression "]" { $$ = new(driver.pool_) CYDirectMember(NULL, $2); }
- | "." Identifier { $$ = new(driver.pool_) CYDirectMember(NULL, new(driver.pool_) CYString($2)); }
+ : "[" Expression "]" { $$ = CYNew CYDirectMember(NULL, $2); }
+ | "." Identifier { $$ = CYNew CYDirectMember(NULL, CYNew CYString($2)); }
+ | "." AutoComplete { driver.mode_ = CYDriver::AutoDirect; YYACCEPT; }
;
MemberExpression
: PrimaryExpression { $$ = $1; }
| LexSetRegExp FunctionExpression { $$ = $2; }
- | MemberExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
+ | MemberExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
| LexSetRegExp MemberExpression_ { $$ = $2; }
;
MemberExpressionNoBF
: PrimaryExpressionNoBF { $$ = $1; }
- | MemberExpressionNoBF MemberAccess { $2->SetLeft($1); $$ = $2; }
+ | MemberExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
| MemberExpression_ { $$ = $1; }
;
@@ -809,13 +817,13 @@ MemberExpressionNoBF
MemberExpressionNoRE
: PrimaryExpressionNoRE { $$ = $1; }
| FunctionExpression { $$ = $1; }
- | MemberExpressionNoRE MemberAccess { $2->SetLeft($1); $$ = $2; }
+ | MemberExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
| MemberExpression_ { $$ = $1; }
;
@end
NewExpression_
- : "new" NewExpression { $$ = new(driver.pool_) CYNew($2, NULL); }
+ : "new" NewExpression { $$ = CYNew cy::Syntax::New($2, NULL); }
;
NewExpression
@@ -836,22 +844,22 @@ NewExpressionNoRE
@end
CallExpression
- : MemberExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpression Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpression MemberAccess { $2->SetLeft($1); $$ = $2; }
+ : MemberExpression Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpression Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpression { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
;
CallExpressionNoBF
- : MemberExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpressionNoBF Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpressionNoBF MemberAccess { $2->SetLeft($1); $$ = $2; }
+ : MemberExpressionNoBF Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpressionNoBF Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpressionNoBF { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
;
@begin C
CallExpressionNoRE
- : MemberExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpressionNoRE Arguments { $$ = new(driver.pool_) CYCall($1, $2); }
- | CallExpressionNoRE MemberAccess { $2->SetLeft($1); $$ = $2; }
+ : MemberExpressionNoRE Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpressionNoRE Arguments { $$ = CYNew CYCall($1, $2); }
+ | CallExpressionNoRE { driver.context_ = $1; } MemberAccess { $3->SetLeft($1); $$ = $3; }
;
@end
@@ -866,7 +874,7 @@ ArgumentListOpt
;
ArgumentList
- : AssignmentExpression ArgumentList_ { $$ = new(driver.pool_) CYArgument(NULL, $1, $2); }
+ : AssignmentExpression ArgumentList_ { $$ = CYNew CYArgument(NULL, $1, $2); }
;
Arguments
@@ -893,37 +901,37 @@ LeftHandSideExpressionNoRE
/* 11.3 Postfix Expressions {{{ */
PostfixExpression
: AssigneeExpression { $$ = $1; }
- | LeftHandSideExpression "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
- | LeftHandSideExpression "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+ | LeftHandSideExpression "++" { $$ = CYNew CYPostIncrement($1); }
+ | LeftHandSideExpression "--" { $$ = CYNew CYPostDecrement($1); }
;
PostfixExpressionNoBF
: AssigneeExpressionNoBF { $$ = $1; }
- | LeftHandSideExpressionNoBF "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
- | LeftHandSideExpressionNoBF "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+ | LeftHandSideExpressionNoBF "++" { $$ = CYNew CYPostIncrement($1); }
+ | LeftHandSideExpressionNoBF "--" { $$ = CYNew CYPostDecrement($1); }
;
@begin C
PostfixExpressionNoRE
: AssigneeExpressionNoRE { $$ = $1; }
- | LeftHandSideExpressionNoRE "++" { $$ = new(driver.pool_) CYPostIncrement($1); }
- | LeftHandSideExpressionNoRE "--" { $$ = new(driver.pool_) CYPostDecrement($1); }
+ | LeftHandSideExpressionNoRE "++" { $$ = CYNew CYPostIncrement($1); }
+ | LeftHandSideExpressionNoRE "--" { $$ = CYNew CYPostDecrement($1); }
;
@end
/* }}} */
/* 11.4 Unary Operators {{{ */
UnaryExpression_
- : "delete" UnaryExpression { $$ = new(driver.pool_) CYDelete($2); }
- | "void" UnaryExpression { $$ = new(driver.pool_) CYVoid($2); }
- | "typeof" UnaryExpression { $$ = new(driver.pool_) CYTypeOf($2); }
- | "++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); }
- | "\n++" UnaryExpression { $$ = new(driver.pool_) CYPreIncrement($2); }
- | "--" UnaryExpression { $$ = new(driver.pool_) CYPreDecrement($2); }
- | "\n--" UnaryExpression { $$ = new(driver.pool_) CYPreDecrement($2); }
- | "+" UnaryExpression { $$ = new(driver.pool_) CYAffirm($2); }
- | "-" UnaryExpression { $$ = new(driver.pool_) CYNegate($2); }
- | "~" UnaryExpression { $$ = new(driver.pool_) CYBitwiseNot($2); }
- | "!" UnaryExpression { $$ = new(driver.pool_) CYLogicalNot($2); }
+ : "delete" UnaryExpression { $$ = CYNew CYDelete($2); }
+ | "void" UnaryExpression { $$ = CYNew CYVoid($2); }
+ | "typeof" UnaryExpression { $$ = CYNew CYTypeOf($2); }
+ | "++" UnaryExpression { $$ = CYNew CYPreIncrement($2); }
+ | "\n++" UnaryExpression { $$ = CYNew CYPreIncrement($2); }
+ | "--" UnaryExpression { $$ = CYNew CYPreDecrement($2); }
+ | "\n--" UnaryExpression { $$ = CYNew CYPreDecrement($2); }
+ | "+" UnaryExpression { $$ = CYNew CYAffirm($2); }
+ | "-" UnaryExpression { $$ = CYNew CYNegate($2); }
+ | "~" UnaryExpression { $$ = CYNew CYBitwiseNot($2); }
+ | "!" UnaryExpression { $$ = CYNew CYLogicalNot($2); }
;
UnaryExpression
@@ -946,58 +954,58 @@ UnaryExpressionNoRE
/* 11.5 Multiplicative Operators {{{ */
MultiplicativeExpression
: UnaryExpression { $$ = $1; }
- | MultiplicativeExpression "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
- | MultiplicativeExpression "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
- | MultiplicativeExpression "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
+ | MultiplicativeExpression "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); }
+ | MultiplicativeExpression "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); }
+ | MultiplicativeExpression "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); }
;
MultiplicativeExpressionNoBF
: UnaryExpressionNoBF { $$ = $1; }
- | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = new(driver.pool_) CYMultiply($1, $3); }
- | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = new(driver.pool_) CYDivide($1, $3); }
- | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = new(driver.pool_) CYModulus($1, $3); }
+ | MultiplicativeExpressionNoBF "*" UnaryExpression { $$ = CYNew CYMultiply($1, $3); }
+ | MultiplicativeExpressionNoBF "/" UnaryExpression { $$ = CYNew CYDivide($1, $3); }
+ | MultiplicativeExpressionNoBF "%" UnaryExpression { $$ = CYNew CYModulus($1, $3); }
;
/* }}} */
/* 11.6 Additive Operators {{{ */
AdditiveExpression
: MultiplicativeExpression { $$ = $1; }
- | AdditiveExpression "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
- | AdditiveExpression "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
+ | AdditiveExpression "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); }
+ | AdditiveExpression "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); }
;
AdditiveExpressionNoBF
: MultiplicativeExpressionNoBF { $$ = $1; }
- | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = new(driver.pool_) CYAdd($1, $3); }
- | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = new(driver.pool_) CYSubtract($1, $3); }
+ | AdditiveExpressionNoBF "+" MultiplicativeExpression { $$ = CYNew CYAdd($1, $3); }
+ | AdditiveExpressionNoBF "-" MultiplicativeExpression { $$ = CYNew CYSubtract($1, $3); }
;
/* }}} */
/* 11.7 Bitwise Shift Operators {{{ */
ShiftExpression
: AdditiveExpression { $$ = $1; }
- | ShiftExpression "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
- | ShiftExpression ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
- | ShiftExpression ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
+ | ShiftExpression "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); }
+ | ShiftExpression ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); }
+ | ShiftExpression ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); }
;
ShiftExpressionNoBF
: AdditiveExpressionNoBF { $$ = $1; }
- | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = new(driver.pool_) CYShiftLeft($1, $3); }
- | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightSigned($1, $3); }
- | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = new(driver.pool_) CYShiftRightUnsigned($1, $3); }
+ | ShiftExpressionNoBF "<<" AdditiveExpression { $$ = CYNew CYShiftLeft($1, $3); }
+ | ShiftExpressionNoBF ">>" AdditiveExpression { $$ = CYNew CYShiftRightSigned($1, $3); }
+ | ShiftExpressionNoBF ">>>" AdditiveExpression { $$ = CYNew CYShiftRightUnsigned($1, $3); }
;
/* }}} */
/* 11.8 Relational Operators {{{ */
RelationalExpressionNoIn_
- : "<" ShiftExpression { $$ = new(driver.pool_) CYLess(NULL, $2); }
- | ">" ShiftExpression { $$ = new(driver.pool_) CYGreater(NULL, $2); }
- | "<=" ShiftExpression { $$ = new(driver.pool_) CYLessOrEqual(NULL, $2); }
- | ">=" ShiftExpression { $$ = new(driver.pool_) CYGreaterOrEqual(NULL, $2); }
- | "instanceof" ShiftExpression { $$ = new(driver.pool_) CYInstanceOf(NULL, $2); }
+ : "<" ShiftExpression { $$ = CYNew CYLess(NULL, $2); }
+ | ">" ShiftExpression { $$ = CYNew CYGreater(NULL, $2); }
+ | "<=" ShiftExpression { $$ = CYNew CYLessOrEqual(NULL, $2); }
+ | ">=" ShiftExpression { $$ = CYNew CYGreaterOrEqual(NULL, $2); }
+ | "instanceof" ShiftExpression { $$ = CYNew CYInstanceOf(NULL, $2); }
;
RelationalExpression_
: RelationalExpressionNoIn_ { $$ = $1; }
- | "in" ShiftExpression { $$ = new(driver.pool_) CYIn(NULL, $2); }
+ | "in" ShiftExpression { $$ = CYNew CYIn(NULL, $2); }
;
RelationalExpression
@@ -1018,135 +1026,135 @@ RelationalExpressionNoBF
/* 11.9 Equality Operators {{{ */
EqualityExpression
: RelationalExpression { $$ = $1; }
- | EqualityExpression "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
- | EqualityExpression "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); }
- | EqualityExpression "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
- | EqualityExpression "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
+ | EqualityExpression "==" RelationalExpression { $$ = CYNew CYEqual($1, $3); }
+ | EqualityExpression "!=" RelationalExpression { $$ = CYNew CYNotEqual($1, $3); }
+ | EqualityExpression "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); }
+ | EqualityExpression "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); }
;
EqualityExpressionNoIn
: RelationalExpressionNoIn { $$ = $1; }
- | EqualityExpressionNoIn "==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYEqual($1, $3); }
- | EqualityExpressionNoIn "!=" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotEqual($1, $3); }
- | EqualityExpressionNoIn "===" RelationalExpressionNoIn { $$ = new(driver.pool_) CYIdentical($1, $3); }
- | EqualityExpressionNoIn "!==" RelationalExpressionNoIn { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
+ | EqualityExpressionNoIn "==" RelationalExpressionNoIn { $$ = CYNew CYEqual($1, $3); }
+ | EqualityExpressionNoIn "!=" RelationalExpressionNoIn { $$ = CYNew CYNotEqual($1, $3); }
+ | EqualityExpressionNoIn "===" RelationalExpressionNoIn { $$ = CYNew CYIdentical($1, $3); }
+ | EqualityExpressionNoIn "!==" RelationalExpressionNoIn { $$ = CYNew CYNotIdentical($1, $3); }
;
EqualityExpressionNoBF
: RelationalExpressionNoBF { $$ = $1; }
- | EqualityExpressionNoBF "==" RelationalExpression { $$ = new(driver.pool_) CYEqual($1, $3); }
- | EqualityExpressionNoBF "!=" RelationalExpression { $$ = new(driver.pool_) CYNotEqual($1, $3); }
- | EqualityExpressionNoBF "===" RelationalExpression { $$ = new(driver.pool_) CYIdentical($1, $3); }
- | EqualityExpressionNoBF "!==" RelationalExpression { $$ = new(driver.pool_) CYNotIdentical($1, $3); }
+ | EqualityExpressionNoBF "==" RelationalExpression { $$ = CYNew CYEqual($1, $3); }
+ | EqualityExpressionNoBF "!=" RelationalExpression { $$ = CYNew CYNotEqual($1, $3); }
+ | EqualityExpressionNoBF "===" RelationalExpression { $$ = CYNew CYIdentical($1, $3); }
+ | EqualityExpressionNoBF "!==" RelationalExpression { $$ = CYNew CYNotIdentical($1, $3); }
;
/* }}} */
/* 11.10 Binary Bitwise Operators {{{ */
BitwiseANDExpression
: EqualityExpression { $$ = $1; }
- | BitwiseANDExpression "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+ | BitwiseANDExpression "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); }
;
BitwiseANDExpressionNoIn
: EqualityExpressionNoIn { $$ = $1; }
- | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+ | BitwiseANDExpressionNoIn "&" EqualityExpressionNoIn { $$ = CYNew CYBitwiseAnd($1, $3); }
;
BitwiseANDExpressionNoBF
: EqualityExpressionNoBF { $$ = $1; }
- | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = new(driver.pool_) CYBitwiseAnd($1, $3); }
+ | BitwiseANDExpressionNoBF "&" EqualityExpression { $$ = CYNew CYBitwiseAnd($1, $3); }
;
BitwiseXORExpression
: BitwiseANDExpression { $$ = $1; }
- | BitwiseXORExpression "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+ | BitwiseXORExpression "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); }
;
BitwiseXORExpressionNoIn
: BitwiseANDExpressionNoIn { $$ = $1; }
- | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+ | BitwiseXORExpressionNoIn "^" BitwiseANDExpressionNoIn { $$ = CYNew CYBitwiseXOr($1, $3); }
;
BitwiseXORExpressionNoBF
: BitwiseANDExpressionNoBF { $$ = $1; }
- | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = new(driver.pool_) CYBitwiseXOr($1, $3); }
+ | BitwiseXORExpressionNoBF "^" BitwiseANDExpression { $$ = CYNew CYBitwiseXOr($1, $3); }
;
BitwiseORExpression
: BitwiseXORExpression { $$ = $1; }
- | BitwiseORExpression "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+ | BitwiseORExpression "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); }
;
BitwiseORExpressionNoIn
: BitwiseXORExpressionNoIn { $$ = $1; }
- | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+ | BitwiseORExpressionNoIn "|" BitwiseXORExpressionNoIn { $$ = CYNew CYBitwiseOr($1, $3); }
;
BitwiseORExpressionNoBF
: BitwiseXORExpressionNoBF { $$ = $1; }
- | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = new(driver.pool_) CYBitwiseOr($1, $3); }
+ | BitwiseORExpressionNoBF "|" BitwiseXORExpression { $$ = CYNew CYBitwiseOr($1, $3); }
;
/* }}} */
/* 11.11 Binary Logical Operators {{{ */
LogicalANDExpression
: BitwiseORExpression { $$ = $1; }
- | LogicalANDExpression "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+ | LogicalANDExpression "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); }
;
LogicalANDExpressionNoIn
: BitwiseORExpressionNoIn { $$ = $1; }
- | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+ | LogicalANDExpressionNoIn "&&" BitwiseORExpressionNoIn { $$ = CYNew CYLogicalAnd($1, $3); }
;
LogicalANDExpressionNoBF
: BitwiseORExpressionNoBF { $$ = $1; }
- | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = new(driver.pool_) CYLogicalAnd($1, $3); }
+ | LogicalANDExpressionNoBF "&&" BitwiseORExpression { $$ = CYNew CYLogicalAnd($1, $3); }
;
LogicalORExpression
: LogicalANDExpression { $$ = $1; }
- | LogicalORExpression "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+ | LogicalORExpression "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); }
;
LogicalORExpressionNoIn
: LogicalANDExpressionNoIn { $$ = $1; }
- | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+ | LogicalORExpressionNoIn "||" LogicalANDExpressionNoIn { $$ = CYNew CYLogicalOr($1, $3); }
;
LogicalORExpressionNoBF
: LogicalANDExpressionNoBF { $$ = $1; }
- | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = new(driver.pool_) CYLogicalOr($1, $3); }
+ | LogicalORExpressionNoBF "||" LogicalANDExpression { $$ = CYNew CYLogicalOr($1, $3); }
;
/* }}} */
/* 11.12 Conditional Operator ( ? : ) {{{ */
ConditionalExpression
: LogicalORExpression { $$ = $1; }
- | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ | LogicalORExpression "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); }
;
ConditionalExpressionNoIn
: LogicalORExpressionNoIn { $$ = $1; }
- | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ | LogicalORExpressionNoIn "?" AssignmentExpression ":" AssignmentExpressionNoIn { $$ = CYNew CYCondition($1, $3, $5); }
;
ConditionalExpressionNoBF
: LogicalORExpressionNoBF { $$ = $1; }
- | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = new(driver.pool_) CYCondition($1, $3, $5); }
+ | LogicalORExpressionNoBF "?" AssignmentExpression ":" AssignmentExpression { $$ = CYNew CYCondition($1, $3, $5); }
;
/* }}} */
/* 11.13 Assignment Operators {{{ */
AssignmentExpression_
- : "=" AssignmentExpression { $$ = new(driver.pool_) CYAssign(NULL, $2); }
- | "*=" AssignmentExpression { $$ = new(driver.pool_) CYMultiplyAssign(NULL, $2); }
- | "/=" AssignmentExpression { $$ = new(driver.pool_) CYDivideAssign(NULL, $2); }
- | "%=" AssignmentExpression { $$ = new(driver.pool_) CYModulusAssign(NULL, $2); }
- | "+=" AssignmentExpression { $$ = new(driver.pool_) CYAddAssign(NULL, $2); }
- | "-=" AssignmentExpression { $$ = new(driver.pool_) CYSubtractAssign(NULL, $2); }
- | "<<=" AssignmentExpression { $$ = new(driver.pool_) CYShiftLeftAssign(NULL, $2); }
- | ">>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightSignedAssign(NULL, $2); }
- | ">>>=" AssignmentExpression { $$ = new(driver.pool_) CYShiftRightUnsignedAssign(NULL, $2); }
- | "&=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseAndAssign(NULL, $2); }
- | "^=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseXOrAssign(NULL, $2); }
- | "|=" AssignmentExpression { $$ = new(driver.pool_) CYBitwiseOrAssign(NULL, $2); }
+ : "=" AssignmentExpression { $$ = CYNew CYAssign(NULL, $2); }
+ | "*=" AssignmentExpression { $$ = CYNew CYMultiplyAssign(NULL, $2); }
+ | "/=" AssignmentExpression { $$ = CYNew CYDivideAssign(NULL, $2); }
+ | "%=" AssignmentExpression { $$ = CYNew CYModulusAssign(NULL, $2); }
+ | "+=" AssignmentExpression { $$ = CYNew CYAddAssign(NULL, $2); }
+ | "-=" AssignmentExpression { $$ = CYNew CYSubtractAssign(NULL, $2); }
+ | "<<=" AssignmentExpression { $$ = CYNew CYShiftLeftAssign(NULL, $2); }
+ | ">>=" AssignmentExpression { $$ = CYNew CYShiftRightSignedAssign(NULL, $2); }
+ | ">>>=" AssignmentExpression { $$ = CYNew CYShiftRightUnsignedAssign(NULL, $2); }
+ | "&=" AssignmentExpression { $$ = CYNew CYBitwiseAndAssign(NULL, $2); }
+ | "^=" AssignmentExpression { $$ = CYNew CYBitwiseXOrAssign(NULL, $2); }
+ | "|=" AssignmentExpression { $$ = CYNew CYBitwiseOrAssign(NULL, $2); }
;
AssigneeExpression
@@ -1177,18 +1185,18 @@ AssignmentExpression
AssignmentExpressionNoIn
: ConditionalExpressionNoIn { $$ = $1; }
- | AssigneeExpression "=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAssign($1, $3); }
- | AssigneeExpression "*=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYMultiplyAssign($1, $3); }
- | AssigneeExpression "/=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYDivideAssign($1, $3); }
- | AssigneeExpression "%=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYModulusAssign($1, $3); }
- | AssigneeExpression "+=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYAddAssign($1, $3); }
- | AssigneeExpression "-=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYSubtractAssign($1, $3); }
- | AssigneeExpression "<<=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftLeftAssign($1, $3); }
- | AssigneeExpression ">>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightSignedAssign($1, $3); }
- | AssigneeExpression ">>>=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYShiftRightUnsignedAssign($1, $3); }
- | AssigneeExpression "&=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseAndAssign($1, $3); }
- | AssigneeExpression "^=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseXOrAssign($1, $3); }
- | AssigneeExpression "|=" AssignmentExpressionNoIn { $$ = new(driver.pool_) CYBitwiseOrAssign($1, $3); }
+ | AssigneeExpression "=" AssignmentExpressionNoIn { $$ = CYNew CYAssign($1, $3); }
+ | AssigneeExpression "*=" AssignmentExpressionNoIn { $$ = CYNew CYMultiplyAssign($1, $3); }
+ | AssigneeExpression "/=" AssignmentExpressionNoIn { $$ = CYNew CYDivideAssign($1, $3); }
+ | AssigneeExpression "%=" AssignmentExpressionNoIn { $$ = CYNew CYModulusAssign($1, $3); }
+ | AssigneeExpression "+=" AssignmentExpressionNoIn { $$ = CYNew CYAddAssign($1, $3); }
+ | AssigneeExpression "-=" AssignmentExpressionNoIn { $$ = CYNew CYSubtractAssign($1, $3); }
+ | AssigneeExpression "<<=" AssignmentExpressionNoIn { $$ = CYNew CYShiftLeftAssign($1, $3); }
+ | AssigneeExpression ">>=" AssignmentExpressionNoIn { $$ = CYNew CYShiftRightSignedAssign($1, $3); }
+ | AssigneeExpression ">>>=" AssignmentExpressionNoIn { $$ = CYNew CYShiftRightUnsignedAssign($1, $3); }
+ | AssigneeExpression "&=" AssignmentExpressionNoIn { $$ = CYNew CYBitwiseAndAssign($1, $3); }
+ | AssigneeExpression "^=" AssignmentExpressionNoIn { $$ = CYNew CYBitwiseXOrAssign($1, $3); }
+ | AssigneeExpression "|=" AssignmentExpressionNoIn { $$ = CYNew CYBitwiseOrAssign($1, $3); }
;
AssignmentExpressionNoBF
@@ -1198,12 +1206,12 @@ AssignmentExpressionNoBF
/* }}} */
/* 11.14 Comma Operator {{{ */
Expression_
- : "," Expression { $$ = new(driver.pool_) CYCompound($2); }
+ : "," Expression { $$ = CYNew CYCompound($2); }
| { $$ = NULL; }
;
ExpressionNoIn_
- : "," ExpressionNoIn { $$ = new(driver.pool_) CYCompound($2); }
+ : "," ExpressionNoIn { $$ = CYNew CYCompound($2); }
| { $$ = NULL; }
;
@@ -1254,11 +1262,11 @@ Statement
/* }}} */
/* 12.1 Block {{{ */
Block_
- : "{" StatementListOpt "}" { $$ = $2; }
+ : Brace StatementListOpt "}" { $$ = $2; }
;
Block
- : Block_ { if ($1) $$ = new(driver.pool_) CYBlock($1); else $$ = new(driver.pool_) CYEmpty(); }
+ : Block_ { $$ = CYNew CYBlock($1); }
;
StatementList
@@ -1272,7 +1280,7 @@ StatementListOpt
/* }}} */
/* 12.2 Variable Statement {{{ */
VariableStatement
- : "var" VariableDeclarationList Terminator { $$ = new(driver.pool_) CYVar($2); }
+ : "var" VariableDeclarationList Terminator { $$ = CYNew CYVar($2); }
;
VariableDeclarationList_
@@ -1286,19 +1294,19 @@ VariableDeclarationListNoIn_
;
VariableDeclarationList
- : VariableDeclaration VariableDeclarationList_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
+ : VariableDeclaration VariableDeclarationList_ { $$ = CYNew CYDeclarations($1, $2); }
;
VariableDeclarationListNoIn
- : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = new(driver.pool_) CYDeclarations($1, $2); }
+ : VariableDeclarationNoIn VariableDeclarationListNoIn_ { $$ = CYNew CYDeclarations($1, $2); }
;
VariableDeclaration
- : Identifier InitialiserOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
+ : Identifier InitialiserOpt { $$ = CYNew CYDeclaration($1, $2); }
;
VariableDeclarationNoIn
- : Identifier InitialiserNoInOpt { $$ = new(driver.pool_) CYDeclaration($1, $2); }
+ : Identifier InitialiserNoInOpt { $$ = CYNew CYDeclaration($1, $2); }
;
InitialiserOpt
@@ -1321,12 +1329,12 @@ InitialiserNoIn
/* }}} */
/* 12.3 Empty Statement {{{ */
EmptyStatement
- : ";" { $$ = new(driver.pool_) CYEmpty(); }
+ : ";" { $$ = CYNew CYEmpty(); }
;
/* }}} */
/* 12.4 Expression Statement {{{ */
ExpressionStatement
- : ExpressionNoBF Terminator { $$ = new(driver.pool_) CYExpress($1); }
+ : ExpressionNoBF Terminator { $$ = CYNew CYExpress($1); }
;
/* }}} */
/* 12.5 The if Statement {{{ */
@@ -1336,7 +1344,7 @@ ElseStatementOpt
;
IfStatement
- : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = new(driver.pool_) CYIf($3, $5, $6); }
+ : "if" "(" Expression ")" Statement ElseStatementOpt { $$ = CYNew CYIf($3, $5, $6); }
;
/* }}} */
@@ -1350,17 +1358,17 @@ IterationStatement
/* }}} */
/* 12.6.1 The do-while Statement {{{ */
DoWhileStatement
- : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = new(driver.pool_) CYDoWhile($5, $2); }
+ : "do" Statement "while" "(" Expression ")" TerminatorOpt { $$ = CYNew CYDoWhile($5, $2); }
;
/* }}} */
/* 12.6.2 The while Statement {{{ */
WhileStatement
- : "while" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWhile($3, $5); }
+ : "while" "(" Expression ")" Statement { $$ = CYNew CYWhile($3, $5); }
;
/* }}} */
/* 12.6.3 The for Statement {{{ */
ForStatement
- : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = new(driver.pool_) CYFor($3, $5, $7, $9); }
+ : "for" "(" ForStatementInitialiser ";" ExpressionOpt ";" ExpressionOpt ")" Statement { $$ = CYNew CYFor($3, $5, $7, $9); }
;
ForStatementInitialiser
@@ -1370,7 +1378,7 @@ ForStatementInitialiser
/* }}} */
/* 12.6.4 The for-in Statement {{{ */
ForInStatement
- : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForIn($3, $5, $7); }
+ : "for" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForIn($3, $5, $7); }
;
ForInStatementInitialiser
@@ -1381,32 +1389,32 @@ ForInStatementInitialiser
/* 12.7 The continue Statement {{{ */
ContinueStatement
- : "continue" IdentifierOpt Terminator { $$ = new(driver.pool_) CYContinue($2); }
+ : "continue" IdentifierOpt Terminator { $$ = CYNew CYContinue($2); }
;
/* }}} */
/* 12.8 The break Statement {{{ */
BreakStatement
- : "break" IdentifierOpt Terminator { $$ = new(driver.pool_) CYBreak($2); }
+ : "break" IdentifierOpt Terminator { $$ = CYNew CYBreak($2); }
;
/* }}} */
/* 12.9 The return Statement {{{ */
ReturnStatement
- : "return" ExpressionOpt Terminator { $$ = new(driver.pool_) CYReturn($2); }
+ : "return" ExpressionOpt Terminator { $$ = CYNew CYReturn($2); }
;
/* }}} */
/* 12.10 The with Statement {{{ */
WithStatement
- : "with" "(" Expression ")" Statement { $$ = new(driver.pool_) CYWith($3, $5); }
+ : "with" "(" Expression ")" Statement { $$ = CYNew CYWith($3, $5); }
;
/* }}} */
/* 12.11 The switch Statement {{{ */
SwitchStatement
- : "switch" "(" Expression ")" CaseBlock { $$ = new(driver.pool_) CYSwitch($3, $5); }
+ : "switch" "(" Expression ")" CaseBlock { $$ = CYNew CYSwitch($3, $5); }
;
CaseBlock
- : "{" CaseClausesOpt "}" { $$ = $2; }
+ : Brace CaseClausesOpt "}" { $$ = $2; }
;
CaseClausesOpt
@@ -1416,46 +1424,46 @@ CaseClausesOpt
;
CaseClause
- : "case" Expression ":" StatementListOpt { $$ = new(driver.pool_) CYClause($2, $4); }
+ : "case" Expression ":" StatementListOpt { $$ = CYNew CYClause($2, $4); }
;
DefaultClause
- : "default" ":" StatementListOpt { $$ = new(driver.pool_) CYClause(NULL, $3); }
+ : "default" ":" StatementListOpt { $$ = CYNew CYClause(NULL, $3); }
;
/* }}} */
/* 12.12 Labelled Statements {{{ */
LabelledStatement
- : Identifier ":" Statement { $$ = new(driver.pool_) CYLabel($1, $3); }
+ : Identifier ":" Statement { $$ = CYNew CYLabel($1, $3); }
;
/* }}} */
/* 12.13 The throw Statement {{{ */
ThrowStatement
- : "throw" Expression Terminator { $$ = new(driver.pool_) cy::Syntax::Throw($2); }
+ : "throw" Expression Terminator { $$ = CYNew cy::Syntax::Throw($2); }
;
/* }}} */
/* 12.14 The try Statement {{{ */
TryStatement
- : "try" Block_ CatchOpt FinallyOpt { $$ = new(driver.pool_) cy::Syntax::Try($2, $3, $4); }
+ : "try" Block_ CatchOpt FinallyOpt { $$ = CYNew cy::Syntax::Try($2, $3, $4); }
;
CatchOpt
- : "catch" "(" Identifier ")" Block_ { $$ = new(driver.pool_) cy::Syntax::Catch($3, $5); }
+ : "catch" "(" Identifier ")" Block_ { $$ = CYNew cy::Syntax::Catch($3, $5); }
| { $$ = NULL; }
;
FinallyOpt
- : "finally" Block_ { $$ = new(driver.pool_) CYFinally($2); }
+ : "finally" Block_ { $$ = CYNew CYFinally($2); }
| { $$ = NULL; }
;
/* }}} */
/* 13 Function Definition {{{ */
FunctionDeclaration
- : "function" Identifier "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionStatement($2, $4, $7); }
+ : "function" Identifier "(" FormalParameterList ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionStatement($2, $4, $7); }
;
FunctionExpression
- : "function" IdentifierOpt "(" FormalParameterList ")" "{" FunctionBody "}" { $$ = new(driver.pool_) CYFunctionExpression($2, $4, $7); }
+ : "function" IdentifierOpt "(" FormalParameterList ")" Brace FunctionBody "}" { $$ = CYNew CYFunctionExpression($2, $4, $7); }
;
FormalParameterList_
@@ -1464,7 +1472,7 @@ FormalParameterList_
;
FormalParameterList
- : Identifier FormalParameterList_ { $$ = new(driver.pool_) CYFunctionParameter($1, $2); }
+ : Identifier FormalParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); }
| { $$ = NULL; }
;
@@ -1474,7 +1482,7 @@ FunctionBody
/* }}} */
/* 14 Program {{{ */
Program
- : SourceElements { driver.program_ = new(driver.pool_) CYProgram($1); }
+ : SourceElements { driver.program_ = CYNew CYProgram($1); }
;
SourceElements
@@ -1500,8 +1508,17 @@ ClassSuperOpt
| { $$ = NULL; }
;
+ClassField
+ : Expression Identifier ";"
+ ;
+
+ClassFieldListOpt
+ : ClassFieldListOpt ClassField
+ |
+ ;
+
ClassFieldList
- : "{" "}" { $$ = NULL; }
+ : Brace ClassFieldListOpt "}" { $$ = NULL; }
;
MessageScope
@@ -1511,11 +1528,12 @@ MessageScope
TypeOpt
: "(" Expression ")" { $$ = $2; }
+ | "(" LexSetRegExp "void" ")" { $$ = NULL; }
| { $$ = NULL; }
;
MessageParameter
- : Word ":" TypeOpt Identifier { $$ = new(driver.pool_) CYMessageParameter($1, $3, $4); }
+ : Word ":" TypeOpt Identifier { $$ = CYNew CYMessageParameter($1, $3, $4); }
;
MessageParameterListOpt
@@ -1529,15 +1547,16 @@ MessageParameterList
MessageParameters
: MessageParameterList { $$ = $1; }
- | Word { $$ = new(driver.pool_) CYMessageParameter($1, NULL, NULL); }
+ | Word { $$ = CYNew CYMessageParameter($1, NULL, NULL); }
;
ClassMessageDeclaration
- : MessageScope TypeOpt MessageParameters "{" FunctionBody "}" { $$ = new(driver.pool_) CYMessage($1, $2, $3, $5); }
+ : MessageScope TypeOpt MessageParameters Brace FunctionBody "}" { $$ = CYNew CYMessage($1, $2, $3, $5); }
;
ClassMessageDeclarationListOpt
: ClassMessageDeclarationListOpt ClassMessageDeclaration { $2->SetNext($1); $$ = $2; }
+ | ClassMessageDeclarationListOpt Comment { $$ = $1; }
| { $$ = NULL; }
;
@@ -1553,7 +1572,7 @@ ClassNameOpt
// XXX: this should be AssignmentExpressionNoRight
ClassProtocols
- : ShiftExpression ClassProtocolsOpt { $$ = new(driver.pool_) CYProtocol($1, $2); }
+ : ShiftExpression ClassProtocolsOpt { $$ = CYNew CYProtocol($1, $2); }
;
ClassProtocolsOpt
@@ -1567,15 +1586,19 @@ ClassProtocolListOpt
;
ClassExpression
- : "@class" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassExpression($2, $3, $4, $5, $6); }
+ : "@implementation" ClassNameOpt ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassExpression($2, $3, $4, $5, $6); }
;
ClassStatement
- : "@class" ClassName ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYClassStatement($2, $3, $4, $5, $6); }
+ : "@implementation" ClassName ClassSuperOpt ClassProtocolListOpt ClassFieldList ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYClassStatement($2, $3, $4, $5, $6); }
+ ;
+
+CategoryName
+ : "(" WordOpt ")"
;
CategoryStatement
- : "@class" ClassName ClassMessageDeclarationListOpt "@end" { $$ = new(driver.pool_) CYCategory($2, $3); }
+ : "@implementation" ClassName CategoryName ClassMessageDeclarationListOpt "@end" { $$ = CYNew CYCategory($2, $4); }
;
PrimaryExpressionBF
@@ -1589,7 +1612,7 @@ Statement_
/* }}} */
/* Cycript (Objective-C): Send Message {{{ */
VariadicCall
- : "," AssignmentExpression VariadicCall { $$ = new(driver.pool_) CYArgument(NULL, $2, $3); }
+ : "," AssignmentExpression VariadicCall { $$ = CYNew CYArgument(NULL, $2, $3); }
| { $$ = NULL; }
;
@@ -1598,18 +1621,23 @@ SelectorCall_
| VariadicCall { $$ = $1; }
;
+SelectorWordOpt
+ : WordOpt { driver.contexts_.back().words_.push_back($1); } { $$ = $1; }
+ | AutoComplete { driver.mode_ = CYDriver::AutoMessage; YYACCEPT; }
+ ;
+
SelectorCall
- : WordOpt ":" AssignmentExpression SelectorCall_ { $$ = new(driver.pool_) CYArgument($1 ?: new(driver.pool_) CYBlank(), $3, $4); }
+ : SelectorWordOpt ":" AssignmentExpression SelectorCall_ { $$ = CYNew CYArgument($1 ?: CYNew CYBlank(), $3, $4); }
;
SelectorList
: SelectorCall { $$ = $1; }
- | Word { $$ = new(driver.pool_) CYArgument($1, NULL); }
+ | Word { $$ = CYNew CYArgument($1, NULL); }
;
MessageExpression
- : "[" AssignmentExpression SelectorList "]" { $$ = new(driver.pool_) CYSendDirect($2, $3); }
- | "[" LexSetRegExp "super" SelectorList "]" { $$ = new(driver.pool_) CYSendSuper($4); }
+ : "[" AssignmentExpression { driver.contexts_.push_back($2); } SelectorList "]" { driver.contexts_.pop_back(); } { $$ = CYNew CYSendDirect($2, $4); }
+ | "[" LexSetRegExp "super" { driver.context_ = NULL; } SelectorList "]" { $$ = CYNew CYSendSuper($5); }
;
SelectorExpressionOpt
@@ -1618,17 +1646,34 @@ SelectorExpressionOpt
;
SelectorExpression_
- : WordOpt ":" SelectorExpressionOpt { $$ = new(driver.pool_) CYSelectorPart($1, true, $3); }
+ : WordOpt ":" SelectorExpressionOpt { $$ = CYNew CYSelectorPart($1, true, $3); }
;
SelectorExpression
: SelectorExpression_ { $$ = $1; }
- | Word { $$ = new(driver.pool_) CYSelectorPart($1, false, NULL); }
+ | Word { $$ = CYNew CYSelectorPart($1, false, NULL); }
;
PrimaryExpressionNo
: MessageExpression { $$ = $1; }
- | "@selector" "(" SelectorExpression ")" { $$ = new(driver.pool_) CYSelector($3); }
+ | "@selector" "(" SelectorExpression ")" { $$ = CYNew CYSelector($3); }
+ ;
+/* }}} */
+/* Cycript (Objective-C): @import Directive {{{ */
+PathName
+ : "/" PathName
+ | "." PathName
+ | Word PathName
+ |
+ ;
+
+ImportPath
+ : "<" PathName ">"
+ | StringLiteral
+ ;
+
+SourceElement_
+ : "@import" ImportPath { $$ = CYNew CYImport(); }
;
/* }}} */
@end
@@ -1636,16 +1681,17 @@ PrimaryExpressionNo
@begin C
/* Cycript (C): Pointer Indirection/Addressing {{{ */
UnaryAssigneeExpression
- : "*" UnaryExpressionNoRE { $$ = new(driver.pool_) CYIndirect($2); }
+ : "*" UnaryExpressionNoRE { $$ = CYNew CYIndirect($2); }
;
UnaryExpression_
- : "&" UnaryExpression { $$ = new(driver.pool_) CYAddressOf($2); }
+ : "&" UnaryExpression { $$ = CYNew CYAddressOf($2); }
;
MemberAccess
- : "->" "[" Expression "]" { $$ = new(driver.pool_) CYIndirectMember(NULL, $3); }
- | "->" Identifier { $$ = new(driver.pool_) CYIndirectMember(NULL, new(driver.pool_) CYString($2)); }
+ : "->" "[" Expression "]" { $$ = CYNew CYIndirectMember(NULL, $3); }
+ | "->" Identifier { $$ = CYNew CYIndirectMember(NULL, CYNew CYString($2)); }
+ | "->" AutoComplete { driver.mode_ = CYDriver::AutoIndirect; YYACCEPT; }
;
/* }}} */
@end
@@ -1703,7 +1749,7 @@ XMLMarkup
/* }}} */
/* 11.1 Primary Expressions {{{ */
PrimaryExpressionNo
- : PropertyIdentifier { $$ = new(driver.pool_) CYPropertyVariable($1); }
+ : PropertyIdentifier { $$ = CYNew CYPropertyVariable($1); }
| XMLInitialiser { $$ = $1; }
| XMLListInitialiser { $$ = $1; }
;
@@ -1716,32 +1762,32 @@ PropertyIdentifier
/* }}} */
/* 11.1.1 Attribute Identifiers {{{ */
AttributeIdentifier
- : "@" QualifiedIdentifier_ { $$ = new(driver.pool_) CYAttribute($2); }
+ : "@" QualifiedIdentifier_ { $$ = CYNew CYAttribute($2); }
;
PropertySelector_
: PropertySelector { $$ = $1; }
- | "[" Expression "]" { $$ = new(driver.pool_) CYSelector($2); }
+ | "[" Expression "]" { $$ = CYNew CYSelector($2); }
;
PropertySelector
- : Identifier { $$ = new(driver.pool_) CYSelector($1); }
+ : Identifier { $$ = CYNew CYSelector($1); }
| WildcardIdentifier { $$ = $1; }
;
/* }}} */
/* 11.1.2 Qualified Identifiers {{{ */
QualifiedIdentifier_
- : PropertySelector_ { $$ = new(driver.pool_) CYQualified(NULL, $1); }
+ : PropertySelector_ { $$ = CYNew CYQualified(NULL, $1); }
| QualifiedIdentifier { $$ = $1; }
;
QualifiedIdentifier
- : PropertySelector "::" PropertySelector_ { $$ = new(driver.pool_) CYQualified($1, $3); }
+ : PropertySelector "::" PropertySelector_ { $$ = CYNew CYQualified($1, $3); }
;
/* }}} */
/* 11.1.3 Wildcard Identifiers {{{ */
WildcardIdentifier
- : "*" { $$ = new(driver.pool_) CYWildcard(); }
+ : "*" { $$ = CYNew CYWildcard(); }
;
/* }}} */
/* 11.1.4 XML Initialiser {{{ */
@@ -1760,7 +1806,7 @@ XMLTagContent
;
XMLExpression
- : "{" LexPushRegExp Expression "}" LexPop
+ : Brace LexPushRegExp Expression "}" LexPop
;
XMLTagName
@@ -1801,7 +1847,7 @@ XMLElementContentOpt
/* }}} */
/* 11.1.5 XMLList Initialiser {{{ */
XMLListInitialiser
- : "<>" LexPushXMLContent XMLElementContent "" LexPop { $$ = new(driver.pool_) CYXMLList($3); }
+ : "<>" LexPushXMLContent XMLElementContent "" LexPop { $$ = CYNew CYXMLList($3); }
;
/* }}} */
/* 11.2 Left-Hand-Side Expressions {{{ */
@@ -1811,14 +1857,14 @@ PropertyIdentifier_
;
MemberAccess
- : "." PropertyIdentifier { $$ = new(driver.pool_) CYPropertyMember(NULL, $2); }
- | ".." PropertyIdentifier_ { $$ = new(driver.pool_) CYDescendantMember(NULL, $2); }
- | "." "(" Expression ")" { $$ = new(driver.pool_) CYFilteringPredicate(NULL, $3); }
+ : "." PropertyIdentifier { $$ = CYNew CYPropertyMember(NULL, $2); }
+ | ".." PropertyIdentifier_ { $$ = CYNew CYDescendantMember(NULL, $2); }
+ | "." "(" Expression ")" { $$ = CYNew CYFilteringPredicate(NULL, $3); }
;
/* }}} */
/* 12.1 The default xml namespace Statement {{{ */
/* XXX: DefaultXMLNamespaceStatement
- : "default" "xml" "namespace" "=" Expression Terminator { $$ = new(driver.pool_) CYDefaultXMLNamespace($5); }
+ : "default" "xml" "namespace" "=" Expression Terminator { $$ = CYNew CYDefaultXMLNamespace($5); }
;
Statement_
@@ -1832,14 +1878,15 @@ PropertyNameAndValueList_
: "," { $$ = NULL; }
;
/* }}} */
+
/* JavaScript 1.7: Array Comprehensions {{{ */
IfComprehension
- : "if" "(" Expression ")" { $$ = new(driver.pool_) CYIfComprehension($3); }
+ : "if" "(" Expression ")" { $$ = CYNew CYIfComprehension($3); }
;
ForComprehension
- : "for" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForInComprehension($3, $5); }
- | "for" "each" "(" Identifier "in" Expression ")" { $$ = new(driver.pool_) CYForEachInComprehension($4, $6); }
+ : "for" "(" Identifier "in" Expression ")" { $$ = CYNew CYForInComprehension($3, $5); }
+ | "for" "each" "(" Identifier "in" Expression ")" { $$ = CYNew CYForEachInComprehension($4, $6); }
;
ComprehensionListOpt
@@ -1853,27 +1900,80 @@ ComprehensionList
;
PrimaryExpressionNo
- : "[" AssignmentExpression ComprehensionList "]" { $$ = new(driver.pool_) CYArrayComprehension($2, $3); }
+ : "[" AssignmentExpression ComprehensionList "]" { $$ = CYNew CYArrayComprehension($2, $3); }
;
/* }}} */
/* JavaScript 1.7: for each {{{ */
ForInStatement
- : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = new(driver.pool_) CYForEachIn($4, $6, $8); }
+ : "for" "each" "(" ForInStatementInitialiser "in" Expression ")" Statement { $$ = CYNew CYForEachIn($4, $6, $8); }
;
/* }}} */
/* JavaScript 1.7: let Statements {{{ *//*
LetStatement
- : "let" "(" VariableDeclarationList ")" Block_ { $$ = new(driver.pool_) CYLet($3, $5); }
+ : "let" "(" VariableDeclarationList ")" Block_ { $$ = CYNew CYLet($3, $5); }
;
Statement_
: LetStatement
;
*//* }}} */
+
/* JavaScript FTW: Function Statements {{{ */
Statement
: LexSetRegExp FunctionDeclaration { driver.Warning(yylloc, "warning, FunctionDeclaration is a SourceElement, not a Statement"); } { $$ = $2; }
;
/* }}} */
+/* JavaScript FTW: Optional Arguments {{{ */
+FormalParameterList
+ : Identifier "=" AssignmentExpression FormalParameterList_ { $$ = CYNew CYOptionalFunctionParameter($1, $3, $4); }
+ ;
+/* }}} */
+/* JavaScript FTW: Ruby Blocks {{{ */
+RubyProcParameterList_
+ : "," RubyProcParameterList { $$ = $2; }
+ | { $$ = NULL; }
+ ;
+
+RubyProcParameterList
+ : Identifier RubyProcParameterList_ { $$ = CYNew CYFunctionParameter($1, $2); }
+ | { $$ = NULL; }
+ ;
+
+RubyProcParameters
+ : "|" RubyProcParameterList "|" { $$ = $2; }
+ | "||" { $$ = NULL; }
+ ;
+
+RubyProcParametersOpt
+ : RubyProcParameters
+ | { $$ = NULL; }
+ ;
+
+RubyProcExpression
+ : "{" RubyProcParametersOpt StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); }
+ ;
+
+RubyProcExpressionNoOA
+ : "{" RubyProcParameters StatementListOpt "}" { $$ = CYNew CYRubyProc($2, $3); }
+ ;
+
+PrimaryExpressionNo
+ : RubyProcExpressionNoOA { $$ = $1; }
+ ;
+
+LeftHandSideExpression
+ : LeftHandSideExpression RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }
+ ;
+
+LeftHandSideExpressionNoBF
+ : LeftHandSideExpressionNoBF RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }
+ ;
+
+@begin C
+LeftHandSideExpressionNoRE
+ : LeftHandSideExpressionNoRE RubyProcExpression { $$ = CYNew CYRubyBlock($1, $2); }
+ ;
+@end
+/* }}} */
%%