Mercurial > octave-nkf
changeset 4372:fa80721998d6
[project @ 2003-04-01 20:26:55 by jwe]
| author | jwe |
|---|---|
| date | Tue, 01 Apr 2003 20:26:55 +0000 |
| parents | c14ec945fabb |
| children | 51cd16a73307 |
| files | src/ChangeLog src/load-save.cc |
| diffstat | 2 files changed, 16 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Wed Mar 26 16:05:59 2003 +0000 +++ b/src/ChangeLog Tue Apr 01 20:26:55 2003 +0000 @@ -1,3 +1,10 @@ +2003-04-01 John W. Eaton <jwe@bevo.che.wisc.edu> + + * load-save.cc (hdf5_read_next_data): Extract list before + assigning to map element. + (add_hdf5_data): Prefix faked names with '_' so they are valid + identifiers. + 2003-03-24 Mats Jansson <mats.e.jansson@home.se> * syscalls.cc (Fkill): Fixed docstring typo.
--- a/src/load-save.cc Wed Mar 26 16:05:59 2003 +0000 +++ b/src/load-save.cc Tue Apr 01 20:26:55 2003 +0000 @@ -1741,7 +1741,14 @@ if (is_list) lst.append (dsub.tc); else - m [dsub.name] = dsub.tc; + { + octave_value ov = dsub.tc; + + if (ov.is_list ()) + m [dsub.name] = ov.list_value (); + else + m [dsub.name] = ov; + } if (have_h5giterate_bug) current_item++; // H5Giterate returned the last index processed @@ -3953,7 +3960,7 @@ { // should we use lst.name_tags () to label the elements? char s[20]; - sprintf (s, "%d", i); + sprintf (s, "_%d", i); bool retval2 = add_hdf5_data (data_id, lst (i), s, "", false, save_as_floats); if (! retval2)