comparison src/OPERATORS/op-str-str.cc @ 8150:283989f2da9b

make null assignment matlab compatible
author Jaroslav Hajek <highegg@gmail.com>
date Fri, 26 Sep 2008 11:52:01 -0400
parents a1dbe9d80eee
children eb63fbe60fab
comparison
equal deleted inserted replaced
8149:a8fb37ae61b8 8150:283989f2da9b
28 #include "gripes.h" 28 #include "gripes.h"
29 #include "oct-obj.h" 29 #include "oct-obj.h"
30 #include "ov.h" 30 #include "ov.h"
31 #include "ov-str-mat.h" 31 #include "ov-str-mat.h"
32 #include "ov-typeinfo.h" 32 #include "ov-typeinfo.h"
33 #include "ov-null-mat.h"
33 #include "ops.h" 34 #include "ops.h"
34 35
35 // string unary ops. 36 // string unary ops.
36 37
37 DEFUNOP (transpose, char_matrix_str) 38 DEFUNOP (transpose, char_matrix_str)
90 91
91 v1.assign (idx, v2.char_matrix_value ()); 92 v1.assign (idx, v2.char_matrix_value ());
92 return octave_value (); 93 return octave_value ();
93 } 94 }
94 95
96 DEFNULLASSIGNOP_FN (null_assign, char_matrix_str, delete_elements)
97
95 DEFNDCHARCATOP_FN (str_str, char_matrix_str, char_matrix_str, concat) 98 DEFNDCHARCATOP_FN (str_str, char_matrix_str, char_matrix_str, concat)
96 99
97 void 100 void
98 install_str_str_ops (void) 101 install_str_str_ops (void)
99 { 102 {
140 143
141 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_str, assign); 144 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_str, assign);
142 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_sq_str, assign); 145 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_char_matrix_sq_str, assign);
143 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_char_matrix_str, assign); 146 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_char_matrix_str, assign);
144 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_char_matrix_sq_str, assign); 147 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_char_matrix_sq_str, assign);
148
149 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_null_matrix, null_assign);
150 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_null_str, null_assign);
151 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_str, octave_null_sq_str, null_assign);
152 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_null_matrix, null_assign);
153 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_null_str, null_assign);
154 INSTALL_ASSIGNOP (op_asn_eq, octave_char_matrix_sq_str, octave_null_sq_str, null_assign);
155
145 } 156 }
146 157
147 /* 158 /*
148 ;;; Local Variables: *** 159 ;;; Local Variables: ***
149 ;;; mode: C++ *** 160 ;;; mode: C++ ***