Mercurial > octave-nkf
changeset 2527:e2a7c830472c
[project @ 1996-11-17 21:42:37 by jwe]
| author | jwe |
|---|---|
| date | Sun, 17 Nov 1996 21:42:37 +0000 |
| parents | aad9cc70dfb2 |
| children | 704d7e130e71 |
| files | src/ChangeLog src/Makefile.in |
| diffstat | 2 files changed, 2 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sun Nov 17 21:34:04 1996 +0000 +++ b/src/ChangeLog Sun Nov 17 21:42:37 1996 +0000 @@ -1,6 +1,6 @@ Sun Nov 17 14:14:48 1996 John W. Eaton <jwe@bevo.che.wisc.edu> - * Makefile.in (parse.cc): Expect 12 shift/reduce conflicts. + * Makefile.in (parse.cc): Expect 13 shift/reduce conflicts. * parse.y (set_stmt_print_flag): New function. (sep_type): New member for bison %union declaration. @@ -16,9 +16,6 @@ * Makefile.in (parse.cc, lex.cc): Add special rules for these files. Delete pattern rules for .y and .l files. - * parse.y (expression): Move colon_expr here. - (simple_expr1): From here. - Fri Nov 15 13:48:02 1996 John W. Eaton <jwe@bevo.che.wisc.edu> * pt-plot.cc: Put semicolons at the ends of all plot commands.
--- a/src/Makefile.in Sun Nov 17 21:34:04 1996 +0000 +++ b/src/Makefile.in Sun Nov 17 21:42:37 1996 +0000 @@ -358,7 +358,7 @@ # Special rules -- these files need special things to be defined. parse.cc : parse.y - @echo "expect 12 shift/reduce conflicts" + @echo "expect 13 shift/reduce conflicts" $(YACC) $(YFLAGS) $< @$(top_srcdir)/move-if-change y.tab.c $(@F)