Rob Shearman : jscript: Fix shift/reduce conflict caused by ArrayLiteral.
Alexandre Julliard
julliard at winehq.org
Tue Oct 14 08:29:58 CDT 2008
Module: wine
Branch: master
Commit: b06f8820723fce5074392f69d8b36690d0ce7957
URL: http://source.winehq.org/git/wine.git/?a=commit;h=b06f8820723fce5074392f69d8b36690d0ce7957
Author: Rob Shearman <robertshearman at gmail.com>
Date: Mon Oct 13 23:35:34 2008 +0100
jscript: Fix shift/reduce conflict caused by ArrayLiteral.
---
dlls/jscript/parser.y | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y
index 8f01028..565f08b 100644
--- a/dlls/jscript/parser.y
+++ b/dlls/jscript/parser.y
@@ -739,7 +739,7 @@ PrimaryExpression
/* ECMA-262 3rd Edition 11.1.4 */
ArrayLiteral
: '[' ']' { $$ = new_array_literal_expression(ctx, NULL, 0); }
- | '[' Elision_opt ']' { $$ = new_array_literal_expression(ctx, NULL, $2+1); }
+ | '[' Elision ']' { $$ = new_array_literal_expression(ctx, NULL, $2+1); }
| '[' ElementList ']' { $$ = new_array_literal_expression(ctx, $2, 0); }
| '[' ElementList ',' Elision_opt ']'
{ $$ = new_array_literal_expression(ctx, $2, $4+1); }
More information about the wine-cvs
mailing list