# HG changeset patch
# User jwe
# Date 1091464391 0
# Node ID b11223097ad43aae78313bfee40673747a5a4b99
# Parent  cee8d88cf6194f3aa6263692a07e0bdc97680867
[project @ 2004-08-02 16:33:11 by jwe]

diff -r cee8d88cf619 -r b11223097ad4 src/ChangeLog
--- a/src/ChangeLog	Fri Jul 30 19:10:16 2004 +0000
+++ b/src/ChangeLog	Mon Aug 02 16:33:11 2004 +0000
@@ -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.
diff -r cee8d88cf619 -r b11223097ad4 src/lex.l
--- a/src/lex.l	Fri Jul 30 19:10:16 2004 +0000
+++ b/src/lex.l	Mon Aug 02 16:33:11 2004 +0000
@@ -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);
   }
diff -r cee8d88cf619 -r b11223097ad4 src/ov-cx-mat.cc
--- a/src/ov-cx-mat.cc	Fri Jul 30 19:10:16 2004 +0000
+++ b/src/ov-cx-mat.cc	Mon Aug 02 16:33:11 2004 +0000
@@ -84,6 +84,8 @@
       else if (cm.all_elements_are_real ())
 	retval = new octave_matrix (::real (cm));
     }
+  else if (matrix.all_elements_are_real ())
+    retval = new octave_matrix (::real (matrix));
 
   return retval;
 }