Fixes for the pure-Lux JVM compiler machinery. [Part 13 / Done!]

1 files changed, 93 insertions, 90 deletions

diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index 2b72f6dad..b859f456f 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -431,94 +431,97 @@
                              (n.= (..sum n/0 n/1 n/1)
                                   (..sum' n/0 n/1 n/1))))
                   (_.cover [/.using]
-                           (with_expansions [<referral> ("lux in-module" "library/lux" library/lux.refer)
-                                             <alias> (static.random code.text (random.ascii/lower 1))
-                                             <definition> (static.random code.local_symbol (random.ascii/lower 1))
-                                             <module/0> (static.random code.text (random.ascii/lower 2))
-                                             <module/0>' (template.symbol [<module/0>])
-                                             <module/1> (static.random code.text (random.ascii/lower 3))
-                                             <module/1>' (template.symbol [<module/1>])
-                                             <module/2> (static.random code.text (random.ascii/lower 4))
-                                             <module/2>' (template.symbol [<module/2>])
-                                             <m0/1> (template.text [<module/0> "/" <module/1>])
-                                             <//> (template.text [// <module/2>'])
-                                             <//>' (template.symbol [<//>])
-                                             <\\> (template.text [\\ <module/2>'])
-                                             <\\>' (template.symbol [<\\>])
-                                             <m0/2> (template.text [<module/0> "/" <module/2>])
-                                             <m2/1> (template.text [<module/2> "/" <module/1>])
-                                             <m0/1/2> (template.text [<module/0> "/" <module/1> "/" <module/2>])
-                                             <open/0> (template.text [<module/0> "#[0]"])]
-                             (and (~~ (template [<input> <pattern>]
-                                        [(with_expansions [<input>' (macro.final <input>)]
-                                           (case (' [<input>'])
-                                             (^code <pattern>)
-                                             true
-
-                                             _
-                                             false))]
-
-                                        [(.using [<module/0>'])
-                                         [("lux def module" [])]]
-                                        
-                                        [(.using [<alias> <module/0>' "*"])
-                                         [("lux def module" [[<module/0> <alias>]])
-                                          (<referral> <module/0> "*")]]
-                                        
-                                        [(.using [<alias> <module/0>' {"+" <definition>}])
-                                         [("lux def module" [[<module/0> <alias>]])
-                                          (<referral> <module/0> {"+" <definition>})]]
-                                        
-                                        [(.using [<alias> <module/0>' {"-" <definition>}])
-                                         [("lux def module" [[<module/0> <alias>]])
-                                          (<referral> <module/0> {"-" <definition>})]]
-                                        
-                                        [(.using [<alias> <module/0>' "_"])
-                                         [("lux def module" [])]]
-                                        
-                                        [(.using [<module/0>'
-                                                  [<alias> <module/1>']])
-                                         [("lux def module" [[<m0/1> <alias>]])
-                                          (<referral> <m0/1>)]]
-                                        
-                                        [(.using ["[0]" <module/0>'
-                                                  ["[0]" <module/1>']])
-                                         [("lux def module" [[<module/0> <module/0>]
-                                                             [<m0/1> <module/1>]])
-                                          (<referral> <module/0>)
-                                          (<referral> <m0/1>)]]
-                                        
-                                        [(.using ["[0]" <module/0>' "_"
-                                                  ["[1]" <module/1>']])
-                                         [("lux def module" [[<m0/1> <module/0>]])
-                                          (<referral> <m0/1>)]]
-                                        
-                                        [(.using ["[0]" <module/0>' "_"
-                                                  ["[1]" <module/1>' "_"
-                                                   ["[2]" <module/2>']]])
-                                         [("lux def module" [[<m0/1/2> <module/0>]])
-                                          (<referral> <m0/1/2>)]]
-                                        
-                                        [(.using [<module/0>'
-                                                  ["[0]" <module/1>'
-                                                   ["[0]" <//>']]])
-                                         [("lux def module" [[<m0/1> <module/1>]
-                                                             [<m0/2> <//>]])
-                                          (<referral> <m0/1>)
-                                          (<referral> <m0/2>)]]
-                                        
-                                        [(.using ["[0]" <module/0>'
-                                                  [<module/1>'
-                                                   ["[0]" <\\>']]])
-                                         [("lux def module" [[<module/0> <module/0>]
-                                                             [<m2/1> <\\>]])
-                                          (<referral> <module/0>)
-                                          (<referral> <m2/1>)]]
-                                        
-                                        [(.using ["[0]" <module/0>' ("[1]#[0]" <definition>)])
-                                         [("lux def module" [[<module/0> <module/0>]])
-                                          (<referral> <module/0> (<open/0> <definition>))]]
-                                        )))))
+                           (`` (with_expansions [<referral> ("lux in-module" "library/lux" library/lux.refer)
+                                                 <alias> (static.random code.text (random.ascii/lower 1))
+                                                 <definition> (static.random code.local_symbol (random.ascii/lower 1))
+                                                 <module/0> (static.random code.text (random.ascii/lower 2))
+                                                 <module/0>' (template.symbol [<module/0>])
+                                                 <module/1> (static.random code.text (random.ascii/lower 3))
+                                                 <module/1>' (template.symbol [<module/1>])
+                                                 <module/2> (static.random code.text (random.ascii/lower 4))
+                                                 <module/2>' (template.symbol [<module/2>])
+                                                 <m0/1> (template.text [<module/0> "/" <module/1>])
+                                                 <//> (template.text [// <module/2>'])
+                                                 <//>' (template.symbol [<//>])
+                                                 <\\> (template.text [\\ <module/2>'])
+                                                 <\\>' (template.symbol [<\\>])
+                                                 <m0/2> (template.text [<module/0> "/" <module/2>])
+                                                 <m2/1> (template.text [<module/2> "/" <module/1>])
+                                                 <m0/1/2> (template.text [<module/0> "/" <module/1> "/" <module/2>])
+                                                 <open/0> (template.text [<module/0> "#[0]"])]
+                                 (and (~~ (template [<input> <pattern>]
+                                            [(with_expansions [<input>' (macro.final <input>)]
+                                               (let [scenario (: (-> Any Bit)
+                                                                 (function (_ _)
+                                                                   (case (' [<input>'])
+                                                                     (^code <pattern>)
+                                                                     true
+
+                                                                     _
+                                                                     false)))]
+                                                 (scenario [])))]
+
+                                            [(.using [<module/0>'])
+                                             [("lux def module" [])]]
+                                            
+                                            [(.using [<alias> <module/0>' "*"])
+                                             [("lux def module" [[<module/0> <alias>]])
+                                              (<referral> <module/0> "*")]]
+                                            
+                                            [(.using [<alias> <module/0>' {"+" <definition>}])
+                                             [("lux def module" [[<module/0> <alias>]])
+                                              (<referral> <module/0> {"+" <definition>})]]
+                                            
+                                            [(.using [<alias> <module/0>' {"-" <definition>}])
+                                             [("lux def module" [[<module/0> <alias>]])
+                                              (<referral> <module/0> {"-" <definition>})]]
+                                            
+                                            [(.using [<alias> <module/0>' "_"])
+                                             [("lux def module" [])]]
+                                            
+                                            [(.using [<module/0>'
+                                                      [<alias> <module/1>']])
+                                             [("lux def module" [[<m0/1> <alias>]])
+                                              (<referral> <m0/1>)]]
+                                            
+                                            [(.using ["[0]" <module/0>'
+                                                      ["[0]" <module/1>']])
+                                             [("lux def module" [[<module/0> <module/0>]
+                                                                 [<m0/1> <module/1>]])
+                                              (<referral> <module/0>)
+                                              (<referral> <m0/1>)]]
+                                            
+                                            [(.using ["[0]" <module/0>' "_"
+                                                      ["[1]" <module/1>']])
+                                             [("lux def module" [[<m0/1> <module/0>]])
+                                              (<referral> <m0/1>)]]
+
+                                            [(.using ["[0]" <module/0>' "_"
+                                                      ["[1]" <module/1>' "_"
+                                                       ["[2]" <module/2>']]])
+                                             [("lux def module" [[<m0/1/2> <module/0>]])
+                                              (<referral> <m0/1/2>)]]
+                                            
+                                            [(.using [<module/0>'
+                                                      ["[0]" <module/1>'
+                                                       ["[0]" <//>']]])
+                                             [("lux def module" [[<m0/1> <module/1>]
+                                                                 [<m0/2> <//>]])
+                                              (<referral> <m0/1>)
+                                              (<referral> <m0/2>)]]
+                                            
+                                            [(.using ["[0]" <module/0>'
+                                                      [<module/1>'
+                                                       ["[0]" <\\>']]])
+                                             [("lux def module" [[<module/0> <module/0>]
+                                                                 [<m2/1> <\\>]])
+                                              (<referral> <module/0>)
+                                              (<referral> <m2/1>)]]
+                                            
+                                            [(.using ["[0]" <module/0>' ("[1]#[0]" <definition>)])
+                                             [("lux def module" [[<module/0> <module/0>]])
+                                              (<referral> <module/0> (<open/0> <definition>))]]
+                                            ))))))
                   ))))))
 
 (/.type: for_type/variant
@@ -1278,7 +1281,7 @@
   (<| (_.covering /._)
       (`` (`` (_.in_parallel
                (list ..test|lux
-
+                     
                      /abstract.test
                      /control.test
                      /data.test
@@ -1288,7 +1291,7 @@
                      /locale.test
                      /macro.test
                      /math.test
-
+                     
                      /meta.test
                      /program.test
                      /static.test