971

1 files changed, 10 insertions, 4 deletions

diff --git a/cpp/020array b/cpp/020array
index 4ee04e98..aafeacf8 100644
--- a/cpp/020array
+++ b/cpp/020array
@@ -32,8 +32,9 @@ recipe main [
 if (t.is_array) {
   int base = r.value;
   if (Memory[base] == 0) return 0;
-  reagent x(t.element[0]);
+  reagent x;
   x.set_value(base+1);
+  x.types.push_back(t.element[0]);
   return 1 + Memory[base]*size_of(x);
 }
 
@@ -53,12 +54,15 @@ case INDEX: {
   assert(Type[base_type].is_array);
   trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
   size_t offset = instructions[pc].ingredients[1].value;
-  int src = base_address + 1 + offset*size_of(reagent(Type[base_type].element[0]));
+  reagent elem;
+  elem.types.push_back(Type[base_type].element[0]);
+  int src = base_address + 1 + offset*size_of(elem);
   trace("run") << "address to copy is " << src;
   int src_type = Type[base_type].element[0];
   trace("run") << "its type is " << src_type;
-  reagent tmp(src_type);
+  reagent tmp;
   tmp.set_value(src);
+  tmp.types.push_back(src_type);
   vector<int> result(read_memory(tmp));
   trace("run") << "product 0 is " << result[0];
   write_memory(instructions[pc].products[0], result);
@@ -98,7 +102,9 @@ case INDEX_ADDRESS: {
   assert(Type[base_type].is_array);
   trace("run") << "ingredient 1 is " << instructions[pc].ingredients[1].name;
   size_t offset = instructions[pc].ingredients[1].value;
-  int src = base_address + 1 + offset*size_of(reagent(Type[base_type].element[0]));
+  reagent elem;
+  elem.types.push_back(Type[base_type].element[0]);
+  int src = base_address + 1 + offset*size_of(elem);
   trace("run") << "address to copy is " << src;
   vector<int> result;
   result.push_back(src);