3 files changed, 137 insertions, 131 deletions
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index f1ae8f0de..84353e082 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -3,70 +3,70 @@
                                    (.as_is))
                    <target> <target>']
   (.using
-    [library
-     ["/" lux "*"
-      [program {"+" program:}]
-      ["_" test {"+" Test}]
-      ["@" target]
-      [abstract
-       [monad {"+" do}]]
-      [control
-       ["[0]" io]
-       ["[0]" maybe ("[1]#[0]" functor)]
-       [concurrency
-        ["[0]" atom {"+" Atom}]]
-       [parser
-        ["<[0]>" code]]]
-      [data
-       ["[0]" product]
-       ["[0]" bit ("[1]#[0]" equivalence)]
-       ["[0]" text ("[1]#[0]" equivalence)
-        ["%" format {"+" format}]]
-       [collection
-        ["[0]" list ("[1]#[0]" functor)]
-        ["[0]" set {"+" Set} ("[1]#[0]" equivalence)]
-        [dictionary
-         ["[0]" plist]]]]
-      ["[0]" macro
-       [syntax {"+" syntax:}]
-       ["[0]" code ("[1]#[0]" equivalence)]
-       ["[0]" template]]
-      ["[0]" math
-       ["[0]" random ("[1]#[0]" functor)]
-       [number
-        [i8 {"+"}]
-        [i16 {"+"}]
-        ["n" nat]
-        ["i" int]
-        ["r" rev]
-        ["f" frac]
-        ["[0]" i64]]]
-      ["[0]" meta
-       ["[0]" location ("[1]#[0]" equivalence)]]]]
-    ... TODO: Must have 100% coverage on tests.
-    ["[0]" / "_"
-     ["[1][0]" abstract]
-     ["[1][0]" control]
-     ["[1][0]" data]
-     ["[1][0]" debug]
-     ["[1][0]" documentation]
-     ["[1][0]" locale]
-     ["[1][0]" macro
-      ["[1]/[0]" code]]
-     ["[1][0]" math]
-     ["[1][0]" meta]
-     ["[1][0]" program]
-     ["[1][0]" static]
-     ["[1][0]" target]
-     ["[1][0]" test]
-     ["[1][0]" time]
-     ... ["[1][0]" tool] ... TODO: Update & expand tests for this
-     ["[1][0]" type]
-     ["[1][0]" world]
-     ["[1][0]" ffi]
-     ["[1][0]" extension]
-     ["[1][0]" target "_"
-      <target>]]))
+   [library
+    ["/" lux "*"
+     [program {"+" program:}]
+     ["_" test {"+" Test}]
+     ["@" target]
+     [abstract
+      [monad {"+" do}]]
+     [control
+      ["[0]" io]
+      ["[0]" maybe ("[1]#[0]" functor)]
+      [concurrency
+       ["[0]" atom {"+" Atom}]]
+      [parser
+       ["<[0]>" code]]]
+     [data
+      ["[0]" product]
+      ["[0]" bit ("[1]#[0]" equivalence)]
+      ["[0]" text ("[1]#[0]" equivalence)
+       ["%" format {"+" format}]]
+      [collection
+       ["[0]" list ("[1]#[0]" functor)]
+       ["[0]" set {"+" Set} ("[1]#[0]" equivalence)]
+       [dictionary
+        ["[0]" plist]]]]
+     ["[0]" macro
+      [syntax {"+" syntax:}]
+      ["[0]" code ("[1]#[0]" equivalence)]
+      ["[0]" template]]
+     ["[0]" math
+      ["[0]" random ("[1]#[0]" functor)]
+      [number
+       [i8 {"+"}]
+       [i16 {"+"}]
+       ["n" nat]
+       ["i" int]
+       ["r" rev]
+       ["f" frac]
+       ["[0]" i64]]]
+     ["[0]" meta
+      ["[0]" location ("[1]#[0]" equivalence)]]]]
+   ... TODO: Must have 100% coverage on tests.
+   ["[0]" / "_"
+    ["[1][0]" abstract]
+    ["[1][0]" control]
+    ["[1][0]" data]
+    ["[1][0]" debug]
+    ["[1][0]" documentation]
+    ["[1][0]" locale]
+    ["[1][0]" macro
+     ["[1]/[0]" code]]
+    ["[1][0]" math]
+    ["[1][0]" meta]
+    ["[1][0]" program]
+    ["[1][0]" static]
+    ["[1][0]" target]
+    ["[1][0]" test]
+    ["[1][0]" time]
+    ... ["[1][0]" tool] ... TODO: Update & expand tests for this
+    ["[1][0]" type]
+    ["[1][0]" world]
+    ["[1][0]" ffi]
+    ["[1][0]" extension]
+    ["[1][0]" target "_"
+     <target>]]))
 
 ... TODO: Get rid of this ASAP
 (template: (!bundle body)
diff --git a/stdlib/source/test/lux/extension.lux b/stdlib/source/test/lux/extension.lux
index 27ff33027..63f3b0d5d 100644
--- a/stdlib/source/test/lux/extension.lux
+++ b/stdlib/source/test/lux/extension.lux
@@ -1,48 +1,48 @@
 (.using
-  [library
-   [lux "*"
-    ["[0]" debug]
-    ["@" target
-     ["[0]" jvm]
-     ["[0]" js]
-     ["[0]" python]
-     ["[0]" lua]
-     ["[0]" ruby]
-     ["[0]" php]
-     ["[0]" scheme]]
-    [abstract
-     ["[0]" monad {"+" do}]]
-    [control
-     ["[0]" try]
-     ["<>" parser
-      ["<[0]>" code]
-      ["<[0]>" analysis]
-      ["<[0]>" synthesis]]]
-    [data
-     ["[0]" product]
-     ["[0]" text ("[1]#[0]" equivalence)
-      ["%" format {"+" format}]]
-     [collection
-      ["[0]" sequence]
-      ["[0]" list ("[1]#[0]" functor)]]]
-    [math
-     ["[0]" random]
-     [number
-      ["n" nat]]]
-    [tool
-     [compiler
-      ["[0]" phase]
-      [language
-       [lux
-        ["[0]" analysis]
-        ["[0]" synthesis]
-        ["[0]" directive]
-        [phase
-         [analysis
-          ["[0]" type]]]]]]]
-    ["_" test {"+" Test}]]]
-  [\\library
-   ["[0]" / {"+" analysis: synthesis: generation: directive:}]])
+ [library
+  [lux "*"
+   ["[0]" debug]
+   ["@" target
+    ["[0]" jvm]
+    ["[0]" js]
+    ["[0]" python]
+    ["[0]" lua]
+    ["[0]" ruby]
+    ["[0]" php]
+    ["[0]" scheme]]
+   [abstract
+    ["[0]" monad {"+" do}]]
+   [control
+    ["[0]" try]
+    ["<>" parser
+     ["<[0]>" code]
+     ["<[0]>" analysis]
+     ["<[0]>" synthesis]]]
+   [data
+    ["[0]" product]
+    ["[0]" text ("[1]#[0]" equivalence)
+     ["%" format {"+" format}]]
+    [collection
+     ["[0]" sequence]
+     ["[0]" list ("[1]#[0]" functor)]]]
+   [math
+    ["[0]" random]
+    [number
+     ["n" nat]]]
+   [tool
+    [compiler
+     ["[0]" phase]
+     [language
+      [lux
+       ["[0]" analysis]
+       ["[0]" synthesis]
+       ["[0]" directive]
+       [phase
+        [analysis
+         ["[0]" type]]]]]]]
+   ["_" test {"+" Test}]]]
+ [\\library
+  ["[0]" / {"+" analysis: synthesis: generation: directive:}]])
 
 (def: my_analysis "my analysis")
 (def: my_synthesis "my synthesis")
