Mercurial > octave-nkf
changeset 5127:7f4a3e4bc58a
[project @ 2005-02-02 22:08:49 by jwe]
| author | jwe |
|---|---|
| date | Wed, 02 Feb 2005 22:08:49 +0000 |
| parents | e3689205caa8 |
| children | 2c4b08ace285 |
| files | src/ChangeLog src/Makefile.in src/parse.y |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Feb 02 18:26:25 2005 +0000 +++ b/src/ChangeLog Wed Feb 02 22:08:49 2005 +0000 @@ -1,3 +1,8 @@ +2005-02-02 John W. Eaton <jwe@octave.org> + + * Makefile.in (parse.cc): Expect 12 shift/reduce conflicts. + * parse.y (loop_command): Allow "for (k=1:10) ... endfor". + 2005-01-27 David Bateman <dbateman@free.fr> * ov-mapper.cc (octave_mapper::apply): Only work on real arguments
--- a/src/Makefile.in Wed Feb 02 18:26:25 2005 +0000 +++ b/src/Makefile.in Wed Feb 02 22:08:49 2005 +0000 @@ -513,7 +513,7 @@ @$(top_srcdir)/move-if-change $@-t $@ parse.cc : parse.y - @echo "expect 11 shift/reduce conflicts" + @echo "expect 12 shift/reduce conflicts" $(YACC) $(YFLAGS) $< @$(top_srcdir)/move-if-change y.tab.c $(@F)
--- a/src/parse.y Wed Feb 02 18:26:25 2005 +0000 +++ b/src/parse.y Wed Feb 02 22:08:49 2005 +0000 @@ -1068,6 +1068,11 @@ if (! ($$ = make_for_command ($1, $3, $5, $7, $8, $2))) ABORT_PARSE; } + | FOR stash_comment '(' assign_lhs '=' expression ')' opt_sep opt_list END + { + if (! ($$ = make_for_command ($1, $4, $6, $9, $10, $2))) + ABORT_PARSE; + } ; // =======