diff options
| author | Kartik K. Agaram <vc@akkartik.com> | 2015-11-07 19:54:38 -0800 |
|---|---|---|
| committer | Kartik K. Agaram <vc@akkartik.com> | 2015-11-07 19:54:38 -0800 |
| commit | 6fa778b3e71f625fad5e98d540b2a613328f8571 (patch) | |
| tree | ca58f43304e071193151e164d5d26b8d178f6a59 | |
| parent | cb0060ee0f88149968a8f2b0bbf617c88ea46753 (diff) | |
| download | mu-6fa778b3e71f625fad5e98d540b2a613328f8571.tar.gz | |
2390 - undo 2389
Ooh, I think I see a solution.
| -rw-r--r-- | 003trace.cc | 2 | ||||
| -rw-r--r-- | 020run.cc | 4 | ||||
| -rw-r--r-- | 059generic_recipe.cc | 6 |
3 files changed, 3 insertions, 9 deletions
diff --git a/003trace.cc b/003trace.cc index fa333191..4a563fc6 100644 --- a/003trace.cc +++ b/003trace.cc @@ -198,7 +198,7 @@ struct lease_tracer { #define START_TRACING_UNTIL_END_OF_SCOPE lease_tracer leased_tracer; :(before "End Test Setup") -//? START_TRACING_UNTIL_END_OF_SCOPE +START_TRACING_UNTIL_END_OF_SCOPE :(before "End Includes") #define CHECK_TRACE_CONTENTS(...) check_trace_contents(__FUNCTION__, __FILE__, __LINE__, __VA_ARGS__) diff --git a/020run.cc b/020run.cc index 1a822be1..fad6a5b0 100644 --- a/020run.cc +++ b/020run.cc @@ -134,8 +134,8 @@ inline bool routine::completed() const { //: Step 1: load all .mu files with numeric prefixes (in order) :(before "End Load Recipes") -Trace_file = "interactive"; -START_TRACING_UNTIL_END_OF_SCOPE; +//? Trace_file = "interactive"; +//? START_TRACING_UNTIL_END_OF_SCOPE; load_permanently("core.mu"); transform_all(); diff --git a/059generic_recipe.cc b/059generic_recipe.cc index e31a5d12..64dbf6a1 100644 --- a/059generic_recipe.cc +++ b/059generic_recipe.cc @@ -153,12 +153,6 @@ recipe_ordinal new_variant(recipe_ordinal exemplar, const instruction& inst) { map<string, string> mappings; // weak references compute_type_ingredient_mappings(get(Recipe, exemplar), inst, mappings); replace_type_ingredients(new_recipe, mappings); - // redo all previous transforms in the new specialization, except for non-idempotent ones - // including this one in case there are new ambiguous calls in the specialization - for (long long int t = 0; t <= new_recipe.transformed_until; ++t) { - if (Transform.at(t) == insert_fragments) continue; // not idempotent - (*Transform.at(t))(result); - } return result; } |