@@ -55,6 +55,12 @@
       (as_is)]
      
      (as_is
+      (for [@.python
+            ... TODO: Remove this hack once Jython is no longer being used as the Python interpreter.
+            (analysis: ("dummy dum dum" self phase archive [])
+              (undefined))]
+           (as_is))
+      
       ... Analysis
       (analysis: (..my_analysis self phase archive [pass_through <code>.any])
         (phase archive pass_through))
diff --git a/stdlib/source/test/lux/math.lux b/stdlib/source/test/lux/math.lux
index 7d30f864d..aeadbf093 100644
--- a/stdlib/source/test/lux/math.lux
+++ b/stdlib/source/test/lux/math.lux
@@ -1,27 +1,27 @@
 (.using
-  [library
-   [lux "*"
-    ["_" test {"+" Test}]
-    [abstract
-     [monad {"+" do}]]
-    [macro
-     ["[0]" template]]
-    [math
-     ["[0]" random {"+" Random}]
-     [number
-      ["n" nat]
-      ["i" int]
-      ["f" frac]]]]]
-  [\\library
-   ["[0]" /]]
-  ["[0]" / "_"
-   ["[1][0]" infix]
-   ["[1][0]" modulus]
-   ["[1][0]" modular]
-   ["[1][0]" number]
-   ["[1][0]" logic "_"
-    ["[1]/[0]" continuous]
-    ["[1]/[0]" fuzzy]]])
+ [library
+  [lux "*"
+   ["_" test {"+" Test}]
+   [abstract
+    [monad {"+" do}]]
+   [macro
+    ["[0]" template]]
+   [math
+    ["[0]" random {"+" Random}]
+    [number
+     ["n" nat]
+     ["i" int]
+     ["f" frac]]]]]
+ [\\library
+  ["[0]" /]]
+ ["[0]" / "_"
+  ["[1][0]" infix]
+  ["[1][0]" modulus]
+  ["[1][0]" modular]
+  ["[1][0]" number]
+  ["[1][0]" logic "_"
+   ["[1]/[0]" continuous]
+   ["[1]/[0]" fuzzy]]])
 
 (def: margin_of_error
   +0.0000001)