From 3c93ddcbaa5edd4e2c0404c3ef0b149b2a33a9f6 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Wed, 2 Dec 2015 18:17:59 -0800 Subject: 2615 We don't actually need skip_whitespace_AND_comments_BUT_NOT_newline anywhere except next_word(). Perhaps what I should really do is split the definition of next_word() into two variants.. --- 056recipe_header.cc | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to '056recipe_header.cc') diff --git a/056recipe_header.cc b/056recipe_header.cc index 2ca02af7..ccfe42d3 100644 --- a/056recipe_header.cc +++ b/056recipe_header.cc @@ -36,28 +36,17 @@ void load_recipe_header(istream& in, recipe& result) { if (s == "->") break; result.ingredients.push_back(reagent(s)); trace(9999, "parse") << "header ingredient: " << result.ingredients.back().original_string << end(); - skip_whitespace_and_comments_but_not_newline(in); + skip_whitespace_but_not_newline(in); } while (has_data(in) && in.peek() != '[' && in.peek() != '\n') { string s = next_word(in); result.products.push_back(reagent(s)); trace(9999, "parse") << "header product: " << result.products.back().original_string << end(); - skip_whitespace_and_comments_but_not_newline(in); + skip_whitespace_but_not_newline(in); } // End Load Recipe Header(result) } -void skip_whitespace_and_comments_but_not_newline(istream& in) { - while (true) { - if (!has_data(in)) break; - if (in.peek() == '\n') break; - if (isspace(in.peek())) in.get(); - else if (Ignore.find(in.peek()) != string::npos) in.get(); - else if (in.peek() == '#') skip_comment(in); - else break; - } -} - :(scenario recipe_handles_stray_comma) recipe main [ 1:number/raw <- add2 3, 5 -- cgit 1.4.1-2-gfad0 c4a9e789c5'>commit diff stats

path: root/tools/termbox/COPYING

blob: e9bb4eacd1f5168a30245f71cfdd14beb1eaffea (plain) (blame)