From c4bbfea18d995948012f45a6afda7a6e6ba56f84 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Tue, 24 Nov 2020 05:18:04 -0400
Subject: Better error messages when re-using a name when making a definition.

---
 stdlib/source/program/aedifex.lux | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'stdlib/source/program/aedifex.lux')

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index a05dee430..6f98c7651 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -23,7 +23,8 @@
      ["." xml]]
     [collection
      ["." set]
-     ["." dictionary (#+ Dictionary)]]]
+     ["." dictionary (#+ Dictionary)]
+     ["." list ("#\." functor)]]]
    [tool
     [compiler
      [language
@@ -40,7 +41,7 @@
    ["#." pom]
    ["#." cli]
    ["#." cache]
-   ["#." repository (#+ Address)]
+   ["#." repository (#+ Address Repository)]
    ["#." dependency #_
     ["#" resolution]]
    ["#." command (#+ Command)
@@ -53,10 +54,16 @@
     ["#/." auto]
     ["#/." deploy]]])
 
+(def: repositories
+  (-> /.Profile (List (Repository Promise)))
+  (|>> (get@ #/.repositories)
+       set.to-list
+       (list\map (|>> /repository.remote /repository.async))))
+
 (def: (with-dependencies command profile)
   (All [a] (-> (Command a) (Command a)))
   (do /action.monad
-    [_ (/command/deps.do! profile)]
+    [_ (/command/deps.do! (file.async file.default) (..repositories profile) profile)]
     (command profile)))
 
 (exception: (cannot-find-repository {repository Text}
@@ -103,7 +110,7 @@
           (wrap []))
         
         #/cli.Dependencies
-        (exec (/command/deps.do! profile)
+        (exec (/command/deps.do! (file.async file.default) (..repositories profile) profile)
           (wrap []))
 
         (#/cli.Compilation compilation)
-- 
cgit v1.2.3