octave-nkf: src/ov-cell.cc comparison

only allow struct assignments to non-struct values for empty arrays

author	Jaroslav Hajek <highegg@gmail.com>
date	Mon, 09 Aug 2010 09:04:00 +0200
parents	89f4d7e294cc
children	0d9640d755b1

comparison

equal deleted inserted replaced

-:307c8396bc83
+:333bf09e3b6e
 if (is_empty () && type[1] == '.')
 {
 // Allow conversion of empty cell array to some other
 // type in cases like
 //
-//  x = []; x(i).f = rhs
+//  x = {}; x(i).f = rhs
 octave_value tmp = octave_value::empty_conv (type, rhs);
 return tmp.subsasgn (type, idx, rhs);
 }
 }
 break;
 case '.':
 {
-std::string nm = type_name ();
+if (is_empty ())
-error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
+{
+// Do nothing; the next branch will handle it.
+}
+else
+{
+std::string nm = type_name ();
+error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
+}
 }
 break;
 default:
 panic_impossible ();
 }
 break;
 case '.':
 {
-std::string nm = type_name ();
+if (is_empty ())
-error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
+{
+// Allow conversion of empty cell array to some other
+// type in cases like
+//
+//  x = {}; x.f = rhs
+octave_value tmp = octave_value::empty_conv (type, rhs);
+return tmp.subsasgn (type, idx, rhs);
+}
+else
+{
+std::string nm = type_name ();
+error ("%s cannot be indexed with %c", nm.c_str (), type[0]);
+}
 }
 break;
 default:
 panic_impossible ();

Mercurial > hg > octave-nkf