about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2016-02-21 20:47:27 -0800
committerKartik K. Agaram <vc@akkartik.com>2016-02-21 20:47:27 -0800
commit964a86f041be135c6ef92b2fb822c951d3d6d415 (patch)
treebab59bf318360425c8da0a79d9cc3b2fb36a5150
parent2e8670310ede65c8cdf5a9b995254e4ad7389dca (diff)
downloadmu-964a86f041be135c6ef92b2fb822c951d3d6d415.tar.gz
2683
Ok, we don't need that check after all, because the
type_ingredient_names.empty() check earlier in the layer prevents it
from ever triggering.
-rw-r--r--030container.cc1
-rw-r--r--058shape_shifting_container.cc6
2 files changed, 0 insertions, 7 deletions
diff --git a/030container.cc b/030container.cc
index 183c360c..6b7f3dc0 100644
--- a/030container.cc
+++ b/030container.cc
@@ -599,7 +599,6 @@ void check_container_field_types() {
 
 void check_invalid_types(const type_tree* type, const string& block, const string& name) {
   if (!type) return;  // will throw a more precise error elsewhere
-  // End Container Type Checks2
   if (type->value == 0) {
     assert(!type->left && !type->right);
     return;
diff --git a/058shape_shifting_container.cc b/058shape_shifting_container.cc
index 74f97016..5bfd8e11 100644
--- a/058shape_shifting_container.cc
+++ b/058shape_shifting_container.cc
@@ -109,12 +109,6 @@ bool is_type_ingredient_name(const string& type) {
 if (type->value >= START_TYPE_INGREDIENTS
     && (type->value - START_TYPE_INGREDIENTS) < SIZE(get(Type, type->value).type_ingredient_names))
   return;
-:(code)
-//? //: TODO: is this necessary?
-//? :(before "End Container Type Checks2")
-//? if (type->value >= START_TYPE_INGREDIENTS
-//?     && (type->value - START_TYPE_INGREDIENTS) < SIZE(get(Type, type->value).type_ingredient_names))
-//?   return;
 
 :(scenario size_of_shape_shifting_exclusive_container)
 exclusive-container foo:_t [