2971

Long-overdue reorganization to support general 'dilated' reagents up
front. This also allows me to move tests that are really about unrelated
layers out of layers dealing with parsing.

1 files changed, 71 insertions, 0 deletions

diff --git a/017parse_tree.cc b/017parse_tree.cc
new file mode 100644
index 00000000..833fb978
--- /dev/null
+++ b/017parse_tree.cc
@@ -0,0 +1,71 @@
+// So far instructions can only contain linear lists of properties. Now we add
+// support for more complex trees of properties in dilated reagents. This will
+// come in handy later for expressing complex types, like "a dictionary from
+// (address to array of charaters) to (list of numbers)".
+
+:(scenarios load)
+:(scenario dilated_reagent_with_nested_brackets)
+def main [
+  {1: number, foo: (bar (baz quux))} <- copy 34
+]
++parse:   product: {1: "number", "foo": ("bar" ("baz" "quux"))}
+
+:(before "End Parsing Reagent Property(value)")
+value = parse_string_tree(value);
+:(before "End Parsing Reagent Type Property(value)")
+value = parse_string_tree(value);
+
+:(code)
+string_tree* parse_string_tree(string_tree* s) {
+  assert(!s->left && !s->right);
+  if (s->value.at(0) != '(') return s;
+  string_tree* result = parse_string_tree(s->value);
+  delete s;
+  return result;
+}
+
+string_tree* parse_string_tree(const string& s) {
+  istringstream in(s);
+  in >> std::noskipws;
+  return parse_string_tree(in);
+}
+
+string_tree* parse_string_tree(istream& in) {
+  skip_whitespace_but_not_newline(in);
+  if (!has_data(in)) return NULL;
+  if (in.peek() == ')') {
+    in.get();
+    return NULL;
+  }
+  if (in.peek() != '(') {
+    string_tree* result = new string_tree(next_word(in));
+    return result;
+  }
+  in.get();  // skip '('
+  string_tree* result = NULL;
+  string_tree** curr = &result;
+  while (in.peek() != ')') {
+    assert(has_data(in));
+    *curr = new string_tree("");
+    skip_whitespace_but_not_newline(in);
+    if (in.peek() == '(')
+      (*curr)->left = parse_string_tree(in);
+    else
+      (*curr)->value = next_word(in);
+    curr = &(*curr)->right;
+  }
+  in.get();  // skip ')'
+  return result;
+}
+
+:(scenario dilated_reagent_with_type_tree)
+% Hide_errors = true;  // 'map' isn't defined yet
+def main [
+  {1: (foo (address array character) (bar number))} <- copy 34
+]
+# just to avoid errors
+container foo [
+]
+container bar [
+]
++parse:   product: {1: ("foo" ("address" "array" "character") ("bar" "number"))}