From eeed3845cd504028779c333665e0b9fad2070357 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Thu, 6 Oct 2016 21:49:36 -0700 Subject: 3456 --- html/089scenario_filesystem.cc.html | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'html/089scenario_filesystem.cc.html') diff --git a/html/089scenario_filesystem.cc.html b/html/089scenario_filesystem.cc.html index 2f10c895..73232bdc 100644 --- a/html/089scenario_filesystem.cc.html +++ b/html/089scenario_filesystem.cc.html @@ -148,7 +148,7 @@ put(Recipe_ordinal,if (!has_data(in)) break; skip_whitespace_and_comments(in); if (!has_data(in)) break; - string filename = next_filesystem_word(in); + string filename = next_word(in); if (*filename.begin() != '[') { raise << caller << ": assume-filesystem: filename '" << filename << "' must begin with a '['\n" << end(); break; @@ -163,7 +163,7 @@ put(Recipe_ordinal,": assume-filesystem: no data for filename '" << filename << "'\n" << end(); break; } - string arrow = next_filesystem_word(in); + string arrow = next_word(in); if (arrow != "<-") { raise << caller << ": assume-filesystem: expected '<-' after filename '" << filename << "' but got '" << arrow << "'\n" << end(); break; @@ -172,7 +172,7 @@ put(Recipe_ordinal,": assume-filesystem: no data for filename '" << filename << "' after '<-'\n" << end(); break; } - string contents = next_filesystem_word(in); + string contents = next_word(in); if (*contents.begin() != '[') { raise << caller << ": assume-filesystem: file contents '" << contents << "' for filename '" << filename << "' must begin with a '['\n" << end(); break; @@ -264,19 +264,6 @@ string munge_filesystem_contents(return result; } -string next_filesystem_word(istream& in) { - skip_whitespace_and_comments(in); - if (in.peek() == '[') { - string result = slurp_quoted(in); - skip_whitespace_and_comments_but_not_newline(in); - return result; - } - ostringstream out; - slurp_word(in, out); - skip_whitespace_and_comments(in); - return out.str(); -} - void skip_whitespace(istream& in) { while (true) { if (!has_data(in)) break; -- cgit 1.4.1-2-gfad0