Mercurial > octave-nkf
changeset 5878:27771d9cd4f4
[project @ 2006-07-02 18:45:11 by jwe]
author | jwe |
---|---|
date | Sun, 02 Jul 2006 18:45:11 +0000 |
parents | 50d43cdbec80 |
children | 4f1112bfafce |
files | src/ChangeLog src/ov-str-mat.cc src/parse.y |
diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Jul 01 21:52:06 2006 +0000 +++ b/src/ChangeLog Sun Jul 02 18:45:11 2006 +0000 @@ -1,3 +1,8 @@ +2006-07-02 John W. Eaton <jwe@octave.org> + + * ov-str-mat.cc (CHAR_MATRIX_CONV): Omit "warn-" from label. + * parse.y (maybe_warn_variable_switch_label): Likewise. + 2006-07-01 John W. Eaton <jwe@octave.org> * parse.y (finish_cell): Use finish_matrix to do constant folding.
--- a/src/ov-str-mat.cc Sat Jul 01 21:52:06 2006 +0000 +++ b/src/ov-str-mat.cc Sun Jul 02 18:45:11 2006 +0000 @@ -176,7 +176,7 @@ gripe_invalid_conversion ("string", TNAME); \ else \ { \ - warning_with_id ("Octave:warn-str-to-num", \ + warning_with_id ("Octave:str-to-num", \ "implicit conversion from %s to %s", \ "string", TNAME); \ \
--- a/src/parse.y Sat Jul 01 21:52:06 2006 +0000 +++ b/src/parse.y Sun Jul 02 18:45:11 2006 +0000 @@ -1533,7 +1533,7 @@ maybe_warn_variable_switch_label (tree_expression *expr) { if (! expr->is_constant ()) - warning_with_id ("Octave:warn-variable-switch-label", + warning_with_id ("Octave:variable-switch-label", "variable switch label"); }