Some bug fixes.

8 files changed, 38 insertions, 38 deletions

diff --git a/stdlib/source/test/aedifex/command/auto.lux b/stdlib/source/test/aedifex/command/auto.lux
index 41d0f080f..ea62b6daa 100644
--- a/stdlib/source/test/aedifex/command/auto.lux
+++ b/stdlib/source/test/aedifex/command/auto.lux
@@ -53,7 +53,7 @@
     [@runs
      (function (_ console program fs shell resolution profile)
        (do {! async.monad}
-         [[_ actual_runs] (async.future (atom.update! inc @runs))]
+         [[_ actual_runs] (async.future (atom.update! ++ @runs))]
          (if (n.= expected_runs actual_runs)
            (in (#try.Failure end_signal))
            (do (try.with !)
@@ -77,14 +77,14 @@
          .let [empty_profile (: Profile
                                 (\ ///.monoid identity))
                with_target (: (-> Profile Profile)
-                              (set@ #///.target target))
+                              (with@ #///.target target))
                with_program (: (-> Profile Profile)
-                               (set@ #///.program (#.Some program)))
+                               (with@ #///.program (#.Some program)))
                
                profile (|> empty_profile
                            with_program
                            with_target
-                           (set@ #///.sources (set.of_list text.hash (list source))))]
+                           (with@ #///.sources (set.of_list text.hash (list source))))]
 
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
@@ -103,7 +103,7 @@
                               _ (\ watcher poll [])]
                              (do {! async.monad}
                                [no_dangling_process! (|> profile
-                                                         (set@ #///.compiler compiler)
+                                                         (with@ #///.compiler compiler)
                                                          ((/.do! 1 watcher command)
                                                           ($version.echo "")
                                                           (program.async (program.mock environment.empty home working_directory))
diff --git a/stdlib/source/test/aedifex/command/build.lux b/stdlib/source/test/aedifex/command/build.lux
index 81f331e41..03625f0c1 100644
--- a/stdlib/source/test/aedifex/command/build.lux
+++ b/stdlib/source/test/aedifex/command/build.lux
@@ -151,9 +151,9 @@
          .let [empty_profile (: Profile
                                 (\ ///.monoid identity))
                with_target (: (-> Profile Profile)
-                              (set@ #///.target target))
+                              (with@ #///.target target))
                with_program (: (-> Profile Profile)
-                               (set@ #///.program (#.Some program)))
+                               (with@ #///.program (#.Some program)))
                
                profile (|> empty_profile
                            with_program
@@ -185,7 +185,7 @@
                     [verdict (do ///action.monad
                                [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs shell resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 start (\ console read_line [])
                                 end (\ console read_line [])]
                                (in (and (text\= /.start start)
@@ -207,7 +207,7 @@
                     [verdict (do ///action.monad
                                [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs (shell.async (..bad_shell [])) resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 start (\ console read_line [])
                                 end (\ console read_line [])]
                                (in (and (text\= /.start start)
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index fffef3033..30ef6eb6f 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -103,7 +103,7 @@
                           context_exists!/pre (..directory_exists? fs context)
                           target_exists!/pre (..assets_exist? fs target_path direct_files)
                           sub_exists!/pre (..assets_exist? fs sub_path sub_files)
-                          _ (/.do! console fs (set@ #///.target target_path dummy))
+                          _ (/.do! console fs (with@ #///.target target_path dummy))
                           context_exists!/post (..directory_exists? fs context)
                           target_exists!/post (..assets_exist? fs target_path direct_files)
                           sub_exists!/post (..assets_exist? fs sub_path sub_files)
diff --git a/stdlib/source/test/aedifex/command/deploy.lux b/stdlib/source/test/aedifex/command/deploy.lux
index 4d11234bd..1df6a4180 100644
--- a/stdlib/source/test/aedifex/command/deploy.lux
+++ b/stdlib/source/test/aedifex/command/deploy.lux
@@ -55,7 +55,7 @@
       (Async (Try Text)))
   (do ///action.monad
     [.let [console ($version.echo "")]
-     _ ($install.make_sources! fs (get@ #///.sources profile))
+     _ ($install.make_sources! fs (value@ #///.sources profile))
      _ (/.do! console repository fs artifact profile)]
     (\ console read_line [])))
 
@@ -66,7 +66,7 @@
         [[artifact expected_pom profile]
          (random.one (function (_ profile)
                        (do maybe.monad
-                         [artifact (get@ #///.identity profile)
+                         [artifact (value@ #///.identity profile)
                           expected_pom (try.maybe (///pom.write profile))]
                          (in [artifact expected_pom profile])))
                      $profile.random)
@@ -81,19 +81,19 @@
               [verdict (do {! ///action.monad}
                          [logging (..execute! program repository fs artifact profile)
                           expected_library (|> profile
-                                               (get@ #///.sources)
+                                               (value@ #///.sources)
                                                set.list
                                                (export.library fs)
                                                (\ ! map (format.result tar.writer)))
 
-                          actual_pom (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.pom))
-                          actual_library (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact ///artifact/extension.lux_library))
-                          actual_sha-1 (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
+                          actual_pom (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact ///artifact/extension.pom))
+                          actual_library (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact ///artifact/extension.lux_library))
+                          actual_sha-1 (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.sha-1)))
                           actual_sha-1 (\ async.monad in
                                           (do try.monad
                                             [actual_sha-1 (\ utf8.codec decode actual_sha-1)]
                                             (\ ///hash.sha-1_codec decode actual_sha-1)))
-                          actual_md5 (\ repository download (///repository/remote.uri (get@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
+                          actual_md5 (\ repository download (///repository/remote.uri (value@ #///artifact.version artifact) artifact (format ///artifact/extension.lux_library ///artifact/extension.md5)))
                           actual_md5 (\ async.monad in
                                         (do try.monad
                                           [actual_md5 (\ utf8.codec decode actual_md5)]
diff --git a/stdlib/source/test/aedifex/command/deps.lux b/stdlib/source/test/aedifex/command/deps.lux
index 0c6676488..ec45ba697 100644
--- a/stdlib/source/test/aedifex/command/deps.lux
+++ b/stdlib/source/test/aedifex/command/deps.lux
@@ -73,25 +73,25 @@
                          #///dependency.type ///artifact/type.lux_library}
 
                dependee_pom (|> (\ ///.monoid identity)
-                                (set@ #///.identity (#.Some dependee_artifact))
+                                (with@ #///.identity (#.Some dependee_artifact))
                                 ///pom.write
                                 try.trusted)
                depender_pom (|> (\ ///.monoid identity)
-                                (set@ #///.identity (#.Some depender_artifact))
-                                (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
+                                (with@ #///.identity (#.Some depender_artifact))
+                                (with@ #///.dependencies (set.of_list ///dependency.hash (list dependee)))
                                 ///pom.write
                                 try.trusted)
                
                dependee_package (|> dependee_package
-                                    (set@ #///package.origin (#///repository/origin.Remote ""))
-                                    (set@ #///package.pom [dependee_pom
-                                                           (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
-                                                           #///dependency/status.Unverified]))
+                                    (with@ #///package.origin (#///repository/origin.Remote ""))
+                                    (with@ #///package.pom [dependee_pom
+                                                            (|> dependee_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                                            #///dependency/status.Unverified]))
                depender_package (|> depender_package
-                                    (set@ #///package.origin (#///repository/origin.Remote ""))
-                                    (set@ #///package.pom [depender_pom
-                                                           (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
-                                                           #///dependency/status.Unverified]))
+                                    (with@ #///package.origin (#///repository/origin.Remote ""))
+                                    (with@ #///package.pom [depender_pom
+                                                            (|> depender_pom (\ xml.codec encode) (\ utf8.codec encode))
+                                                            #///dependency/status.Unverified]))
 
                fs (file.mock (\ file.default separator))
                program (program.async (program.mock environment.empty home working_directory))]]
@@ -103,7 +103,7 @@
                                   (dictionary.has dependee dependee_package)
                                   (///dependency/deployment.all local))
                           post (|> (\ ///.monoid identity)
-                                   (set@ #///.dependencies (set.of_list ///dependency.hash (list dependee depender)))
+                                   (with@ #///.dependencies (set.of_list ///dependency.hash (list dependee depender)))
                                    (/.do! console local
                                           (list (///repository.mock ($///dependency/resolution.single depender_artifact depender_package)
                                                                     []))
diff --git a/stdlib/source/test/aedifex/command/install.lux b/stdlib/source/test/aedifex/command/install.lux
index 86fe5ebea..f1c0c2de1 100644
--- a/stdlib/source/test/aedifex/command/install.lux
+++ b/stdlib/source/test/aedifex/command/install.lux
@@ -56,7 +56,7 @@
   (-> (Program Async) (file.System Async) ///.Profile (Async (Try Text)))
   (do ///action.monad
     [.let [console ($version.echo "")]
-     _ (..make_sources! fs (get@ #///.sources sample))
+     _ (..make_sources! fs (value@ #///.sources sample))
      _ (/.do! console fs (///repository/local.repository program fs) sample)]
     (\ console read_line [])))
 
@@ -65,7 +65,7 @@
   (<| (_.covering /._)
       (do {! random.monad}
         [identity $artifact.random
-         sample (\ ! map (set@ #///.identity (#.Some identity))
+         sample (\ ! map (with@ #///.identity (#.Some identity))
                    $profile.random)
          home (random.ascii/alpha 5)
          working_directory (random.ascii/alpha 5)
@@ -75,7 +75,7 @@
                   [.let [fs (file.mock /)
                          program (program.async (program.mock environment.empty home working_directory))
 
-                         artifact_path (///local.uri (get@ #///artifact.version identity) identity)
+                         artifact_path (///local.uri (value@ #///artifact.version identity) identity)
                          library_path (format artifact_path ///artifact/extension.lux_library)
                          pom_path (format artifact_path ///artifact/extension.pom)]
                    verdict (do {! ///action.monad}
@@ -97,7 +97,7 @@
             (in (do {! async.monad}
                   [.let [fs (file.mock /)
                          program (program.async (program.mock environment.empty home working_directory))]
-                   logging (..execute! program fs (set@ #///.identity #.None sample))]
+                   logging (..execute! program fs (with@ #///.identity #.None sample))]
                   (_.cover' [/.failure]
                             (|> logging
                                 (try\map (text\= /.failure))
diff --git a/stdlib/source/test/aedifex/command/pom.lux b/stdlib/source/test/aedifex/command/pom.lux
index 9577842c1..b06a7c944 100644
--- a/stdlib/source/test/aedifex/command/pom.lux
+++ b/stdlib/source/test/aedifex/command/pom.lux
@@ -62,7 +62,7 @@
                 
                 (#try.Failure error)
                 (_.cover' [/.do!]
-                          (case (get@ #///.identity sample)
+                          (case (value@ #///.identity sample)
                             (#.Some _)
                             false
 
diff --git a/stdlib/source/test/aedifex/command/test.lux b/stdlib/source/test/aedifex/command/test.lux
index f2117fad4..3e3cf85d7 100644
--- a/stdlib/source/test/aedifex/command/test.lux
+++ b/stdlib/source/test/aedifex/command/test.lux
@@ -50,9 +50,9 @@
          .let [empty_profile (: Profile
                                 (\ ///.monoid identity))
                with_target (: (-> Profile Profile)
-                              (set@ #///.target target))
+                              (with@ #///.target target))
                with_test (: (-> Profile Profile)
-                            (set@ #///.test (#.Some test)))
+                            (with@ #///.test (#.Some test)))
                
                profile (|> empty_profile
                            with_test
@@ -65,7 +65,7 @@
                     [verdict (do ///action.monad
                                [_ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs (shell.async (@build.good_shell [])) resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 build_start (\ console read_line [])
                                 build_end (\ console read_line [])
                                 test_start (\ console read_line [])
@@ -101,7 +101,7 @@
                                                  [])]
                                 _ (/.do! console (program.async (program.mock environment.empty home working_directory))
                                          fs (shell.async bad_shell) resolution
-                                         (set@ #///.compiler compiler profile))
+                                         (with@ #///.compiler compiler profile))
                                 build_start (\ console read_line [])
                                 build_end (\ console read_line [])
                                 test_start (\ console read_line [])