aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source')
-rw-r--r--stdlib/source/lux/data/binary.lux (renamed from stdlib/source/lux/world/binary.lux)0
-rw-r--r--stdlib/source/lux/data/format/binary.lux7
-rw-r--r--stdlib/source/lux/data/text/encoding.lux3
-rw-r--r--stdlib/source/lux/target/jvm/attribute.lux4
-rw-r--r--stdlib/source/lux/target/jvm/attribute/code.lux5
-rw-r--r--stdlib/source/lux/target/jvm/loader.lux3
-rw-r--r--stdlib/source/lux/world/file.lux5
-rw-r--r--stdlib/source/test/lux/data.lux2
-rw-r--r--stdlib/source/test/lux/data/binary.lux (renamed from stdlib/source/test/lux/world/binary.lux)0
-rw-r--r--stdlib/source/test/lux/target/jvm.lux2
-rw-r--r--stdlib/source/test/lux/world.lux5
-rw-r--r--stdlib/source/test/lux/world/file.lux10
12 files changed, 19 insertions, 27 deletions
diff --git a/stdlib/source/lux/world/binary.lux b/stdlib/source/lux/data/binary.lux
index 485aab536..485aab536 100644
--- a/stdlib/source/lux/world/binary.lux
+++ b/stdlib/source/lux/data/binary.lux
diff --git a/stdlib/source/lux/data/format/binary.lux b/stdlib/source/lux/data/format/binary.lux
index ff43f4384..f7aaff36b 100644
--- a/stdlib/source/lux/data/format/binary.lux
+++ b/stdlib/source/lux/data/format/binary.lux
@@ -1,5 +1,6 @@
(.module:
[lux (#- and or nat int rev list type)
+ [type (#+ :share)]
[abstract
[monoid (#+ Monoid)]
["." fold]
@@ -12,6 +13,7 @@
[data
["." product]
["." error (#+ Error)]
+ ["." binary (#+ Binary)]
[number
["." i64]
["." frac]]
@@ -20,10 +22,7 @@
["%" format]]
[collection
["." list]
- ["." row (#+ Row) ("#;." functor)]]]
- [type (#+ :share)]
- [world
- ["." binary (#+ Binary)]]])
+ ["." row (#+ Row) ("#;." functor)]]]])
(exception: #export (binary-was-not-fully-read {length Nat} {read Nat})
(ex.report ["Binary length" (%.nat length)]
diff --git a/stdlib/source/lux/data/text/encoding.lux b/stdlib/source/lux/data/text/encoding.lux
index e4d24f709..fca1e7632 100644
--- a/stdlib/source/lux/data/text/encoding.lux
+++ b/stdlib/source/lux/data/text/encoding.lux
@@ -4,11 +4,10 @@
[abstract
[codec (#+ Codec)]]
[data
+ [binary (#+ Binary)]
["." error (#+ Error)]]
[type
abstract]
- [world
- [binary (#+ Binary)]]
["." host]])
## https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
diff --git a/stdlib/source/lux/target/jvm/attribute.lux b/stdlib/source/lux/target/jvm/attribute.lux
index 82ca49111..421dbab17 100644
--- a/stdlib/source/lux/target/jvm/attribute.lux
+++ b/stdlib/source/lux/target/jvm/attribute.lux
@@ -11,9 +11,7 @@
["." product]
["." error]
[format
- [".F" binary (#+ Reader Writer Format) ("#@." monoid)]]]
- [world
- ["." binary (#+ Binary)]]]
+ [".F" binary (#+ Reader Writer Format) ("#@." monoid)]]]]
["." // #_
["#." index (#+ Index)]
[encoding
diff --git a/stdlib/source/lux/target/jvm/attribute/code.lux b/stdlib/source/lux/target/jvm/attribute/code.lux
index c466fa838..a52d32538 100644
--- a/stdlib/source/lux/target/jvm/attribute/code.lux
+++ b/stdlib/source/lux/target/jvm/attribute/code.lux
@@ -6,12 +6,11 @@
[control
["<>" parser]]
[data
+ ["." binary (#+ Binary)]
[format
[".F" binary (#+ Reader Writer) ("#@." monoid)]]
[collection
- ["." row (#+ Row) ("#@." functor fold)]]]
- [world
- ["." binary (#+ Binary)]]]
+ ["." row (#+ Row) ("#@." functor fold)]]]]
["." /// #_
[encoding
["#." unsigned (#+ U2)]]]
diff --git a/stdlib/source/lux/target/jvm/loader.lux b/stdlib/source/lux/target/jvm/loader.lux
index d8cb567e7..7fc9f4ff8 100644
--- a/stdlib/source/lux/target/jvm/loader.lux
+++ b/stdlib/source/lux/target/jvm/loader.lux
@@ -10,14 +10,13 @@
["." atom (#+ Atom)]]]
[data
["." error (#+ Error)]
+ ["." binary (#+ Binary)]
["." text
["%" format (#+ format)]]
[collection
["." array]
["." list ("#;." functor)]
["." dictionary (#+ Dictionary)]]]
- [world
- ["." binary (#+ Binary)]]
["." host (#+ import: object do-to)]])
(type: #export Library
diff --git a/stdlib/source/lux/world/file.lux b/stdlib/source/lux/world/file.lux
index 7fd5b9fb4..8c79ca0e8 100644
--- a/stdlib/source/lux/world/file.lux
+++ b/stdlib/source/lux/world/file.lux
@@ -15,6 +15,7 @@
["." product]
["." maybe]
["." error (#+ Error) ("#;." functor)]
+ ["." binary (#+ Binary)]
["." text
["%" format (#+ format)]]
[collection
@@ -24,9 +25,7 @@
["." instant (#+ Instant)]
["." duration]]
[macro
- ["." template]]
- [world
- ["." binary (#+ Binary)]]])
+ ["." template]]])
(type: #export Path Text)
diff --git a/stdlib/source/test/lux/data.lux b/stdlib/source/test/lux/data.lux
index a29358b6b..65d43e5e6 100644
--- a/stdlib/source/test/lux/data.lux
+++ b/stdlib/source/test/lux/data.lux
@@ -2,6 +2,7 @@
[lux #*
["_" test (#+ Test)]]
["." / #_
+ ["#." binary]
["#." bit]
["#." color]
["#." error]
@@ -53,6 +54,7 @@
(def: #export test
Test
($_ _.and
+ /binary.test
/bit.test
/color.test
/error.test
diff --git a/stdlib/source/test/lux/world/binary.lux b/stdlib/source/test/lux/data/binary.lux
index 8fb17114e..8fb17114e 100644
--- a/stdlib/source/test/lux/world/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
diff --git a/stdlib/source/test/lux/target/jvm.lux b/stdlib/source/test/lux/target/jvm.lux
index e5032ed44..8176756cc 100644
--- a/stdlib/source/test/lux/target/jvm.lux
+++ b/stdlib/source/test/lux/target/jvm.lux
@@ -8,6 +8,7 @@
[security
["!" capability]]]
[data
+ [binary (#+ Binary)]
["." error (#+ Error)]
["." text
["%" format (#+ format)]]
@@ -17,7 +18,6 @@
["." dictionary]
["." row]]]
[world
- [binary (#+ Binary)]
["." file (#+ File)]]
[math
["r" random (#+ Random) ("#@." monad)]]
diff --git a/stdlib/source/test/lux/world.lux b/stdlib/source/test/lux/world.lux
index bfd9e6194..e46eecda3 100644
--- a/stdlib/source/test/lux/world.lux
+++ b/stdlib/source/test/lux/world.lux
@@ -2,13 +2,10 @@
[lux #*
["_" test (#+ Test)]]
["." / #_
- ["#." binary]
- ["#." file]
- ])
+ ["#." file]])
(def: #export test
Test
($_ _.and
- /binary.test
/file.test
))
diff --git a/stdlib/source/test/lux/world/file.lux b/stdlib/source/test/lux/world/file.lux
index c0c3f7d18..451f4671b 100644
--- a/stdlib/source/test/lux/world/file.lux
+++ b/stdlib/source/test/lux/world/file.lux
@@ -11,6 +11,7 @@
[security
["!" capability]]]
[data
+ ["." binary (#+ Binary)]
["." error (#+ Error)]
["." text]
[number
@@ -19,13 +20,12 @@
["." list]]]
[time
["." instant]
- ["." duration]]
- [world
- ["." binary (#+ Binary)]]]
+ ["." duration]]]
{1
["." / (#+ Path File)]}
- [//
- ["_." binary]])
+ [///
+ [data
+ ["_." binary]]])
(def: truncate-millis
(let [millis +1,000]