Mercurial > octave-nkf
changeset 5296:4e753a157ed2
[project @ 2005-04-21 17:52:41 by jwe]
| author | jwe |
|---|---|
| date | Thu, 21 Apr 2005 17:52:42 +0000 |
| parents | 015b15716cbe |
| children | 234abf4c74dd |
| files | src/ChangeLog src/Makefile.in src/parse.y |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Apr 21 16:38:38 2005 +0000 +++ b/src/ChangeLog Thu Apr 21 17:52:42 2005 +0000 @@ -3,6 +3,11 @@ * version.h (OCTAVE_VERSION): Now 2.9.2. (OCTAVE_API_VERSION): Now api-v15. + * Makefile.in (parse.cc): Expect 14 shift/reduce conflicts. + + * parse.y (USING TITLE WITH AXES COLON OPEN_BRACE CLEAR): + Delete unused tokens. + * DLD-FUNCTIONS/__qp__.cc (qp): Use octave_idx_type where needed. * DLD-FUNCTIONS/__qp__.cc: New file.
--- a/src/Makefile.in Thu Apr 21 16:38:38 2005 +0000 +++ b/src/Makefile.in Thu Apr 21 17:52:42 2005 +0000 @@ -518,7 +518,7 @@ @$(top_srcdir)/move-if-change $@-t $@ parse.cc : parse.y - @echo "expect 12 shift/reduce conflicts" + @echo "expect 14 shift/reduce conflicts" $(YACC) $(YFLAGS) $< @$(top_srcdir)/move-if-change y.tab.c $(@F)
--- a/src/parse.y Thu Apr 21 16:38:38 2005 +0000 +++ b/src/parse.y Thu Apr 21 17:52:42 2005 +0000 @@ -419,7 +419,7 @@ // Other tokens. %token END_OF_INPUT LEXICAL_ERROR %token FCN VARARGIN VARARGOUT ALL_VA_ARGS -%token USING TITLE WITH AXES COLON OPEN_BRACE CLOSE_BRACE CLEAR +%token CLOSE_BRACE // Nonterminals we construct. %type <comment_type> stash_comment function_beg