De-taggification | part 3

2 files changed, 15 insertions, 22 deletions

diff --git a/stdlib/source/program/aedifex/format.lux b/stdlib/source/program/aedifex/format.lux
index af03bf827..f6b737fdf 100644
--- a/stdlib/source/program/aedifex/format.lux
+++ b/stdlib/source/program/aedifex/format.lux
@@ -27,10 +27,10 @@
        #url (~ (code.text url))
        #type (~ (case type
                   #/.Repo
-                  (' #repo)
+                  (' "repo")
 
                   #/.Manual
-                  (' #manual)))]))
+                  (' "manual")))]))
 
 (def: (organization [name url])
   (Format /.Organization)
@@ -60,7 +60,7 @@
   (Format Aggregate)
   (|>> dictionary.entries
        (list\each (function (_ [key value])
-                    (list (code.local_tag key) value)))
+                    (list (code.text key) value)))
        list\conjoint
        code.tuple))
 
@@ -141,7 +141,7 @@
   (` [(~ (code.text program))
       (~+ (list\each code.text parameters))]))
 
-(def: .public (profile value)
+(def: (profile value)
   (Format /.Profile)
   (`` (|> ..empty
           (..on_list "parents" (value@ #/.parents value) code.text)
diff --git a/stdlib/source/program/aedifex/parser.lux b/stdlib/source/program/aedifex/parser.lux
index 0284d3ced..315021712 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -84,22 +84,22 @@
   (do {! <>.monad}
     [input (\ ! each
               (dictionary.of_list text.hash)
-              (<code>.tuple (<>.some (<>.and <code>.local_tag
+              (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
     ($_ <>.and
         (..singular input "name" ..name)
         (..singular input "url" ..url)
         (<>.else #/.Repo
                  (..singular input "type"
-                             (<>.or (<code>.this! (' #repo))
-                                    (<code>.this! (' #manual))))))))
+                             (<>.or (<code>.this! (' "repo"))
+                                    (<code>.this! (' "manual"))))))))
 
 (def: organization
   (Parser /.Organization)
   (do {! <>.monad}
     [input (\ ! each
               (dictionary.of_list text.hash)
-              (<code>.tuple (<>.some (<>.and <code>.local_tag
+              (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
     ($_ <>.and
         (..singular input "name" ..name)
@@ -110,7 +110,7 @@
   (do {! <>.monad}
     [input (\ ! each
               (dictionary.of_list text.hash)
-              (<code>.tuple (<>.some (<>.and <code>.local_tag
+              (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
     ($_ <>.and
         (..singular input "name" ..name)
@@ -127,7 +127,7 @@
   (do {! <>.monad}
     [input (\ ! each
               (dictionary.of_list text.hash)
-              (<code>.tuple (<>.some (<>.and <code>.local_tag
+              (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
     ($_ <>.and
         (<>.maybe (..singular input "url" ..url))
@@ -183,7 +183,7 @@
   (do {! <>.monad}
     [input (\ ! each
               (dictionary.of_list text.hash)
-              (<code>.tuple (<>.some (<>.and <code>.local_tag
+              (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))
      .let [^parents (: (Parser (List /.Name))
                        (<>.else (list)
@@ -260,14 +260,7 @@
 
 (def: .public project
   (Parser Project)
-  (let [default_profile (: (Parser Project)
-                           (\ <>.monad each
-                              (|>> [/.default] (list) (dictionary.of_list text.hash))
-                              ..profile))
-        multi_profile (: (Parser Project)
-                         (\ <>.monad each
-                            (dictionary.of_list text.hash)
-                            (<code>.tuple (<>.many (<>.and <code>.text
-                                                           ..profile)))))]
-    (<>.either multi_profile
-               default_profile)))
+  (\ <>.monad each
+     (dictionary.of_list text.hash)
+     (<code>.tuple (<>.many (<>.and <code>.text
+                                    ..profile)))))