Mercurial > hg > octave-nkf
changeset 4923:b11223097ad4
[project @ 2004-08-02 16:33:11 by jwe]
author | jwe |
---|---|
date | Mon, 02 Aug 2004 16:33:11 +0000 |
parents | cee8d88cf619 |
children | 9a3a32f5a27d |
files | src/ChangeLog src/lex.l src/ov-cx-mat.cc |
diffstat | 3 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,13 @@ +2004-08-02 John W. Eaton <jwe@octave.org> + + * ov-cx-mat.cc (try_narrowing_conversion): Also allow complex to + real conversion for N-d arrays. + +2004-07-30 John W. Eaton <jwe@octave.org> + + * lex.l (<COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]*{S}*): + Also recognize \r as a word list separator. + 2004-07-27 John W. Eaton <jwe@octave.org> * bitfcns.cc (DO_BITSHIFT): Pass mask to bitshift.
--- a/src/lex.l +++ b/src/lex.l @@ -337,7 +337,7 @@ COUNT_TOK_AND_RETURN (handle_string (yytext[0], true)); } -<COMMAND_START>[^#% \t\n\;\,\"\'][^ \t\n\;\,]*{S}* { +<COMMAND_START>[^#% \t\r\n\;\,\"\'][^ \t\r\n\;\,]*{S}* { std::string tok = strip_trailing_whitespace (yytext); TOK_PUSH_AND_RETURN (tok, STRING); }