2847

3 files changed, 14 insertions, 12 deletions

diff --git a/031container.cc b/031container.cc
index dcaa15c0..3a525f80 100644
--- a/031container.cc
+++ b/031container.cc
@@ -183,10 +183,11 @@ case GET: {
   for (int i = 0; i < offset; ++i)
     src += size_of(element_type(base, i));
   trace(9998, "run") << "address to copy is " << src << end();
-  reagent elem = element_type(base, offset);
-  elem.set_value(src);
-  trace(9998, "run") << "its type is " << names_to_string(elem.type) << end();
-  products.push_back(read_memory(elem));
+  reagent element = element_type(base, offset);
+  element.set_value(src);
+  trace(9998, "run") << "its type is " << names_to_string(element.type) << end();
+  // Read element
+  products.push_back(read_memory(element));
   break;
 }
 
diff --git a/032array.cc b/032array.cc
index f4b6a943..35d86fa6 100644
--- a/032array.cc
+++ b/032array.cc
@@ -221,10 +221,11 @@ case INDEX: {
   int src = base_address + 1 + offset_val.at(0)*size_of(element_type);
   trace(9998, "run") << "address to copy is " << src << end();
   trace(9998, "run") << "its type is " << get(Type, element_type->value).name << end();
-  reagent elem;
-  elem.set_value(src);
-  elem.type = new type_tree(*element_type);
-  products.push_back(read_memory(elem));
+  reagent element;
+  element.set_value(src);
+  element.type = new type_tree(*element_type);
+  // Read element
+  products.push_back(read_memory(element));
   break;
 }
 
diff --git a/043space.cc b/043space.cc
index 3bb940e7..151c23cd 100644
--- a/043space.cc
+++ b/043space.cc
@@ -131,8 +131,8 @@ def main [
 ]
 +mem: storing 35 in location 9
 
-:(after "reagent elem" following "case GET:")
-elem.properties.push_back(pair<string, string_tree*>("raw", NULL));
+:(before "Read element" following "case GET:")
+element.properties.push_back(pair<string, string_tree*>("raw", NULL));
 
 //:: fix 'index'
 
@@ -152,8 +152,8 @@ def main [
 ]
 +mem: storing 35 in location 9
 
-:(after "reagent elem" following "case INDEX:")
-elem.properties.push_back(pair<string, string_tree*>("raw", NULL));
+:(before "Read element" following "case INDEX:")
+element.properties.push_back(pair<string, string_tree*>("raw", NULL));
 
 //:: convenience operation to automatically deduce the amount of space to
 //:: allocate in a default space with names