From ce7614f00a134cb61b4a6f88cfea33461a7bf478 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Wed, 7 Oct 2020 17:00:57 -0400
Subject: Test imports for circular dependencies.

---
 stdlib/source/program/aedifex/parser.lux | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

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

diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 87f41f2c6..1799db09e 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -81,13 +81,13 @@
                (dictionary.from-list text.hash)
                (<c>.record (<>.some (<>.and <c>.local-tag
                                             <c>.any))))]
-    (<c>.tuple ($_ <>.and
-                   (..singular input "name" ..name)
-                   (..singular input "url" ..url)
-                   (<>.default #/.Repo
-                               (..singular input "type"
-                                           (<>.or (<c>.this! (' #repo))
-                                                  (<c>.this! (' #manual)))))))))
+    ($_ <>.and
+        (..singular input "name" ..name)
+        (..singular input "url" ..url)
+        (<>.default #/.Repo
+                    (..singular input "type"
+                                (<>.or (<c>.this! (' #repo))
+                                       (<c>.this! (' #manual))))))))
 
 (def: organization
   (Parser /.Organization)
@@ -163,9 +163,10 @@
   <c>.text)
 
 (def: deploy-repository
-  (Parser [Text //dependency.Repository])
-  (<c>.tuple (<>.and <c>.text
-                     ..repository)))
+  (Parser (List [Text //dependency.Repository]))
+  (<c>.record (<>.some
+               (<>.and <c>.text
+                       ..repository))))
 
 (def: profile
   (Parser /.Profile)
@@ -207,7 +208,7 @@
            ^deploy-repositories (: (Parser (Dictionary Text //dependency.Repository))
                                    (<| (:: @ map (dictionary.from-list text.hash))
                                        (<>.default (list))
-                                       (..plural input "deploy-repositories" ..deploy-repository)))]]
+                                       (..singular input "deploy-repositories" ..deploy-repository)))]]
     ($_ <>.and
         ^parents
         ^identity
-- 
cgit v1.2.3