diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2016-02-19 13:57:43 -0800 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2016-02-19 13:57:46 -0800 |
commit | 8e1d1add72e8b367ded6995c26f287f0b544cabe (patch) | |
tree | caddba7b9094841098d1bab1b5934b0f49d92b41 | |
parent | 9f95c7451b940b6644cb6fd6783ea9c17168357e (diff) | |
download | mu-8e1d1add72e8b367ded6995c26f287f0b544cabe.tar.gz |
2686
-rw-r--r-- | 010vm.cc | 4 | ||||
-rw-r--r-- | 011load.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/010vm.cc b/010vm.cc index ae262e42..052473eb 100644 --- a/010vm.cc +++ b/010vm.cc @@ -41,7 +41,7 @@ struct instruction { // End instruction Fields instruction(); void clear(); - bool is_clear(); + bool is_empty(); }; :(before "struct instruction") @@ -225,7 +225,7 @@ instruction::instruction() :is_label(false), operation(IDLE) { // End instruction Constructor } void instruction::clear() { is_label=false; label.clear(); name.clear(); old_name.clear(); operation=IDLE; ingredients.clear(); products.clear(); original_string.clear(); } -bool instruction::is_clear() { return !is_label && name.empty(); } +bool instruction::is_empty() { return !is_label && name.empty(); } // Reagents have the form <name>:<type>:<type>:.../<property>/<property>/... reagent::reagent(string s) :original_string(s), value(0), initialized(false), type(NULL) { diff --git a/011load.cc b/011load.cc index 2003eb7d..fc097e63 100644 --- a/011load.cc +++ b/011load.cc @@ -76,7 +76,7 @@ void slurp_body(istream& in, recipe& result) { while (next_instruction(in, &curr)) { // End Rewrite Instruction(curr, recipe result) trace(9992, "load") << "after rewriting: " << to_string(curr) << end(); - if (!curr.is_clear()) { + if (!curr.is_empty()) { curr.original_string = to_string(curr); result.steps.push_back(curr); } |