Almost done with Scheme.

But will have to postpone finishing it because Kawa is not up to snuff.

1 files changed, 22 insertions, 18 deletions

diff --git a/stdlib/source/program/compositor.lux b/stdlib/source/program/compositor.lux
index a66022594..03e9b281d 100644
--- a/stdlib/source/program/compositor.lux
+++ b/stdlib/source/program/compositor.lux
@@ -78,15 +78,17 @@
           (#try.Success content)
           (do (try.with monad)
             [package (:share [!]
-                             {(Monad !)
-                              monad}
-                             {(! (Try (File !)))
-                              (:assume (file.get_file monad file_system package))})]
+                             (Monad !)
+                             monad
+                             
+                             (! (Try (File !)))
+                             (:assume (file.get_file monad file_system package)))]
             (!.use (\ (:share [!]
-                              {(Monad !)
-                               monad}
-                              {(File !)
-                               (:assume package)})
+                              (Monad !)
+                              monad
+                              
+                              (File !)
+                              (:assume package))
                       over_write)
                    [content]))
           
@@ -134,17 +136,19 @@
               [#let [[compilation_sources compilation_libraries compilation_target compilation_module] compilation]
                import (/import.import (get@ #platform.&file_system platform) compilation_libraries)
                [state archive] (:share [<parameters>]
-                                       {(Platform <parameters>)
-                                        platform}
-                                       {(Promise (Try [(directive.State+ <parameters>)
-                                                       Archive]))
-                                        (:assume (platform.initialize static compilation_module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender
-                                                                      import compilation_sources))})
+                                       (Platform <parameters>)
+                                       platform
+                                       
+                                       (Promise (Try [(directive.State+ <parameters>)
+                                                      Archive]))
+                                       (:assume (platform.initialize static compilation_module expander host_analysis platform generation_bundle host_directive_bundle program anchorT,expressionT,directiveT extender
+                                                                     import compilation_sources)))
                [archive state] (:share [<parameters>]
-                                       {(Platform <parameters>)
-                                        platform}
-                                       {(Promise (Try [Archive (directive.State+ <parameters>)]))
-                                        (:assume (platform.compile import static expander platform compilation [archive state]))})
+                                       (Platform <parameters>)
+                                       platform
+                                       
+                                       (Promise (Try [Archive (directive.State+ <parameters>)]))
+                                       (:assume (platform.compile import static expander platform compilation [archive state])))
                _ (ioW.freeze (get@ #platform.&file_system platform) static archive)
                program_context (promise\wrap ($/program.context archive))
                _ (promise.future (..package! io.monad file.default packager,package static archive program_context))]