diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-10-25 12:39:00 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-10-25 12:39:00 -0700 |
commit | b74443e57159d9ace378736c3e389629afc54d0b (patch) | |
tree | 1287d9a5691e070acbdf7ec6463dda7c84171ce0 | |
parent | a796831f3e5697de7194607cfff3efddc588978a (diff) | |
download | mu-b74443e57159d9ace378736c3e389629afc54d0b.tar.gz |
2274
-rw-r--r-- | 011load.cc | 3 | ||||
-rw-r--r-- | 054dilated_reagent.cc | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/011load.cc b/011load.cc index 793e474e..499583da 100644 --- a/011load.cc +++ b/011load.cc @@ -221,11 +221,8 @@ bool warn_on_redefine(const string& recipe_name) { } // for debugging -:(before "End Globals") -bool Show_rest_of_stream = false; :(code) void show_rest_of_stream(istream& in) { - if (!Show_rest_of_stream) return; cerr << '^'; char c; while (in >> c) { diff --git a/054dilated_reagent.cc b/054dilated_reagent.cc index 13f8eea7..c20de79a 100644 --- a/054dilated_reagent.cc +++ b/054dilated_reagent.cc @@ -77,6 +77,7 @@ if (s.at(0) == '{') { in.get(); // skip '{' while (!in.eof()) { string key = next_dilated_word(in); + if (key.empty()) continue; string value = next_dilated_word(in); vector<string> values; values.push_back(value); @@ -111,3 +112,9 @@ string next_dilated_word(istream& in) { } return result; } + +:(scenario dilated_reagent_with_s_expression) +recipe main [ + {1: number, foo: (bar (baz quux))} <- copy 34 +] ++parse: product: {name: "1", properties: ["1": "number", "foo": "(bar (baz quux))"]} |