From 0d909187d5b9effcd08f533d50af7d29c0d6bfd8 Mon Sep 17 00:00:00 2001
From: Eduardo Julian
Date: Fri, 8 Apr 2022 05:42:36 -0400
Subject: De-sigil-ification: $

---
 stdlib/source/program/aedifex/parser.lux | 116 +++++++++++++++----------------
 1 file changed, 58 insertions(+), 58 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 09ae15ed5..5cc914193 100644
--- a/stdlib/source/program/aedifex/parser.lux
+++ b/stdlib/source/program/aedifex/parser.lux
@@ -58,7 +58,7 @@
 
 (def: artifact'
   (Parser //artifact.Artifact)
-  ($_ <>.and ..group ..name ..version))
+  (all <>.and ..group ..name ..version))
 
 (def: artifact
   (Parser //artifact.Artifact)
@@ -83,13 +83,13 @@
               (dictionary.of_list text.hash)
               (<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"))))))))
+    (all <>.and
+         (..singular input "name" ..name)
+         (..singular input "url" ..url)
+         (<>.else {/.#Repo}
+                  (..singular input "type"
+                              (<>.or (<code>.this (' "repo"))
+                                     (<code>.this (' "manual"))))))))
 
 (def: organization
   (Parser /.Organization)
@@ -98,9 +98,9 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (..singular input "name" ..name)
-        (..singular input "url" ..url))))
+    (all <>.and
+         (..singular input "name" ..name)
+         (..singular input "url" ..url))))
 
 (def: developer
   (Parser /.Developer)
@@ -109,11 +109,11 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (..singular input "name" ..name)
-        (..singular input "url" ..url)
-        (<>.maybe (..singular input "organization" ..organization))
-        )))
+    (all <>.and
+         (..singular input "name" ..name)
+         (..singular input "url" ..url)
+         (<>.maybe (..singular input "organization" ..organization))
+         )))
 
 (def: contributor
   (Parser /.Contributor)
@@ -126,16 +126,16 @@
               (dictionary.of_list text.hash)
               (<code>.tuple (<>.some (<>.and <code>.text
                                              <code>.any))))]
-    ($_ <>.and
-        (<>.maybe (..singular input "name" ..name))
-        (<>.maybe (..singular input "url" ..url))
-        (<>.maybe (..singular input "scm" ..scm))
-        (<>.maybe (..singular input "description" ..description))
-        (<>.else (list) (..plural input "licenses" ..license))
-        (<>.maybe (..singular input "organization" ..organization))
-        (<>.else (list) (..plural input "developers" ..developer))
-        (<>.else (list) (..plural input "contributors" ..contributor))
-        )))
+    (all <>.and
+         (<>.maybe (..singular input "name" ..name))
+         (<>.maybe (..singular input "url" ..url))
+         (<>.maybe (..singular input "scm" ..scm))
+         (<>.maybe (..singular input "description" ..description))
+         (<>.else (list) (..plural input "licenses" ..license))
+         (<>.maybe (..singular input "organization" ..organization))
+         (<>.else (list) (..plural input "developers" ..developer))
+         (<>.else (list) (..plural input "contributors" ..contributor))
+         )))
 
 (def: repository
   (Parser //repository.Address)
@@ -148,18 +148,18 @@
 (def: dependency
   (Parser //dependency.Dependency)
   (<code>.tuple
-   ($_ <>.and
-       ..artifact'
-       (<>.else //artifact/type.lux_library ..type)
-       )))
+   (all <>.and
+        ..artifact'
+        (<>.else //artifact/type.lux_library ..type)
+        )))
 
 (def: compiler
   (Parser Compiler)
   (<code>.tuple
-   ($_ <>.and
-       <code>.global
-       (<>.some <code>.text)
-       )))
+   (all <>.and
+        <code>.global
+        (<>.some <code>.text)
+        )))
 
 (def: source
   (Parser /.Source)
@@ -188,10 +188,10 @@
   (let [environment (<>#each (dictionary.of_list text.hash)
                              (<>.some (<code>.tuple (<>.and <code>.text <code>.text))))]
     (<code>.tuple
-     ($_ <>.and
-         environment
-         <code>.text
-         (<>.some <code>.text)))))
+     (all <>.and
+          environment
+          <code>.text
+          (<>.some <code>.text)))))
 
 (def: profile
   (Parser /.Profile)
@@ -260,26 +260,26 @@
            ^ruby (|> ..runtime
                      (..singular input "ruby")
                      (<>.else //runtime.default_ruby))]]
-    ($_ <>.and
-        ^parents
-        ^identity
-        ^info
-        ^repositories
-        ^dependencies
-        ^lux
-        ^compilers
-        ^sources
-        ^target
-        ^program
-        ^test
-        ^deploy_repositories
-        ^configuration
-        ^java
-        ^js
-        ^python
-        ^lua
-        ^ruby
-        )))
+    (all <>.and
+         ^parents
+         ^identity
+         ^info
+         ^repositories
+         ^dependencies
+         ^lux
+         ^compilers
+         ^sources
+         ^target
+         ^program
+         ^test
+         ^deploy_repositories
+         ^configuration
+         ^java
+         ^js
+         ^python
+         ^lua
+         ^ruby
+         )))
 
 (def: .public project
   (Parser Project)
-- 
cgit v1.2.3