3120

Always show instruction before any transforms in error messages.

This is likely going to make some errors unclear because they *need* to
show the original instruction. But if we don't have tests for those
situations did they ever really work?

1 files changed, 2 insertions, 4 deletions

diff --git a/011load.cc b/011load.cc
index 3a65586b..5988a7ba 100644
--- a/011load.cc
+++ b/011load.cc
@@ -71,12 +71,10 @@ void slurp_body(istream& in, recipe& result) {
   skip_whitespace_and_comments(in);  // permit trailing comment after '['
   instruction curr;
   while (next_instruction(in, &curr)) {
+    curr.original_string = to_original_string(curr);
     // End Rewrite Instruction(curr, recipe result)
     trace(9992, "load") << "after rewriting: " << to_string(curr) << end();
-    if (!curr.is_empty()) {
-      curr.original_string = to_string(curr);
-      result.steps.push_back(curr);
-    }
+    if (!curr.is_empty()) result.steps.push_back(curr);
   }
 }