Mercurial > octave-nkf

changeset 6600:ecd3db9a1815

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-04-30 14:48:21 by jwe]
author jwe
date Mon, 30 Apr 2007 14:48:22 +0000
parents 08ca72d6ffc9
children 1c4545125165
files src/ChangeLog src/OPERATORS/op-int-conv.cc
diffstat 2 files changed, 26 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog	Sat Apr 28 22:47:29 2007 +0000
+++ b/src/ChangeLog	Mon Apr 30 14:48:22 2007 +0000
@@ -1,3 +1,9 @@
+2007-04-30  David Bateman  <dbateman@free.fr>
+
+	* OPERATORS/op-int-conv.cc: Define sq and dq string conversion
+	operators.  Delete old char_matrix_str conversions.
+	* OPERATORS/op-int-conv.cc (install_int_conv_ops): Install them.
+
 2007-04-27  Benjamin Lindner  <lindnerb@users.sourceforge.net>.
 
 	* octave.cc (execute_startup_files): Call same_file to check for
--- a/src/OPERATORS/op-int-conv.cc	Sat Apr 28 22:47:29 2007 +0000
+++ b/src/OPERATORS/op-int-conv.cc	Mon Apr 30 14:48:22 2007 +0000
@@ -87,15 +87,25 @@
 DEFCONVFN (bool_matrix_to_uint32, bool_matrix, uint32)
 DEFCONVFN (bool_matrix_to_uint64, bool_matrix, uint64)
 
-DEFSTRINTCONVFN (char_matrix_str_to_int8, int8)
-DEFSTRINTCONVFN (char_matrix_str_to_int16, int16)
-DEFSTRINTCONVFN (char_matrix_str_to_int32, int32)
-DEFSTRINTCONVFN (char_matrix_str_to_int64, int64)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_int8, int8)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_int16, int16)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_int32, int32)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_int64, int64)
+
+DEFSTRINTCONVFN (char_matrix_sq_str_to_uint8, uint8)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_uint16, uint16)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_uint32, uint32)
+DEFSTRINTCONVFN (char_matrix_sq_str_to_uint64, uint64)
 
-DEFSTRINTCONVFN (char_matrix_str_to_uint8, uint8)
-DEFSTRINTCONVFN (char_matrix_str_to_uint16, uint16)
-DEFSTRINTCONVFN (char_matrix_str_to_uint32, uint32)
-DEFSTRINTCONVFN (char_matrix_str_to_uint64, uint64)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_int8, int8)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_int16, int16)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_int32, int32)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_int64, int64)
+
+DEFSTRINTCONVFN (char_matrix_dq_str_to_uint8, uint8)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_uint16, uint16)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_uint32, uint32)
+DEFSTRINTCONVFN (char_matrix_dq_str_to_uint64, uint64)
 
 DEFCONVFN (range_to_int8, range, int8)
 DEFCONVFN (range_to_int16, range, int16)
@@ -178,7 +188,8 @@
   INSTALL_CONVOPS (bool)
   INSTALL_CONVOPS (bool_matrix)
   INSTALL_CONVOPS (range)
-  INSTALL_CONVOPS (char_matrix_str)
+  INSTALL_CONVOPS (char_matrix_sq_str)
+  INSTALL_CONVOPS (char_matrix_dq_str)
 
   INSTALL_INT_CONV_FUNCTIONS (int8)
   INSTALL_INT_CONV_FUNCTIONS (int16)