# HG changeset patch
# User jwe
# Date 1049228815 0
# Node ID fa80721998d68cbd517cc81f32c01ef0cdb4ab50
# Parent  c14ec945fabb1d99ec740570fd2a53955c8b52b7
[project @ 2003-04-01 20:26:55 by jwe]

diff --git a/src/ChangeLog b/src/ChangeLog
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.
diff --git a/src/load-save.cc b/src/load-save.cc
--- a/src/load-save.cc
+++ b/src/load-save.cc
@@ -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)