Some improvements to the Lux syntax parser.

1 files changed, 3 insertions, 32 deletions

diff --git a/stdlib/source/program/aedifex.lux b/stdlib/source/program/aedifex.lux
index 327eb8902..76db24a47 100644
--- a/stdlib/source/program/aedifex.lux
+++ b/stdlib/source/program/aedifex.lux
@@ -33,6 +33,7 @@
    [action (#+ Action)]
    ["#" profile]
    ["#." project (#+ Project)]
+   ["#." input]
    ["#." parser]
    ["#." pom]
    ["#." cli]
@@ -46,26 +47,6 @@
     ["#/." auto]
     ["#/." deploy]]])
 
-(def: (read-file! path)
-  (-> Path (IO (Try Binary)))
-  (do (try.with io.monad)
-    [project-file (!.use (:: file.system file) [path])]
-    (!.use (:: project-file content) [])))
-
-(def: (read-code source-code)
-  (-> Text (Try Code))
-  (let [parse (syntax.parse ""
-                            syntax.no-aliases
-                            (text.size source-code))
-        start (: Source
-                 [["" 0 0] 0 source-code])]
-    (case (parse start)
-      (#.Left [end error])
-      (#try.Failure error)
-      
-      (#.Right [end lux-code])
-      (#try.Success lux-code))))
-
 (def: (install! profile)
   (-> /.Profile (Promise Any))
   (do promise.monad
@@ -99,20 +80,10 @@
             (log! (format "Could not resolve dependencies:" text.new-line
                           error))))))
 
-(def: project
-  (-> Binary (Try Project))
-  (|>> (do> try.monad
-            [encoding.from-utf8]
-            [..read-code]
-            [(list) (<c>.run /parser.project)])))
-
 (program: [{[profile operation] /cli.command}]
   (do {@ io.monad}
-    [data (..read-file! /.file)]
-    (case (do try.monad
-            [data data
-             project (..project data)]
-            (/project.profile profile project))
+    [?profile (/input.read io.monad file.system profile)]
+    (case ?profile
       (#try.Success profile)
       (case operation
         #/cli.POM