eliminate variable name requirement from query()

[scpubgit/DKit.git] / lib / DX / RuleSet.pm

diff --git a/lib/DX/RuleSet.pm b/lib/DX/RuleSet.pm
index 1559d49..f0ee6ed 100644 (file)
--- a/lib/DX/RuleSet.pm
+++ b/lib/DX/RuleSet.pm
@@ -17,6 +17,8 @@ use DX::Op::Prop;
 use DX::Op::Exists;
 use DX::Op::Predicate;
 use DX::Op::HasAction;
+use DX::Op::FindAll;
+use DX::Op::ForEach;
 use List::Util qw(reduce);
 
 has rules => (is => 'ro', default => sub { {} });
@@ -78,6 +80,24 @@ sub _expand_op_not {
   );
 }
 
+sub _expand_op_findall {
+  my ($self, $coll_name, $var_name, @contents) = @_;
+  DX::Op::FindAll->new(
+    coll_name => $coll_name,
+    var_name => $var_name,
+    body => $self->expand_and_link(DX::Op::Return->new, @contents),
+  );
+}
+
+sub _expand_op_foreach {
+  my ($self, $var_name, $body, $each_body) = @_;
+  DX::Op::ForEach->new(
+    var_name => $var_name,
+    body => $self->expand_and_link(DX::Op::Return->new, @$body),
+    each_body => $self->expand_and_link(DX::Op::Return->new, @$each_body),
+  );
+}
+
 sub _expand_op_member_of {
   my ($self, $member_var, $coll_var) = @_;
   DX::Op::MemberOf->new(
@@ -119,8 +139,8 @@ sub _expand_op_react {
 }
 
 sub _expand_op_materialize {
-  my ($self, $var_name) = @_;
-  DX::Op::Materialize->new(var_name => $var_name);
+  my ($self) = @_;
+  DX::Op::Materialize->new;
 }
 
 sub _expand_op_prop {