Mercurial > hg > octave-nkf
changeset 3881:c34d631dee18
[project @ 2002-04-02 16:22:18 by jwe]
| author | jwe |
|---|---|
| date | Tue, 02 Apr 2002 16:22:18 +0000 |
| parents | c21ae2c5840f |
| children | c8c1ead8474f |
| files | src/ChangeLog src/parse.y src/toplev.cc test/octave.test/io/fopen-1.m |
| diffstat | 4 files changed, 20 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2002-04-02 John W. Eaton <jwe@bevo.che.wisc.edu> + + * parse.y (input): Call YYACCEPT for END_OF_INPUT. + (parse_and_execute): Handle change in yyparse return value semantics. + * toplev.cc (main_loop): Likewise. + 2002-03-25 John W. Eaton <jwe@bevo.che.wisc.edu> * parse.y (parse_fcn_file): Call error if there is no input file.
--- a/src/parse.y +++ b/src/parse.y @@ -466,7 +466,7 @@ { global_command = 0; promptflag = 1; - YYABORT; + YYACCEPT; } | simple_list parse_error { ABORT_PARSE; } @@ -2774,6 +2774,8 @@ if (quit) break; } + else + break; } while (retval == 0);
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -165,6 +165,8 @@ command_editor::increment_current_command_number (); } } + else + break; } while (retval == 0);
--- a/test/octave.test/io/fopen-1.m +++ b/test/octave.test/io/fopen-1.m @@ -3,7 +3,7 @@ status = 1; for i = 1:6 - arch = deblank (arch_list (i,:)) + arch = deblank (arch_list (i,:)); for j = 1:2 if (j == 1) mode_list = ["w"; "r"; "a"]; @@ -13,7 +13,14 @@ nm = tmpnam (); for k = 1:3 mode = deblank (mode_list (k,:)); - if ((id = fopen (nm, mode, arch)) < 0) + [id, err] = fopen (nm, mode, arch); + if (id < 0) + status = 0; break; + endif + fclose (id); + mode = strcat (mode, "b"); + [id, err] = fopen (nm, mode, arch); + if (id < 0) status = 0; break; endif fclose (id);