aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEduardo Julian2021-09-14 02:01:49 -0400
committerEduardo Julian2021-09-14 02:01:49 -0400
commit1c93f003f73116202b1f964b0d1b6d3f07b69fb0 (patch)
tree925f64cd59ab2ce48bccf6dd4df1142296d2094a
parentbca1a9cdcf837e184378d5e6339a969e40d1dbab (diff)
No more "^slots".
Diffstat (limited to '')
-rw-r--r--licentia/source/program/licentia/license/notice.lux2
-rw-r--r--lux-mode/lux-mode.el2
-rw-r--r--stdlib/source/documentation/lux.lux6
-rw-r--r--stdlib/source/library/lux.lux39
-rw-r--r--stdlib/source/library/lux/control/function/mutual.lux10
-rw-r--r--stdlib/source/library/lux/data/collection/queue.lux16
-rw-r--r--stdlib/source/library/lux/data/collection/row.lux6
-rw-r--r--stdlib/source/library/lux/data/collection/tree/zipper.lux42
-rw-r--r--stdlib/source/library/lux/data/format/css/selector.lux10
-rw-r--r--stdlib/source/library/lux/data/format/css/value.lux8
-rw-r--r--stdlib/source/library/lux/ffi.jvm.lux8
-rw-r--r--stdlib/source/library/lux/ffi.old.lux12
-rw-r--r--stdlib/source/library/lux/macro/syntax/check.lux6
-rw-r--r--stdlib/source/library/lux/macro/syntax/definition.lux8
-rw-r--r--stdlib/source/library/lux/macro/template.lux8
-rw-r--r--stdlib/source/library/lux/math/number/complex.lux28
-rw-r--r--stdlib/source/library/lux/math/number/ratio.lux20
-rw-r--r--stdlib/source/library/lux/meta.lux14
-rw-r--r--stdlib/source/library/lux/time.lux10
-rw-r--r--stdlib/source/library/lux/tool/compiler/meta/archive.lux26
-rw-r--r--stdlib/source/library/lux/type/refinement.lux8
-rw-r--r--stdlib/source/library/lux/type/unit.lux13
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/stamp.lux6
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/version.lux8
-rw-r--r--stdlib/source/program/aedifex/artifact/snapshot/version/value.lux4
-rw-r--r--stdlib/source/program/aedifex/artifact/time/time.lux8
-rw-r--r--stdlib/source/program/aedifex/artifact/versioning.lux8
-rw-r--r--stdlib/source/program/aedifex/metadata/artifact.lux4
-rw-r--r--stdlib/source/program/aedifex/metadata/snapshot.lux6
-rw-r--r--stdlib/source/specification/compositor/common.lux5
-rw-r--r--stdlib/source/test/lux.lux5
31 files changed, 154 insertions, 202 deletions
diff --git a/licentia/source/program/licentia/license/notice.lux b/licentia/source/program/licentia/license/notice.lux
index 3a5edf3c0..47ba277d9 100644
--- a/licentia/source/program/licentia/license/notice.lux
+++ b/licentia/source/program/licentia/license/notice.lux
@@ -21,7 +21,7 @@
(def: .public (copyright_holder holder)
(-> //copyright.Holder Text)
- (let [(^slots [//time.#start //time.#end]) (value@ //copyright.#period holder)
+ (let [(^open "[0]") (value@ //copyright.#period holder)
single_year? (n.= start end)
period_section (if single_year?
(%.nat start)
diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el
index fa048787c..885a908c8 100644
--- a/lux-mode/lux-mode.el
+++ b/lux-mode/lux-mode.el
@@ -349,7 +349,7 @@ Called by `imenu--generic-function'."
(revRE (literal (concat "\\." natural)))
(specialRE (let (;; Control
(control//flow (altRE "case" "exec" "let" "if" "cond" "loop" "recur" "do" "be"))
- (control//pattern-matching (altRE "\\^" "\\^or" "\\^slots"
+ (control//pattern-matching (altRE "\\^" "\\^or"
"\\^multi" "\\^@" "\\^template"
"\\^open" "\\^|>" "\\^code"
"\\^sequence&" "\\^regex"))
diff --git a/stdlib/source/documentation/lux.lux b/stdlib/source/documentation/lux.lux
index 82029959f..3bb2eed7d 100644
--- a/stdlib/source/documentation/lux.lux
+++ b/stdlib/source/documentation/lux.lux
@@ -695,11 +695,6 @@
(my_loop (++ count) (f x))
x))])
-(documentation: /.^slots
- "Allows you to extract record members as local variables with the same names."
- [(let [(^slots [#foo #bar #baz]) quux]
- (f foo bar baz))])
-
(documentation: /.with_expansions
(format "Controlled macro-expansion."
\n "Bind an arbitraty number of Code nodes resulting from macro-expansion to local bindings."
@@ -1001,7 +996,6 @@
..++
..--
..loop
- ..^slots
..with_expansions
..static
..^multi
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux
index c488444dd..862c84fff 100644
--- a/stdlib/source/library/lux.lux
+++ b/stdlib/source/library/lux.lux
@@ -4339,45 +4339,6 @@
{#None}
(failure "Wrong syntax for loop"))))
-(macro: .public (^slots tokens)
- (case tokens
- (^ (list& [_ {#Form (list [_ {#Tuple (list& hslot' tslots')}])}] body branches))
- (do meta_monad
- [slots (: (Meta [Symbol (List Symbol)])
- (case (: (Maybe [Symbol (List Symbol)])
- (do maybe_monad
- [hslot (..identifier_name hslot')
- tslots (monad#each maybe_monad ..identifier_name tslots')]
- (in [hslot tslots])))
- {#Some slots}
- (in_meta slots)
-
- {#None}
- (failure "Wrong syntax for ^slots")))
- .let [[hslot tslots] slots]
- hslot (..normal hslot)
- tslots (monad#each meta_monad ..normal tslots)
- output (..type_slot hslot)
- g!_ (..identifier "_")
- .let [[idx tags exported? type] output
- slot_pairings (list#each (: (-> Symbol [Text Code])
- (function (_ [module name])
- [name (local_identifier$ name)]))
- (list& hslot tslots))
- pattern (|> tags
- (list#each (: (-> Symbol (List Code))
- (function (_ [module name])
- (let [tag (identifier$ [module name])]
- (case (plist#value name slot_pairings)
- {#Some binding} (list tag binding)
- {#None} (list tag g!_))))))
- list#conjoint
- tuple$)]]
- (in_meta (list& pattern body branches)))
-
- _
- (failure "Wrong syntax for ^slots")))
-
(def: (with_expansions' label tokens target)
(-> Text (List Code) Code (List Code))
(case target
diff --git a/stdlib/source/library/lux/control/function/mutual.lux b/stdlib/source/library/lux/control/function/mutual.lux
index 5b2291bba..493c36d80 100644
--- a/stdlib/source/library/lux/control/function/mutual.lux
+++ b/stdlib/source/library/lux/control/function/mutual.lux
@@ -111,11 +111,11 @@
(in (list))
{.#Item definition {.#End}}
- (.let [(^slots [#export_policy #mutual]) definition
- (^slots [#declaration #type #body]) #mutual]
- (in (list (` (.def: (~ #export_policy) (~ (declaration.format #declaration))
- (~ #type)
- (~ #body))))))
+ (.let [(^open "_[0]") definition
+ (^open "_[0]") _#mutual]
+ (in (list (` (.def: (~ _#export_policy) (~ (declaration.format _#declaration))
+ (~ _#type)
+ (~ _#body))))))
_
(macro.with_identifiers [g!context g!output]
diff --git a/stdlib/source/library/lux/data/collection/queue.lux b/stdlib/source/library/lux/data/collection/queue.lux
index 5260d808d..650ed17ff 100644
--- a/stdlib/source/library/lux/data/collection/queue.lux
+++ b/stdlib/source/library/lux/data/collection/queue.lux
@@ -28,8 +28,8 @@
(def: .public (list queue)
(All (_ a) (-> (Queue a) (List a)))
- (let [(^slots [#front #rear]) queue]
- (list#composite #front (list.reversed #rear))))
+ (let [(^open "_[0]") queue]
+ (list#composite _#front (list.reversed _#rear))))
(def: .public front
(All (_ a) (-> (Queue a) (Maybe a)))
@@ -37,9 +37,9 @@
(def: .public (size queue)
(All (_ a) (-> (Queue a) Nat))
- (let [(^slots [#front #rear]) queue]
- (n.+ (list.size #front)
- (list.size #rear))))
+ (let [(^open "_[0]") queue]
+ (n.+ (list.size _#front)
+ (list.size _#rear))))
(def: .public empty?
(All (_ a) (-> (Queue a) Bit))
@@ -47,9 +47,9 @@
(def: .public (member? equivalence queue member)
(All (_ a) (-> (Equivalence a) (Queue a) a Bit))
- (let [(^slots [#front #rear]) queue]
- (or (list.member? equivalence #front member)
- (list.member? equivalence #rear member))))
+ (let [(^open "_[0]") queue]
+ (or (list.member? equivalence _#front member)
+ (list.member? equivalence _#rear member))))
(def: .public (next queue)
(All (_ a) (-> (Queue a) (Queue a)))
diff --git a/stdlib/source/library/lux/data/collection/row.lux b/stdlib/source/library/lux/data/collection/row.lux
index 2fb288b99..c1b3b6ece 100644
--- a/stdlib/source/library/lux/data/collection/row.lux
+++ b/stdlib/source/library/lux/data/collection/row.lux
@@ -491,9 +491,9 @@
{#Hierarchy hierarchy}
(<array> (help predicate) hierarchy))))]
(function (<name> predicate row)
- (let [(^slots [#root #tail]) row]
- (<op> (help predicate {#Hierarchy #root})
- (help predicate {#Base #tail}))))))]
+ (let [(^open "_[0]") row]
+ (<op> (help predicate {#Hierarchy _#root})
+ (help predicate {#Base _#tail}))))))]
[every? array.every? #1 and]
[any? array.any? #0 or]
diff --git a/stdlib/source/library/lux/data/collection/tree/zipper.lux b/stdlib/source/library/lux/data/collection/tree/zipper.lux
index 8bf58d308..19581bb40 100644
--- a/stdlib/source/library/lux/data/collection/tree/zipper.lux
+++ b/stdlib/source/library/lux/data/collection/tree/zipper.lux
@@ -102,19 +102,19 @@
(All (_ a) (-> (Zipper a) (Maybe (Zipper a))))
(do maybe.monad
[family (value@ #family zipper)]
- (in (let [(^slots [#parent #lefts #rights]) family]
+ (in (let [(^open "_[0]") family]
(for [@.old
(revised@ #node (: (-> (Tree (:parameter 0))
(Tree (:parameter 0)))
- (with@ //.#children (list#composite (list.reversed #lefts)
+ (with@ //.#children (list#composite (list.reversed _#lefts)
{.#Item (value@ #node zipper)
- #rights})))
- #parent)]
+ _#rights})))
+ _#parent)]
(with@ [#node //.#children]
- (list#composite (list.reversed #lefts)
+ (list#composite (list.reversed _#lefts)
{.#Item (value@ #node zipper)
- #rights})
- #parent))))))
+ _#rights})
+ _#parent))))))
(template [<one> <all> <side> <op_side>]
[(def: .public (<one> zipper)
@@ -292,13 +292,13 @@
(implementation: .public functor
(Functor Zipper)
- (def: (each f (^slots [#family #node]))
- [#family (maybe#each (function (_ (^slots [#parent #lefts #rights]))
- [#parent (each f #parent)
- #lefts (list#each (//#each f) #lefts)
- #rights (list#each (//#each f) #rights)])
- #family)
- #node (//#each f #node)]))
+ (def: (each f (^open "_[0]"))
+ [#family (maybe#each (function (_ (^open "_[0]"))
+ [#parent (each f _#parent)
+ #lefts (list#each (//#each f) _#lefts)
+ #rights (list#each (//#each f) _#rights)])
+ _#family)
+ #node (//#each f _#node)]))
(implementation: .public comonad
(CoMonad Zipper)
@@ -309,16 +309,16 @@
(def: out
(value@ [#node //.#value]))
- (def: (disjoint (^slots [#family #node]))
+ (def: (disjoint (^open "_[0]"))
(let [tree_splitter (: (All (_ a) (-> (Tree a) (Tree (Zipper a))))
(function (tree_splitter tree)
[//.#value (..zipper tree)
//.#children (|> tree
(value@ //.#children)
(list#each tree_splitter))]))]
- [#family (maybe#each (function (_ (^slots [#parent #lefts #rights]))
- [..#parent (disjoint #parent)
- ..#lefts (list#each tree_splitter #lefts)
- ..#rights (list#each tree_splitter #rights)])
- #family)
- #node (tree_splitter #node)])))
+ [#family (maybe#each (function (_ (^open "_[0]"))
+ [..#parent (disjoint _#parent)
+ ..#lefts (list#each tree_splitter _#lefts)
+ ..#rights (list#each tree_splitter _#rights)])
+ _#family)
+ #node (tree_splitter _#node)])))
diff --git a/stdlib/source/library/lux/data/format/css/selector.lux b/stdlib/source/library/lux/data/format/css/selector.lux
index 3cb2f5777..9a761f86f 100644
--- a/stdlib/source/library/lux/data/format/css/selector.lux
+++ b/stdlib/source/library/lux/data/format/css/selector.lux
@@ -183,11 +183,11 @@
(def: .public (formula input)
(-> Formula Index)
- (let [(^slots [#constant #variable]) input]
- (:abstraction (format (if (i.< +0 variable)
- (%.int variable)
- (%.nat (.nat variable)))
- (%.int constant)))))
+ (let [(^open "_[0]") input]
+ (:abstraction (format (if (i.< +0 _#variable)
+ (%.int _#variable)
+ (%.nat (.nat _#variable)))
+ (%.int _#constant)))))
(template [<name> <pseudo>]
[(def: .public (<name> index)
diff --git a/stdlib/source/library/lux/data/format/css/value.lux b/stdlib/source/library/lux/data/format/css/value.lux
index f2c8bb1c3..b57294ade 100644
--- a/stdlib/source/library/lux/data/format/css/value.lux
+++ b/stdlib/source/library/lux/data/format/css/value.lux
@@ -827,14 +827,14 @@
(def: .public (rgba pigment)
(-> color.Pigment (Value Color))
- (let [(^slots [color.#color color.#alpha]) pigment
- [red green blue] (color.rgb color)]
+ (let [(^open "_[0]") pigment
+ [red green blue] (color.rgb _#color)]
(..apply "rgba" (list (%.nat red)
(%.nat green)
(%.nat blue)
- (if (r.= (# r.interval top) alpha)
+ (if (r.= (# r.interval top) _#alpha)
"1.0"
- (format "0" (%.rev alpha)))))))
+ (format "0" (%.rev _#alpha)))))))
(template [<name> <suffix>]
[(def: .public (<name> value)
diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux
index fddde12e9..f739e2ff2 100644
--- a/stdlib/source/library/lux/ffi.jvm.lux
+++ b/stdlib/source/library/lux/ffi.jvm.lux
@@ -1043,7 +1043,7 @@
(def: (method_decl$ [[name pm anns] method_decl])
(-> [Member_Declaration MethodDecl] Code)
- (let [(^slots [#method_tvars #method_inputs #method_output #method_exs]) method_decl]
+ (let [(^open "[0]") method_decl]
(` ((~ (code.text name))
[(~+ (list#each annotation$ anns))]
[(~+ (list#each var$ #method_tvars))]
@@ -1332,7 +1332,7 @@
(-> (List (Type Var)) Import_Member_Declaration (Meta [(List [Bit Code]) (List (Type Value)) (List Code)]))
(case member
(^or {#ConstructorDecl [commons _]} {#MethodDecl [commons _]})
- (let [(^slots [#import_member_tvars #import_member_args]) commons]
+ (let [(^open "[0]") commons]
(do [! meta.monad]
[arg_inputs (monad.each !
(: (-> [Bit (Type Value)] (Meta [Bit Code]))
@@ -1533,8 +1533,8 @@
(with_identifiers [g!obj]
(do meta.monad
[.let [def_name (code.identifier ["" (..import_name import_format method_prefix (value@ #import_member_alias commons))])
- (^slots [#import_member_kind]) commons
- (^slots [#import_method_name]) method
+ (^open "[0]") commons
+ (^open "[0]") method
[jvm_op object_ast] (: [Text (List Code)]
(case #import_member_kind
{#StaticIMK}
diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux
index 174e8e8d9..d27658372 100644
--- a/stdlib/source/library/lux/ffi.old.lux
+++ b/stdlib/source/library/lux/ffi.old.lux
@@ -351,7 +351,7 @@
(-> Type_Parameter Code)
(code.identifier ["" name]))
-(def: (class_decl_type$ (^slots [#class_name #class_params]))
+(def: (class_decl_type$ (^open "[0]"))
(-> Class_Declaration Code)
(let [=params (list#each (: (-> Type_Parameter Code)
(function (_ [pname pbounds])
@@ -1017,7 +1017,7 @@
(-> Class_Declaration JVM_Code)
(format "(" (safe #class_name) " " (spaced (list#each type_param$ #class_params)) ")"))
-(def: (super_class_decl$ (^slots [#super_class_name #super_class_params]))
+(def: (super_class_decl$ (^open "[0]"))
(-> Super_Class_Decl JVM_Code)
(format "(" (safe #super_class_name)
" " (spaced (list#each generic_type$ #super_class_params))
@@ -1025,7 +1025,7 @@
(def: (method_decl$ [[name pm anns] method_decl])
(-> [Member_Declaration MethodDecl] JVM_Code)
- (let [(^slots [#method_tvars #method_inputs #method_output #method_exs]) method_decl]
+ (let [(^open "[0]") method_decl]
(with_parens
(spaced (list name
(with_brackets (spaced (list#each annotation$ anns)))
@@ -1321,7 +1321,7 @@
(-> (List Type_Parameter) Class_Declaration Import_Member_Declaration (Meta [(List [Bit Code]) (List Text) (List Code)]))
(case member
(^or {#ConstructorDecl [commons _]} {#MethodDecl [commons _]})
- (let [(^slots [#import_member_tvars #import_member_args]) commons]
+ (let [(^open "[0]") commons]
(do [! meta.monad]
[arg_inputs (monad.each !
(: (-> [Bit GenericType] (Meta [Bit Code]))
@@ -1478,8 +1478,8 @@
(with_identifiers [g!obj]
(do meta.monad
[.let [def_name (code.identifier ["" (..import_name import_format method_prefix (value@ #import_member_alias commons))])
- (^slots [#import_member_kind]) commons
- (^slots [#import_method_name]) method
+ (^open "[0]") commons
+ (^open "[0]") method
[jvm_op object_ast] (: [Text (List Code)]
(case #import_member_kind
{#StaticIMK}
diff --git a/stdlib/source/library/lux/macro/syntax/check.lux b/stdlib/source/library/lux/macro/syntax/check.lux
index a84838a4a..b9f7afe79 100644
--- a/stdlib/source/library/lux/macro/syntax/check.lux
+++ b/stdlib/source/library/lux/macro/syntax/check.lux
@@ -29,11 +29,11 @@
code.equivalence
))
-(def: .public (format (^slots [#type #value]))
+(def: .public (format (^open "_[0]"))
(-> Check Code)
(` ((~ (code.text ..extension))
- (~ #type)
- (~ #value))))
+ (~ _#type)
+ (~ _#value))))
(def: .public parser
(Parser Check)
diff --git a/stdlib/source/library/lux/macro/syntax/definition.lux b/stdlib/source/library/lux/macro/syntax/definition.lux
index 59b946503..d9d83ebd4 100644
--- a/stdlib/source/library/lux/macro/syntax/definition.lux
+++ b/stdlib/source/library/lux/macro/syntax/definition.lux
@@ -50,17 +50,17 @@
.#line (~ (code.nat (value@ .#line location.dummy)))
.#column (~ (code.nat (value@ .#column location.dummy)))]))
-(def: .public (format (^slots [#name #value #export?]))
+(def: .public (format (^open "_[0]"))
(-> Definition Code)
(` ((~ (code.text ..extension))
- (~ (code.local_identifier #name))
- (~ (case #value
+ (~ (code.local_identifier _#name))
+ (~ (case _#value
{.#Left check}
(//check.format check)
{.#Right value}
value))
- (~ (code.bit #export?)))))
+ (~ (code.bit _#export?)))))
(def: .public (parser compiler)
(-> Lux (Parser Definition))
diff --git a/stdlib/source/library/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux
index d0355c4af..b6a67cadd 100644
--- a/stdlib/source/library/lux/macro/template.lux
+++ b/stdlib/source/library/lux/macro/template.lux
@@ -127,17 +127,17 @@
["Expected" (# nat.decimal encoded expected)]
["Actual" (# nat.decimal encoded actual)]))
-(def: (macro (^slots [#parameters #template]))
+(def: (macro (^open "_[0]"))
(-> Local Macro)
("lux macro"
(function (_ inputs compiler)
- (.let [parameters_amount (list.size #parameters)
+ (.let [parameters_amount (list.size _#parameters)
inputs_amount (list.size inputs)]
(if (nat.= parameters_amount inputs_amount)
(.let [environment (: Environment
- (|> (list.zipped/2 #parameters inputs)
+ (|> (list.zipped/2 _#parameters inputs)
(dictionary.of_list text.hash)))]
- {.#Right [compiler (list#each (..applied environment) #template)]})
+ {.#Right [compiler (list#each (..applied environment) _#template)]})
(exception.except ..irregular_arguments [parameters_amount inputs_amount]))))))
(def: local
diff --git a/stdlib/source/library/lux/math/number/complex.lux b/stdlib/source/library/lux/math/number/complex.lux
index 1473ec0c0..7a64584b3 100644
--- a/stdlib/source/library/lux/math/number/complex.lux
+++ b/stdlib/source/library/lux/math/number/complex.lux
@@ -111,7 +111,7 @@
(def: .public (/ param input)
(-> Complex Complex Complex)
- (let [(^slots [#real #imaginary]) param]
+ (let [(^open "[0]") param]
(if (f.< (f.abs #imaginary)
(f.abs #real))
(let [quot (f./ #imaginary #real)
@@ -125,7 +125,7 @@
(def: .public (/' param subject)
(-> Frac Complex Complex)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
[..#real (f./ param #real)
..#imaginary (f./ param #imaginary)]))
@@ -140,7 +140,7 @@
(def: .public (cos subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
[..#real (f.* (math.cosh #imaginary)
(math.cos #real))
..#imaginary (f.opposite (f.* (math.sinh #imaginary)
@@ -148,7 +148,7 @@
(def: .public (cosh subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
[..#real (f.* (math.cos #imaginary)
(math.cosh #real))
..#imaginary (f.* (math.sin #imaginary)
@@ -156,7 +156,7 @@
(def: .public (sin subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
[..#real (f.* (math.cosh #imaginary)
(math.sin #real))
..#imaginary (f.* (math.sinh #imaginary)
@@ -164,7 +164,7 @@
(def: .public (sinh subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
[..#real (f.* (math.cos #imaginary)
(math.sinh #real))
..#imaginary (f.* (math.sin #imaginary)
@@ -172,7 +172,7 @@
(def: .public (tan subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject
+ (let [(^open "[0]") subject
r2 (f.* +2.0 #real)
i2 (f.* +2.0 #imaginary)
d (f.+ (math.cos r2) (math.cosh i2))]
@@ -181,7 +181,7 @@
(def: .public (tanh subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject
+ (let [(^open "[0]") subject
r2 (f.* +2.0 #real)
i2 (f.* +2.0 #imaginary)
d (f.+ (math.cosh r2) (math.cos i2))]
@@ -190,7 +190,7 @@
(def: .public (abs subject)
(-> Complex Frac)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
(if (f.< (f.abs #imaginary)
(f.abs #real))
(if (f.= +0.0 #imaginary)
@@ -206,14 +206,14 @@
(def: .public (exp subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject
+ (let [(^open "[0]") subject
r_exp (math.exp #real)]
[..#real (f.* r_exp (math.cos #imaginary))
..#imaginary (f.* r_exp (math.sin #imaginary))]))
(def: .public (log subject)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) subject]
+ (let [(^open "[0]") subject]
[..#real (|> subject ..abs math.log)
..#imaginary (math.atan/2 #real #imaginary)]))
@@ -232,7 +232,7 @@
(def: .public (root/2 input)
(-> Complex Complex)
- (let [(^slots [#real #imaginary]) input
+ (let [(^open "[0]") input
t (|> input ..abs (f.+ (f.abs #real)) (f./ +2.0) (math.pow +0.5))]
(if (f.< +0.0 #real)
[..#real (f./ (f.* +2.0 t)
@@ -246,7 +246,7 @@
(-> Complex Complex)
(|> (complex +1.0) (- (* input input)) ..root/2))
-(def: .public (reciprocal (^slots [#real #imaginary]))
+(def: .public (reciprocal (^open "[0]"))
(-> Complex Complex)
(if (f.< (f.abs #imaginary)
(f.abs #real))
@@ -284,7 +284,7 @@
..log
(..* (../ (..complex +2.0) ..i))))
-(def: .public (argument (^slots [#real #imaginary]))
+(def: .public (argument (^open "[0]"))
(-> Complex Frac)
(math.atan/2 #real #imaginary))
diff --git a/stdlib/source/library/lux/math/number/ratio.lux b/stdlib/source/library/lux/math/number/ratio.lux
index 0a31b4e8e..87144de00 100644
--- a/stdlib/source/library/lux/math/number/ratio.lux
+++ b/stdlib/source/library/lux/math/number/ratio.lux
@@ -33,11 +33,11 @@
1 {.#Some (value@ #numerator value)}
_ {.#None}))
-(def: (normal (^slots [#numerator #denominator]))
+(def: (normal (^open "_[0]"))
(-> Ratio Ratio)
- (let [common (n.gcd #numerator #denominator)]
- [..#numerator (n./ common #numerator)
- ..#denominator (n./ common #denominator)]))
+ (let [common (n.gcd _#numerator _#denominator)]
+ [..#numerator (n./ common _#numerator)
+ ..#denominator (n./ common _#denominator)]))
(syntax: .public (ratio [numerator <code>.any
?denominator (<>.maybe <code>.any)])
@@ -121,18 +121,20 @@
(..- (revised@ #numerator (n.* quot) parameter)
subject)))
-(def: .public (reciprocal (^slots [#numerator #denominator]))
+(def: .public (reciprocal (^open "_[0]"))
(-> Ratio Ratio)
- [..#numerator #denominator
- ..#denominator #numerator])
+ [..#numerator _#denominator
+ ..#denominator _#numerator])
(def: separator ":")
(implementation: .public codec
(Codec Text Ratio)
- (def: (encoded (^slots [#numerator #denominator]))
- ($_ text#composite (n#encoded #numerator) ..separator (n#encoded #denominator)))
+ (def: (encoded (^open "_[0]"))
+ ($_ text#composite
+ (n#encoded _#numerator)
+ ..separator (n#encoded _#denominator)))
(def: (decoded input)
(case (text.split_by ..separator input)
diff --git a/stdlib/source/library/lux/meta.lux b/stdlib/source/library/lux/meta.lux
index d9c84288d..aa333b9d3 100644
--- a/stdlib/source/library/lux/meta.lux
+++ b/stdlib/source/library/lux/meta.lux
@@ -300,9 +300,9 @@
(function (_ lux)
(case (: (Maybe Global)
(do maybe.monad
- [(^slots [.#definitions]) (|> lux
- (value@ .#modules)
- (plist.value normal_module))]
+ [(^open "[0]") (|> lux
+ (value@ .#modules)
+ (plist.value normal_module))]
(plist.value normal_short #definitions)))
{.#Some definition}
{try.#Success [lux definition]}
@@ -534,14 +534,14 @@
(def: .public (imported_modules module_name)
(-> Text (Meta (List Text)))
(do ..monad
- [(^slots [.#imports]) (..module module_name)]
- (in #imports)))
+ [(^open "_[0]") (..module module_name)]
+ (in _#imports)))
(def: .public (imported_by? import module)
(-> Text Text (Meta Bit))
(do ..monad
- [(^slots [.#imports]) (..module module)]
- (in (list.any? (text#= import) #imports))))
+ [(^open "_[0]") (..module module)]
+ (in (list.any? (text#= import) _#imports))))
(def: .public (imported? import)
(-> Text (Meta Bit))
diff --git a/stdlib/source/library/lux/time.lux b/stdlib/source/library/lux/time.lux
index 0eaba81d6..5ceaa5e86 100644
--- a/stdlib/source/library/lux/time.lux
+++ b/stdlib/source/library/lux/time.lux
@@ -199,12 +199,12 @@
(def: (format time)
(-> Time Text)
- (let [(^slots [#hour #minute #second #milli_second]) (..clock time)]
+ (let [(^open "_[0]") (..clock time)]
($_ text#composite
- (..padded #hour)
- ..separator (..padded #minute)
- ..separator (..padded #second)
- (..millis_format #milli_second))))
+ (..padded _#hour)
+ ..separator (..padded _#minute)
+ ..separator (..padded _#second)
+ (..millis_format _#milli_second))))
(implementation: .public codec
(Codec Text Time)
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive.lux b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
index fd5753492..dae79178d 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive.lux
@@ -89,14 +89,14 @@
(def: .public (id module archive)
(-> Module Archive (Try ID))
- (let [(^slots [..#resolver]) (:representation archive)]
- (case (dictionary.value module #resolver)
+ (let [(^open "_[0]") (:representation archive)]
+ (case (dictionary.value module _#resolver)
{.#Some [id _]}
{try.#Success id}
{.#None}
(exception.except ..unknown_document [module
- (dictionary.keys #resolver)]))))
+ (dictionary.keys _#resolver)]))))
(def: .public (reserve module archive)
(-> Module Archive (Try [ID Archive]))
@@ -115,8 +115,8 @@
(def: .public (has module [descriptor document output] archive)
(-> Module [Descriptor (Document Any) Output] Archive (Try Archive))
- (let [(^slots [..#resolver]) (:representation archive)]
- (case (dictionary.value module #resolver)
+ (let [(^open "_[0]") (:representation archive)]
+ (case (dictionary.value module _#resolver)
{.#Some [id {.#None}]}
{try.#Success (|> archive
:representation
@@ -134,8 +134,8 @@
(def: .public (find module archive)
(-> Module Archive (Try [Descriptor (Document Any) Output]))
- (let [(^slots [..#resolver]) (:representation archive)]
- (case (dictionary.value module #resolver)
+ (let [(^open "_[0]") (:representation archive)]
+ (case (dictionary.value module _#resolver)
{.#Some [id {.#Some entry}]}
{try.#Success entry}
@@ -144,7 +144,7 @@
{.#None}
(exception.except ..unknown_document [module
- (dictionary.keys #resolver)]))))
+ (dictionary.keys _#resolver)]))))
(def: .public (archived? archive module)
(-> Archive Module Bit)
@@ -167,8 +167,8 @@
(def: .public (reserved? archive module)
(-> Archive Module Bit)
- (let [(^slots [..#resolver]) (:representation archive)]
- (case (dictionary.value module #resolver)
+ (let [(^open "_[0]") (:representation archive)]
+ (case (dictionary.value module _#resolver)
{.#Some [id _]}
bit.yes
@@ -229,14 +229,14 @@
(def: .public (export version archive)
(-> Version Archive Binary)
- (let [(^slots [..#next ..#resolver]) (:representation archive)]
- (|> #resolver
+ (let [(^open "_[0]") (:representation archive)]
+ (|> _#resolver
dictionary.entries
(list.all (function (_ [module [id descriptor+document]])
(case descriptor+document
{.#Some _} {.#Some [module id]}
{.#None} {.#None})))
- [version #next]
+ [version _#next]
(binary.result ..writer))))
(exception: .public (version_mismatch [expected Version
diff --git a/stdlib/source/library/lux/type/refinement.lux b/stdlib/source/library/lux/type/refinement.lux
index 52421e0a1..02745abd2 100644
--- a/stdlib/source/library/lux/type/refinement.lux
+++ b/stdlib/source/library/lux/type/refinement.lux
@@ -43,11 +43,11 @@
(-> (-> t t)
(-> (Refined t %) (Maybe (Refined t %)))))
(function (_ refined)
- (let [(^slots [#value #predicate]) (:representation refined)
- value' (transform #value)]
- (if (#predicate value')
+ (let [(^open "_[0]") (:representation refined)
+ value' (transform _#value)]
+ (if (_#predicate value')
{.#Some (:abstraction [..#value value'
- ..#predicate #predicate])}
+ ..#predicate _#predicate])}
{.#None}))))
)
diff --git a/stdlib/source/library/lux/type/unit.lux b/stdlib/source/library/lux/type/unit.lux
index 605867277..6509f6505 100644
--- a/stdlib/source/library/lux/type/unit.lux
+++ b/stdlib/source/library/lux/type/unit.lux
@@ -121,7 +121,7 @@
<code>.local_identifier
..scaleP))])
(do meta.monad
- [.let [(^slots [ratio.#numerator ratio.#denominator]) ratio]
+ [.let [(^open "_[0]") ratio]
@ meta.current_module_name
.let [g!scale (code.local_identifier type_name)]]
(in (list (` (type: (~ export_policy) ((~ g!scale) (~' u))
@@ -132,16 +132,17 @@
(def: (~' scale)
(|>> ((~! ..out'))
- (i.* (~ (code.int (.int #numerator))))
- (i./ (~ (code.int (.int #denominator))))
+ (i.* (~ (code.int (.int _#numerator))))
+ (i./ (~ (code.int (.int _#denominator))))
((~! ..in'))))
(def: (~' de_scale)
(|>> ((~! ..out'))
- (i.* (~ (code.int (.int #denominator))))
- (i./ (~ (code.int (.int #numerator))))
+ (i.* (~ (code.int (.int _#denominator))))
+ (i./ (~ (code.int (.int _#numerator))))
((~! ..in'))))
(def: (~' ratio)
- [(~ (code.nat #numerator)) (~ (code.nat #denominator))])))
+ [(~ (code.nat _#numerator))
+ (~ (code.nat _#denominator))])))
))))
(def: .public (re_scaled from to quantity)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
index f40cf76e5..153a270a8 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/stamp.lux
@@ -39,10 +39,10 @@
list
{xml.#Node ..<timestamp> xml.attributes}))
-(def: .public (format (^slots [#time #build]))
+(def: .public (format (^open "_[0]"))
(-> Stamp (List XML))
- (list (..time_format time)
- (//build.format build)))
+ (list (..time_format _#time)
+ (//build.format _#build)))
(def: time_parser
(Parser Time)
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version.lux b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
index e2782c12a..ab64989e5 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version.lux
@@ -45,12 +45,12 @@
(-> xml.Tag Text XML)
(|> value {xml.#Text} list {xml.#Node tag xml.attributes}))
-(def: .public (format (^slots [#extension #value #updated]))
+(def: .public (format (^open "_[0]"))
(-> Version XML)
(<| {xml.#Node ..<snapshot_version> xml.attributes}
- (list (..text_format ..<extension> extension)
- (..text_format ..<value> value)
- (..text_format ..<updated> (///time.format updated)))))
+ (list (..text_format ..<extension> _#extension)
+ (..text_format ..<value> _#value)
+ (..text_format ..<updated> (///time.format _#updated)))))
(def: (text tag)
(-> xml.Tag (Parser Text))
diff --git a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
index d2092b306..7a7b4b28f 100644
--- a/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
+++ b/stdlib/source/program/aedifex/artifact/snapshot/version/value.lux
@@ -29,14 +29,14 @@
(def: .public snapshot
"SNAPSHOT")
-(def: .public (format (^slots [#version #snapshot]))
+(def: .public (format (^open "[0]"))
(%.Format Value)
(case snapshot
{///.#Local}
version
{///.#Remote stamp}
- (let [(^slots [///stamp.#time ///stamp.#build]) stamp]
+ (let [(^open "[0]") stamp]
(%.format (text.replaced ..snapshot
(///time.format time)
version)
diff --git a/stdlib/source/program/aedifex/artifact/time/time.lux b/stdlib/source/program/aedifex/artifact/time/time.lux
index 4b77f6d1f..441c4605b 100644
--- a/stdlib/source/program/aedifex/artifact/time/time.lux
+++ b/stdlib/source/program/aedifex/artifact/time/time.lux
@@ -21,10 +21,10 @@
(def: .public (format value)
(%.Format Time)
- (let [(^slots [time.#hour time.#minute time.#second]) (time.clock value)]
- (%.format (//.pad #hour)
- (//.pad #minute)
- (//.pad #second))))
+ (let [(^open "_[0]") (time.clock value)]
+ (%.format (//.pad _#hour)
+ (//.pad _#minute)
+ (//.pad _#second))))
(def: .public parser
(<text>.Parser Time)
diff --git a/stdlib/source/program/aedifex/artifact/versioning.lux b/stdlib/source/program/aedifex/artifact/versioning.lux
index 09d8e4758..99769536f 100644
--- a/stdlib/source/program/aedifex/artifact/versioning.lux
+++ b/stdlib/source/program/aedifex/artifact/versioning.lux
@@ -61,12 +61,12 @@
(-> //time.Time XML)
(|>> //time.format {xml.#Text} list {xml.#Node ..<last_updated> xml.attributes}))
-(def: .public (format (^slots [#snapshot #last_updated #versions]))
+(def: .public (format (^open "_[0]"))
(-> Versioning XML)
(<| {xml.#Node ..<versioning> xml.attributes}
- (list (//snapshot.format snapshot)
- (..last_updated_format last_updated)
- (|> versions
+ (list (//snapshot.format _#snapshot)
+ (..last_updated_format _#last_updated)
+ (|> _#versions
(list#each //snapshot/version.format)
{xml.#Node ..<snapshot_versions> xml.attributes}))))
diff --git a/stdlib/source/program/aedifex/metadata/artifact.lux b/stdlib/source/program/aedifex/metadata/artifact.lux
index d0a662185..60d5d6e6d 100644
--- a/stdlib/source/program/aedifex/metadata/artifact.lux
+++ b/stdlib/source/program/aedifex/metadata/artifact.lux
@@ -59,7 +59,7 @@
(def: (time_format value)
(%.Format Time)
- (let [(^slots [time.#hour time.#minute time.#second]) (time.clock value)]
+ (let [(^open "[0]") (time.clock value)]
(%.format (..pad #hour)
(..pad #minute)
(..pad #second))))
@@ -187,7 +187,7 @@
{try.#Failure error}
(in {try.#Success
- (let [(^slots [///artifact.#group ///artifact.#name]) artifact]
+ (let [(^open "[0]") artifact]
[..#group #group
..#name #name
..#versions (list)
diff --git a/stdlib/source/program/aedifex/metadata/snapshot.lux b/stdlib/source/program/aedifex/metadata/snapshot.lux
index 943bf6004..fe9a2e6a0 100644
--- a/stdlib/source/program/aedifex/metadata/snapshot.lux
+++ b/stdlib/source/program/aedifex/metadata/snapshot.lux
@@ -69,15 +69,15 @@
[version_format Version ..<version> (|>)]
)
-(def: .public (format (^slots [#artifact #versioning]))
+(def: .public (format (^open "[0]"))
(-> Metadata XML)
- (let [(^slots [///artifact.#group ///artifact.#name ///artifact.#version]) artifact]
+ (let [(^open "[0]") #artifact]
{xml.#Node ..<metadata>
xml.attributes
(list (..group_format group)
(..name_format name)
(..version_format version)
- (///artifact/versioning.format versioning))}))
+ (///artifact/versioning.format #versioning))}))
(def: (text tag)
(-> xml.Tag (Parser Text))
diff --git a/stdlib/source/specification/compositor/common.lux b/stdlib/source/specification/compositor/common.lux
index dcba095a9..21ab7b474 100644
--- a/stdlib/source/specification/compositor/common.lux
+++ b/stdlib/source/specification/compositor/common.lux
@@ -31,7 +31,7 @@
(generation.State+ anchor expression directive)
what)))
-(def: (runner (^slots [platform.#runtime platform.#phase platform.#host]) state)
+(def: (runner (^open "[0]") state)
(Instancer Runner)
(function (_ evaluation_name expressionS)
(do try.monad
@@ -42,8 +42,7 @@
(phase expressionS)))]
(# host evaluate! evaluation_name expressionG))))
-(def: (definer (^slots [platform.#runtime platform.#phase platform.#host])
- state)
+(def: (definer (^open "[0]") state)
(Instancer Definer)
(function (_ lux_name expressionS)
(do try.monad
diff --git a/stdlib/source/test/lux.lux b/stdlib/source/test/lux.lux
index da7c16c26..c36f8b11f 100644
--- a/stdlib/source/test/lux.lux
+++ b/stdlib/source/test/lux.lux
@@ -949,11 +949,6 @@
(/.case expected_text
(/.^or "+0.5" "+1.25") true
_ false)))
- (_.cover [/.^slots]
- (/.case [#left expected_nat #right expected_int]
- (/.^slots [#left #right])
- (and (/.same? expected_nat #left)
- (/.same? expected_int #right))))
(_.cover [/.^]
(/.case [#left expected_nat #right expected_int]
(/.^ (!pair 0 +0)) true