rename Deparse to TraceFormatter and add ambient indent level

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

diff --git a/lib/DX/Utils.pm b/lib/DX/Utils.pm
index 0cb207d..efdc259 100644 (file)
--- a/lib/DX/Utils.pm
+++ b/lib/DX/Utils.pm
@@ -10,7 +10,7 @@ my @const = (
 
 our @EXPORT_OK = (
   @const,
-  (my @builders = qw(step string number dict proposition)),
+  (my @builders = qw(step rspace rstrat res string number dict proposition)),
   'deparse', '*trace',
 );
 
@@ -65,6 +65,21 @@ sub step {
   );
 }
 
+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 {
   require DX::Value::String;
   DX::Value::String->new(string_value => $_[0])
@@ -96,11 +111,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);
   }
 }