about summary refs log tree commit diff stats
path: root/058shape_shifting_container.cc
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-02-17 10:09:48 -0800
committerKartik K. Agaram <vc@akkartik.com>2016-02-17 10:09:48 -0800
commit3adc9e08715fb695b8a7f53d5cfb3db1bd434b05 (patch)
tree2336287ac111e0038fd01391ea9d4c57fe9a3f2b /058shape_shifting_container.cc
parent89500176d9ff86eedcc99c2d2d11b1ac96022c97 (diff)
downloadmu-3adc9e08715fb695b8a7f53d5cfb3db1bd434b05.tar.gz
2667 - redo container data structure
I've been gradually Greenspunning reagents. Just go all the way.
Diffstat (limited to '058shape_shifting_container.cc')
-rw-r--r--058shape_shifting_container.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/058shape_shifting_container.cc b/058shape_shifting_container.cc
index e4822cc0..476468b7 100644
--- a/058shape_shifting_container.cc
+++ b/058shape_shifting_container.cc
@@ -71,9 +71,9 @@ if (type->value >= START_TYPE_INGREDIENTS
   return;
 
 :(before "End size_of(type) Container Cases")
-if (t.elements.at(i)->value >= START_TYPE_INGREDIENTS) {
+if (t.elements.at(i).type->value >= START_TYPE_INGREDIENTS) {
   trace(9999, "type") << "checking size of type ingredient\n" << end();
-  long long int size = size_of_type_ingredient(t.elements.at(i), type->right);
+  long long int size = size_of_type_ingredient(t.elements.at(i).type, type->right);
   if (!size)
     raise_error << "illegal type '" << debug_string(type) << "' seems to be missing a type ingredient or three\n" << end();
   result += size;
@@ -100,9 +100,9 @@ recipe main [
 $mem: 7
 
 :(before "End size_of(type) Exclusive Container Cases")
-if (t.elements.at(i)->value >= START_TYPE_INGREDIENTS) {
+if (t.elements.at(i).type->value >= START_TYPE_INGREDIENTS) {
   trace(9999, "type") << "checking size of type ingredient\n" << end();
-  long long int size = size_of_type_ingredient(t.elements.at(i), type->right);
+  long long int size = size_of_type_ingredient(t.elements.at(i).type, type->right);
   if (!size)
     raise_error << "illegal type '" << debug_string(type) << "' seems to be missing a type ingredient or three\n" << end();
   if (size > result) result = size;
@@ -147,7 +147,7 @@ recipe main [
 +mem: storing 16 in location 2
 
 :(before "End GET field Cases")
-const type_tree* type = get(Type, base_type).elements.at(i);
+const type_tree* type = get(Type, base_type).elements.at(i).type;
 if (type->value >= START_TYPE_INGREDIENTS) {
   long long int size = size_of_type_ingredient(type, base.type->right);
   if (!size)
@@ -267,7 +267,7 @@ recipe main [
 +mem: storing 12 in location 1
 
 :(before "End GET_ADDRESS field Cases")
-const type_tree* type = get(Type, base_type).elements.at(i);
+const type_tree* type = get(Type, base_type).elements.at(i).type;
 if (type->value >= START_TYPE_INGREDIENTS) {
   long long int size = size_of_type_ingredient(type, base.type->right);
   if (!size)