diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2016-03-19 00:51:19 -0700 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2016-03-19 00:53:45 -0700 |
| commit | 968866f7ac183811e449b11da9b2a2f1b0d97227 (patch) | |
| tree | 6bd8d4f1412d4d2ccc7a74f0537c166bf0fda77e /057shape_shifting_container.cc | |
| parent | 1d1faace5d624b7bac96eb57a9373d2511ac08e1 (diff) | |
| download | mu-968866f7ac183811e449b11da9b2a2f1b0d97227.tar.gz | |
2791
Simplify 2790 by simply not computing any type->value inside parse_type_tree. It now only generates names, and it turns out the consumers handle the absence of values anyway. Now parse_type_tree no longer pollutes the Type_ordinal table with type ingredients.
Diffstat (limited to '057shape_shifting_container.cc')
| -rw-r--r-- | 057shape_shifting_container.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/057shape_shifting_container.cc b/057shape_shifting_container.cc index 04b5900f..06ceeea3 100644 --- a/057shape_shifting_container.cc +++ b/057shape_shifting_container.cc @@ -94,9 +94,8 @@ void read_type_ingredients(string& name) { :(before "End insert_container Special-cases") // check for use of type ingredients -else if (!type->name.empty() && is_type_ingredient_name(type->name)) { +else if (is_type_ingredient_name(type->name)) { type->value = get(info.type_ingredient_names, type->name); - goto recurse; } :(code) bool is_type_ingredient_name(const string& type) { |