diff options
26 files changed, 53 insertions, 49 deletions
diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux index e08b2c4cb..824b2b33b 100644 --- a/lux-lua/source/program.lux +++ b/lux-lua/source/program.lux @@ -3,7 +3,6 @@ [lux (.except) [program (.only program:)] ["[0]" ffi] - ["[0]" static] [abstract ["[0]" monad (.only do)]] [control @@ -22,20 +21,18 @@ [collection ["[0]" array (.only Array)] ["[0]" list (.use "[1]#[0]" monad)]]] - [macro - ["^" pattern] - ["[0]" local] - ["[0]" code]] [math [number (.only hex) ["n" nat] ["[0]" i64]]] - ["[0]" world - ["[0]" file] - ["[1]/[0]" program]] - ["@" target (.only) - ["_" lua]] [meta + ["[0]" static] + [macro + ["^" pattern] + ["[0]" local] + ["[0]" code]] + ["@" target (.only) + ["_" lua]] ["[0]" compiler ["[0]" phase (.only Operation Phase)] [reference @@ -64,7 +61,10 @@ ["[0]" context] [archive (.only Archive)] ["[0]" packager - ["[1]" script]]]]]]] + ["[1]" script]]]]] + ["[0]" world + ["[0]" file] + ["[1]/[0]" program]]]] [program ["/" compositor]]) diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux index 208a3550a..a14949e61 100644 --- a/lux-python/source/program.lux +++ b/lux-python/source/program.lux @@ -4,7 +4,6 @@ [program (.only program:)] ["[0]" ffi (.only import)] ["[0]" debug] - ["[0]" static] [abstract ["[0]" monad (.only do)]] [control @@ -24,20 +23,18 @@ [collection ["[0]" array (.only Array)] ["[0]" list (.use "[1]#[0]" functor)]]] - [macro - ["^" pattern] - ["[0]" template] - ["[0]" code]] [math [number ["n" nat] ["[0]" i64]]] - ["[0]" world - ["[0]" file] - ["[1]/[0]" program]] - ["@" target (.only) - ["_" python]] [meta + ["[0]" static] + [macro + ["^" pattern] + ["[0]" template] + ["[0]" code]] + ["@" target (.only) + ["_" python]] ["[0]" compiler ["[0]" phase (.only Operation Phase) (.use "[1]#[0]" monad)] [reference @@ -68,7 +65,10 @@ [archive (.only Archive) ["[0]" unit]] ["[0]" packager - ["[1]" script]]]]]]] + ["[1]" script]]]]] + ["[0]" world + ["[0]" file] + ["[1]/[0]" program]]]] [program ["/" compositor]]) diff --git a/stdlib/source/documentation/lux/static.lux b/stdlib/source/documentation/lux/meta/static.lux index 9ae73aae8..9ae73aae8 100644 --- a/stdlib/source/documentation/lux/static.lux +++ b/stdlib/source/documentation/lux/meta/static.lux diff --git a/stdlib/source/library/lux/ffi/export.js.lux b/stdlib/source/library/lux/ffi/export.js.lux index a661027ab..bb725ed0c 100644 --- a/stdlib/source/library/lux/ffi/export.js.lux +++ b/stdlib/source/library/lux/ffi/export.js.lux @@ -2,7 +2,6 @@ [library [lux (.except) [extension (.only declaration)] - ["[0]" static] [abstract ["[0]" monad (.only do)]] [control @@ -16,6 +15,7 @@ [math ["[0]" random]] ["[0]" meta (.only) + ["[0]" static] ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) diff --git a/stdlib/source/library/lux/ffi/export.lua.lux b/stdlib/source/library/lux/ffi/export.lua.lux index b485934c5..c59c410ae 100644 --- a/stdlib/source/library/lux/ffi/export.lua.lux +++ b/stdlib/source/library/lux/ffi/export.lua.lux @@ -2,7 +2,6 @@ [library [lux (.except) [extension (.only declaration)] - ["[0]" static] [abstract ["[0]" monad (.only do)]] [control @@ -16,6 +15,7 @@ [math ["[0]" random]] ["[0]" meta (.only) + ["[0]" static] ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) diff --git a/stdlib/source/library/lux/ffi/export.py.lux b/stdlib/source/library/lux/ffi/export.py.lux index 63cc2c471..70c5fc591 100644 --- a/stdlib/source/library/lux/ffi/export.py.lux +++ b/stdlib/source/library/lux/ffi/export.py.lux @@ -2,7 +2,6 @@ [library [lux (.except) [extension (.only declaration)] - ["[0]" static] [abstract ["[0]" monad (.only do)]] [control @@ -16,6 +15,7 @@ [math ["[0]" random]] ["[0]" meta (.only) + ["[0]" static] ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) diff --git a/stdlib/source/library/lux/ffi/export.rb.lux b/stdlib/source/library/lux/ffi/export.rb.lux index aa1ade262..df3ab6f85 100644 --- a/stdlib/source/library/lux/ffi/export.rb.lux +++ b/stdlib/source/library/lux/ffi/export.rb.lux @@ -2,8 +2,6 @@ [library [lux (.except global) [extension (.only declaration)] - ["[0]" static] - ["[0]" type] [abstract ["[0]" monad (.only do)]] [control @@ -18,6 +16,8 @@ [math ["[0]" random]] ["[0]" meta (.only) + ["[0]" static] + ["[0]" type] ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) diff --git a/stdlib/source/library/lux/math.lux b/stdlib/source/library/lux/math.lux index 794bef35d..bbad785af 100644 --- a/stdlib/source/library/lux/math.lux +++ b/stdlib/source/library/lux/math.lux @@ -2,7 +2,6 @@ [library [lux (.except) [extension (.only analysis)] - ["[0]" static] [abstract ["[0]" monad (.only do)]] [control @@ -16,6 +15,7 @@ ["[0]" list (.use "[1]#[0]" mix)]]] [meta ["@" target] + ["[0]" static] ["[0]" code ["<[1]>" \\parser]] [macro diff --git a/stdlib/source/library/lux/meta/compiler/default/platform.lux b/stdlib/source/library/lux/meta/compiler/default/platform.lux index d8c301eb7..436d6bac3 100644 --- a/stdlib/source/library/lux/meta/compiler/default/platform.lux +++ b/stdlib/source/library/lux/meta/compiler/default/platform.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["[0]" debug] - ["[0]" static] [abstract ["[0]" monad (.only Monad do)]] [control @@ -27,6 +26,7 @@ ["[0]" list (.use "[1]#[0]" monoid functor mix)]]] ["[0]" meta (.only) ["@" target] + ["[0]" static] ["[0]" configuration (.only Configuration)] [type (.only sharing) ["[0]" check]]] diff --git a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux index 0b14e378f..29dfd6b81 100644 --- a/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux +++ b/stdlib/source/library/lux/meta/compiler/meta/packager/scheme.lux @@ -1,7 +1,6 @@ (.require [library [lux (.except Module) - [type (.only sharing)] [abstract ["[0]" monad (.only do)]] [control @@ -21,6 +20,7 @@ [format ["[0]" tar]]] [meta + [type (.only sharing)] [target ["_" scheme]]] [world diff --git a/stdlib/source/library/lux/static.lux b/stdlib/source/library/lux/meta/static.lux index 617ce7cdb..617ce7cdb 100644 --- a/stdlib/source/library/lux/static.lux +++ b/stdlib/source/library/lux/meta/static.lux diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux index 23d89ee6e..0f03b346d 100644 --- a/stdlib/source/test/lux.lux +++ b/stdlib/source/test/lux.lux @@ -3,7 +3,6 @@ ["/" lux (.except) [program (.only program:)] ["_" test (.only Test)] - ["[0]" static] [abstract [monad (.only do)]] [control @@ -32,6 +31,7 @@ ["[0]" i64]]] ["[0]" meta (.use "[1]#[0]" monad) ["@" target] + ["[0]" static] ["[0]" location (.use "[1]#[0]" equivalence)] ["[0]" code (.use "[1]#[0]" equivalence) ["<[1]>" \\parser]] @@ -51,7 +51,6 @@ ["[1][0]" meta] ["[1][0]" program] - ["[1][0]" static] ["[1][0]" test] ["[1][0]" world] @@ -1207,7 +1206,6 @@ /meta.test /program.test - /static.test /test.test /world.test diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux index 9e900469a..91b97276f 100644 --- a/stdlib/source/test/lux/ffi.jvm.lux +++ b/stdlib/source/test/lux/ffi.jvm.lux @@ -3,7 +3,6 @@ [lux (.except) ["_" test (.only Test)] ["[0]" debug] - ["[0]" static] [abstract [monad (.only do)]] [control @@ -25,6 +24,7 @@ ["i" int (.use "[1]#[0]" equivalence)] ["f" frac (.use "[1]#[0]" equivalence)]]] ["[0]" meta (.only) + ["[0]" static] ["[0]" type (.use "[1]#[0]" equivalence)] ["[0]" code (.only) ["<[1]>" \\parser]] diff --git a/stdlib/source/test/lux/ffi/export.js.lux b/stdlib/source/test/lux/ffi/export.js.lux index 073463498..852eee961 100644 --- a/stdlib/source/test/lux/ffi/export.js.lux +++ b/stdlib/source/test/lux/ffi/export.js.lux @@ -2,10 +2,11 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [math [number - ["n" nat]]]]] + ["n" nat]]] + [meta + ["[0]" static]]]] [\\library ["[0]" / (.only) ["/[1]" //]]]) diff --git a/stdlib/source/test/lux/ffi/export.jvm.lux b/stdlib/source/test/lux/ffi/export.jvm.lux index 81615af21..6904a33df 100644 --- a/stdlib/source/test/lux/ffi/export.jvm.lux +++ b/stdlib/source/test/lux/ffi/export.jvm.lux @@ -3,7 +3,6 @@ [lux (.except) ["_" test (.only Test)] ["[0]" debug] - ["[0]" static] [abstract [monad (.only do)]] [data @@ -17,6 +16,7 @@ ["[0]" int (.use "[1]#[0]" equivalence)] ["[0]" frac (.use "[1]#[0]" equivalence)]]] ["[0]" meta (.only) + ["[0]" static] ["[0]" code] [macro ["[0]" template]]]]] diff --git a/stdlib/source/test/lux/ffi/export.lua.lux b/stdlib/source/test/lux/ffi/export.lua.lux index 2f3c6fdeb..f0c1d7efd 100644 --- a/stdlib/source/test/lux/ffi/export.lua.lux +++ b/stdlib/source/test/lux/ffi/export.lua.lux @@ -2,10 +2,11 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [math [number - ["n" nat]]]]] + ["n" nat]]] + [meta + ["[0]" static]]]] [\\library ["[0]" / (.only) ["/[1]" //]]]) diff --git a/stdlib/source/test/lux/ffi/export.py.lux b/stdlib/source/test/lux/ffi/export.py.lux index 073463498..852eee961 100644 --- a/stdlib/source/test/lux/ffi/export.py.lux +++ b/stdlib/source/test/lux/ffi/export.py.lux @@ -2,10 +2,11 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [math [number - ["n" nat]]]]] + ["n" nat]]] + [meta + ["[0]" static]]]] [\\library ["[0]" / (.only) ["/[1]" //]]]) diff --git a/stdlib/source/test/lux/ffi/export.rb.lux b/stdlib/source/test/lux/ffi/export.rb.lux index 64b57eee8..394d16376 100644 --- a/stdlib/source/test/lux/ffi/export.rb.lux +++ b/stdlib/source/test/lux/ffi/export.rb.lux @@ -2,10 +2,11 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [math [number - ["n" nat]]]]] + ["n" nat]]] + [meta + ["[0]" static]]]] [\\library ["[0]" / (.only) ["/[1]" //]]]) diff --git a/stdlib/source/test/lux/meta.lux b/stdlib/source/test/lux/meta.lux index 9b6f168e4..4a7159fe5 100644 --- a/stdlib/source/test/lux/meta.lux +++ b/stdlib/source/test/lux/meta.lux @@ -41,6 +41,7 @@ ["[1][0]" version] ["[1][0]" type] ["[1][0]" macro] + ["[1][0]" static] ["[1][0]" target (.only) (.,, (.for "{old}" (.,, (.these ["[1]/[0]" jvm])) "JVM" (.,, (.these ["[1]/[0]" jvm])) @@ -1057,6 +1058,7 @@ /version.test /type.test /macro.test + /static.test /target.test (,, (for @.jvm (,, (these /target/jvm.test)) @.old (,, (these /target/jvm.test)) diff --git a/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux b/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux index d153ae458..09c976004 100644 --- a/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux +++ b/stdlib/source/test/lux/meta/compiler/language/lux/analysis.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [abstract [monad (.only do)] [\\specification @@ -27,6 +26,7 @@ ["f" frac] ["r" rev]]] [meta + ["[0]" static] ["[0]" symbol (.use "[1]#[0]" equivalence)] [macro ["[0]" template]] diff --git a/stdlib/source/test/lux/meta/macro.lux b/stdlib/source/test/lux/meta/macro.lux index e2705e961..80faef121 100644 --- a/stdlib/source/test/lux/meta/macro.lux +++ b/stdlib/source/test/lux/meta/macro.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [abstract [monad (.only do)]] [control @@ -18,6 +17,7 @@ [number ["n" nat]]] ["[0]" meta (.only) + ["[0]" static] ["[0]" location] ["[0]" symbol] ["[0]" code (.use "[1]#[0]" equivalence) diff --git a/stdlib/source/test/lux/static.lux b/stdlib/source/test/lux/meta/static.lux index aa67ab7a2..aa67ab7a2 100644 --- a/stdlib/source/test/lux/static.lux +++ b/stdlib/source/test/lux/meta/static.lux diff --git a/stdlib/source/test/lux/meta/target/js.lux b/stdlib/source/test/lux/meta/target/js.lux index 0288ca3b1..9604b26b3 100644 --- a/stdlib/source/test/lux/meta/target/js.lux +++ b/stdlib/source/test/lux/meta/target/js.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [abstract [monad (.only do)] ["[0]" predicate]] @@ -25,6 +24,7 @@ ["f" frac] ["[0]" i64]]] [meta + ["[0]" static] [macro ["[0]" template]]]]] [\\library diff --git a/stdlib/source/test/lux/meta/target/lua.lux b/stdlib/source/test/lux/meta/target/lua.lux index 129748613..ad8ef35d6 100644 --- a/stdlib/source/test/lux/meta/target/lua.lux +++ b/stdlib/source/test/lux/meta/target/lua.lux @@ -3,7 +3,6 @@ [lux (.except) ["_" test (.only Test)] ["[0]" ffi] - ["[0]" static] [abstract [monad (.only do)] [\\specification @@ -28,6 +27,7 @@ ["f" frac] ["[0]" i64]]] [meta + ["[0]" static] [macro ["[0]" template]]]]] [\\library diff --git a/stdlib/source/test/lux/meta/target/python.lux b/stdlib/source/test/lux/meta/target/python.lux index ac1d84974..8c553dc2d 100644 --- a/stdlib/source/test/lux/meta/target/python.lux +++ b/stdlib/source/test/lux/meta/target/python.lux @@ -3,7 +3,6 @@ [lux (.except) ["_" test (.only Test)] ["[0]" ffi] - ["[0]" static] [abstract [monad (.only do)] ["[0]" predicate] @@ -28,6 +27,7 @@ ["f" frac] ["[0]" i64]]] [meta + ["[0]" static] ["[0]" code]]]] [\\library ["[0]" / (.use "[1]#[0]" equivalence)]]) diff --git a/stdlib/source/test/lux/meta/version.lux b/stdlib/source/test/lux/meta/version.lux index eebef8c0b..1df94e003 100644 --- a/stdlib/source/test/lux/meta/version.lux +++ b/stdlib/source/test/lux/meta/version.lux @@ -2,7 +2,6 @@ [library [lux (.except) ["_" test (.only Test)] - ["[0]" static] [abstract [monad (.only do)]] [control @@ -15,6 +14,7 @@ [number ["n" nat]]] ["[0]" meta (.only) + ["[0]" static] ["[0]" code (.only) ["<[1]>" \\parser]] ["[0]" macro (.only) |