Mercurial > octave-dspies

diff src/parse.y @ 2524:7dc71ca5d092

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1996-11-17 20:16:08 by jwe]
author jwe
date Sun, 17 Nov 1996 20:16:09 +0000
parents 2f50b24ce84f
children 8561d88be5f2
line wrap: on
line diff
--- a/src/parse.y	Sat Nov 16 00:33:24 1996 +0000
+++ b/src/parse.y	Sun Nov 17 20:16:09 1996 +0000
@@ -354,9 +354,9 @@
 %left UNARY PLUS_PLUS MINUS_MINUS EXPR_NOT
 %right POW EPOW
 
-// There are 19 shift/reduce conflicts, ok?  But this only works with
+// There are 18 shift/reduce conflicts, ok?  But this only works with
 // bison...
-// %expect 19
+// %expect 18
 
 // Where to start.
 %start input
@@ -771,6 +771,8 @@
 
 expression	: simple_expr
 		  { $$ = $1; }
+		| colon_expr
+		  { $$ = finish_colon_expression ($1); }
 		| NUM '=' expression
 		  {
 		    yyerror ("invalid assignment to a number");
@@ -810,8 +812,6 @@
 		  { $$ = new tree_constant (Matrix ()); }
 		| '[' ';' ']'
 		  { $$ = new tree_constant (Matrix ()); }
-		| colon_expr
-		  { $$ = finish_colon_expression ($1); }
 		| PLUS_PLUS identifier %prec UNARY
 		  { $$ = make_prefix_op (PLUS_PLUS, $2, $1); }
 		| MINUS_MINUS identifier %prec UNARY