From a072f67493c04b0e89b601839d41edac3f7432db Mon Sep 17 00:00:00 2001
From: "Kartik K. Agaram" <vc@akkartik.com>
Date: Wed, 4 Nov 2015 12:43:09 -0800
Subject: 2352
---
054dilated_reagent.cc | 5 +++--
055parse_tree.cc | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/054dilated_reagent.cc b/054dilated_reagent.cc
index 4a64a126..46f5f8ab 100644
--- a/054dilated_reagent.cc
+++ b/054dilated_reagent.cc
@@ -95,8 +95,9 @@ if (s.at(0) == '{') {
:(code)
string slurp_key(istream& in) {
string result = next_word(in);
- while (!result.empty() && *result.rbegin() == ':') {
+ while (!result.empty() && *result.rbegin() == ':')
strip_last(result);
- }
+ while (isspace(in.peek()) || in.peek() == ':')
+ in.get();
return result;
}
diff --git a/055parse_tree.cc b/055parse_tree.cc
index bbb685a5..f71b2e19 100644
--- a/055parse_tree.cc
+++ b/055parse_tree.cc
@@ -66,7 +66,7 @@ recipe main [
:(scenario dilated_reagent_with_new)
recipe main [
- x:address:number <- new {(foo bar) type}
+ x:address:number <- new {(foo bar): type}
]
# type isn't defined so size is meaningless, but at least we parse the type correctly
+new: size of <"foo" : <"bar" : <>>> is 1
--
cgit 1.4.1-2-gfad0