rspace tracing

[scpubgit/DX.git] / lib / DX / Utils.pm

diff --git a/lib/DX/Utils.pm b/lib/DX/Utils.pm
index 9c89107..b52119d 100644 (file)
--- a/lib/DX/Utils.pm
+++ b/lib/DX/Utils.pm
@@ -4,14 +4,14 @@ use strictures 2;
 use Exporter 'import';
 
 my @const = (
-  my @dep_types = qw(EXISTENCE_OF INDICES_OF TYPE_OF CONTENTS_OF),
+  my @dep_types = qw(EXISTENCE_OF TYPE_OF INDICES_OF CONTENTS_OF),
   my @ev_types = qw(VALUE_SET VALUE_EXISTS),
 );
 
 our @EXPORT_OK = (
   @const,
-  (my @builders = qw(step string number dict proposition)),
-  'deparse',
+  (my @builders = qw(rspace rstrat res string number dict proposition)),
+  'deparse', '*trace', 'expand_deps',
 );
 
 our %EXPORT_TAGS = (
@@ -29,7 +29,7 @@ constant->import(+{
   map {; no strict 'refs'; $_ => \*$_ } @const
 });
 
-# $INDICES_OF = 1, ...
+# $EXISTENCE_OF = 1, ...
 
 do { no strict 'refs'; ${$dep_types[$_-1]} = $_ } for 1..@dep_types;
 
@@ -39,12 +39,36 @@ our $VALUE_EXISTS = 1;
 
 # VALUE_EXISTS triggers all types, VALUE_SET all but EXISTENCE_OF
 
-our @VALUE_EXISTS = (EXISTENCE_OF(), INDICES_OF(), TYPE_OF(), CONTENTS_OF());
-our @VALUE_SET = (INDICES_OF(), TYPE_OF(), CONTENTS_OF());
+our @VALUE_EXISTS = (EXISTENCE_OF(), TYPE_OF(), INDICES_OF(), CONTENTS_OF());
+our @VALUE_SET = (TYPE_OF(), INDICES_OF(), CONTENTS_OF());
 
-sub step {
-  require DX::Step::Normal;
-  DX::Step::Normal->new(@_);
+sub trace { }
+
+sub _expand_dep {
+  my ($type, @path) = @{$_[0]};
+  my @expanded = map {
+    ref() ? @{$_->value_path or return ()} : $_
+  } @path;
+  return [ $type, @expanded ];
+}
+
+sub expand_deps {
+  [ map _expand_dep($_), @{$_[0]} ]
+}
+
+sub rspace {
+  require DX::ResolutionSpace;
+  DX::ResolutionSpace->new(@_);
+}
+
+sub rstrat {
+  require DX::ResolutionStrategy;
+  DX::ResolutionStrategy->new(@_);
+}
+
+sub res {
+  require DX::Resolution;
+  DX::Resolution->new(@_);
 }
 
 sub string {
@@ -78,11 +102,11 @@ sub proposition {
 
   sub deparse {
     $dp ||= do {
-      require DX::Deparse;
-      DX::Deparse->new;
+      require DX::TraceFormatter;
+      DX::TraceFormatter->new;
     };
     my ($thing) = @_;
-    $dp->fmt($thing);
+    $dp->format($thing);
   }
 }