aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.github/workflows/setup_aedifex/action.yml9
-rw-r--r--.github/workflows/test.yml7
-rw-r--r--lux-js/commands.md8
-rw-r--r--lux-js/source/program.lux4
-rw-r--r--lux-jvm/source/luxc/lang/translation/jvm/function.lux2
-rw-r--r--lux-lua/source/program.lux6
-rw-r--r--stdlib/source/documentation/lux/control/concatenative.lux24
-rw-r--r--stdlib/source/documentation/lux/control/parser/binary.lux84
-rw-r--r--stdlib/source/documentation/lux/data/binary.lux68
-rw-r--r--stdlib/source/documentation/lux/data/collection/list.lux50
-rw-r--r--stdlib/source/documentation/lux/data/format/binary.lux52
-rw-r--r--stdlib/source/documentation/lux/data/text.lux40
-rw-r--r--stdlib/source/documentation/lux/data/text/format.lux46
-rw-r--r--stdlib/source/documentation/lux/math.lux44
-rw-r--r--stdlib/source/documentation/lux/math/number/complex.lux22
-rw-r--r--stdlib/source/documentation/lux/target/js.lux8
-rw-r--r--stdlib/source/documentation/lux/target/lua.lux12
-rw-r--r--stdlib/source/documentation/lux/target/python.lux28
-rw-r--r--stdlib/source/documentation/lux/target/ruby.lux28
-rw-r--r--stdlib/source/documentation/lux/world/output/video/resolution.lux13
-rw-r--r--stdlib/source/library/lux.lux18
-rw-r--r--stdlib/source/library/lux/control/concatenative.lux4
-rw-r--r--stdlib/source/library/lux/control/function/mutual.lux8
-rw-r--r--stdlib/source/library/lux/control/parser/binary.lux50
-rw-r--r--stdlib/source/library/lux/data/binary.lux18
-rw-r--r--stdlib/source/library/lux/data/collection/list.lux8
-rw-r--r--stdlib/source/library/lux/data/format/binary.lux46
-rw-r--r--stdlib/source/library/lux/data/format/css/class.lux4
-rw-r--r--stdlib/source/library/lux/data/format/css/id.lux4
-rw-r--r--stdlib/source/library/lux/data/format/tar.lux16
-rw-r--r--stdlib/source/library/lux/data/format/xml.lux2
-rw-r--r--stdlib/source/library/lux/data/text.lux2
-rw-r--r--stdlib/source/library/lux/data/text/format.lux110
-rw-r--r--stdlib/source/library/lux/documentation.lux8
-rw-r--r--stdlib/source/library/lux/ffi.jvm.lux16
-rw-r--r--stdlib/source/library/lux/ffi.old.lux2
-rw-r--r--stdlib/source/library/lux/macro/pattern.lux2
-rw-r--r--stdlib/source/library/lux/macro/template.lux4
-rw-r--r--stdlib/source/library/lux/math/number/complex.lux14
-rw-r--r--stdlib/source/library/lux/math/number/frac.lux34
-rw-r--r--stdlib/source/library/lux/math/number/i64.lux24
-rw-r--r--stdlib/source/library/lux/target/common_lisp.lux2
-rw-r--r--stdlib/source/library/lux/target/js.lux12
-rw-r--r--stdlib/source/library/lux/target/jvm/attribute/code.lux6
-rw-r--r--stdlib/source/library/lux/target/jvm/bytecode.lux2
-rw-r--r--stdlib/source/library/lux/target/jvm/bytecode/instruction.lux78
-rw-r--r--stdlib/source/library/lux/target/jvm/class.lux2
-rw-r--r--stdlib/source/library/lux/target/jvm/constant.lux10
-rw-r--r--stdlib/source/library/lux/target/jvm/constant/pool.lux2
-rw-r--r--stdlib/source/library/lux/target/jvm/encoding/signed.lux6
-rw-r--r--stdlib/source/library/lux/target/jvm/encoding/unsigned.lux6
-rw-r--r--stdlib/source/library/lux/target/jvm/field.lux2
-rw-r--r--stdlib/source/library/lux/target/jvm/method.lux2
-rw-r--r--stdlib/source/library/lux/target/jvm/reflection.lux2
-rw-r--r--stdlib/source/library/lux/test.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux12
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux6
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux8
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux20
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux2
-rw-r--r--stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux4
-rw-r--r--stdlib/source/library/lux/tool/compiler/meta/io/context.lux2
-rw-r--r--stdlib/source/library/lux/type.lux4
-rw-r--r--stdlib/source/library/lux/type/implicit.lux8
-rw-r--r--stdlib/source/library/lux/world/output/video/resolution.lux26
-rw-r--r--stdlib/source/library/lux/world/program.lux6
-rw-r--r--stdlib/source/poly/lux/abstract/equivalence.lux2
-rw-r--r--stdlib/source/poly/lux/data/format/json.lux2
-rw-r--r--stdlib/source/program/aedifex/hash.lux8
-rw-r--r--stdlib/source/program/aedifex/metadata.lux4
-rw-r--r--stdlib/source/specification/compositor/generation/structure.lux2
-rw-r--r--stdlib/source/test/aedifex/command/clean.lux2
-rw-r--r--stdlib/source/test/lux/control/concatenative.lux54
-rw-r--r--stdlib/source/test/lux/control/concurrency/frp.lux18
-rw-r--r--stdlib/source/test/lux/control/parser/binary.lux40
-rw-r--r--stdlib/source/test/lux/control/parser/json.lux4
-rw-r--r--stdlib/source/test/lux/data/binary.lux42
-rw-r--r--stdlib/source/test/lux/data/collection/dictionary.lux2
-rw-r--r--stdlib/source/test/lux/data/collection/dictionary/ordered.lux4
-rw-r--r--stdlib/source/test/lux/data/collection/dictionary/plist.lux48
-rw-r--r--stdlib/source/test/lux/data/collection/list.lux30
-rw-r--r--stdlib/source/test/lux/data/collection/set/multi.lux44
-rw-r--r--stdlib/source/test/lux/data/collection/tree/finger.lux2
-rw-r--r--stdlib/source/test/lux/data/format/json.lux64
-rw-r--r--stdlib/source/test/lux/data/text.lux4
-rw-r--r--stdlib/source/test/lux/data/text/format.lux138
-rw-r--r--stdlib/source/test/lux/ffi.jvm.lux8
-rw-r--r--stdlib/source/test/lux/math/number/complex.lux6
-rw-r--r--stdlib/source/test/lux/math/number/frac.lux18
-rw-r--r--stdlib/source/test/lux/target/js.lux124
-rw-r--r--stdlib/source/test/lux/target/lua.lux6
-rw-r--r--stdlib/source/test/lux/target/python.lux4
-rw-r--r--stdlib/source/test/lux/target/ruby.lux8
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux26
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux4
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux2
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux2
-rw-r--r--stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux2
-rw-r--r--stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux2
-rw-r--r--stdlib/source/test/lux/world/output/video/resolution.lux6
-rw-r--r--stdlib/source/unsafe/lux/data/binary.lux96
113 files changed, 1023 insertions, 1014 deletions
diff --git a/.github/workflows/setup_aedifex/action.yml b/.github/workflows/setup_aedifex/action.yml
index 2b81a4fbc..bc848c2f0 100644
--- a/.github/workflows/setup_aedifex/action.yml
+++ b/.github/workflows/setup_aedifex/action.yml
@@ -2,11 +2,20 @@ name: 'Setup Aedifex'
runs:
using: "composite"
steps:
+ # https://github.com/actions/setup-java
+ - uses: actions/setup-java@v2
+ with:
+ distribution: 'temurin'
+ java-version: '17'
+
- uses: actions/checkout@v2
+
- run: wget https://github.com/LuxLang/lux/releases/download/0.6.5/aedifex_do_not_touch_3.jar && mv aedifex_do_not_touch_3.jar aedifex.jar
shell: bash
+
- run: mv ./shell/lux.sh ./lux.sh
shell: bash
+
- run: cd ./stdlib/ && ../lux.sh clean && cd ..
shell: bash
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 6bd9c1012..f8b31badd 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -4,18 +4,11 @@ jobs:
test_stdlib_on_jvm:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- uses: ./.github/workflows/setup_aedifex
- # https://github.com/actions/setup-java
- - uses: actions/setup-java@v2
- with:
- distribution: 'temurin'
- java-version: '17'
- run: cd ./stdlib/ && ../lux.sh with jvm with bibliotheca test
test_stdlib_on_node_js:
runs-on: ubuntu-latest
steps:
- - uses: actions/checkout@v2
- uses: ./.github/workflows/setup_aedifex
# https://github.com/actions/setup-node
- uses: actions/setup-node@v2
diff --git a/lux-js/commands.md b/lux-js/commands.md
index a7859d1e0..2cd22edc7 100644
--- a/lux-js/commands.md
+++ b/lux-js/commands.md
@@ -47,5 +47,13 @@ cd ~/lux/stdlib/ \
```
cd ~/lux/lux-js/ \
&& mvn install:install-file -Dfile=target/program.js -DgroupId=com.github.luxlang -DartifactId=lux-js -Dversion=0.6.6-SNAPSHOT -Dpackaging=js
+
+cd ~/lux/lux-js/ && mvn deploy:deploy-file \
+-Durl=https://USERNAME:PASSWORD@oss.sonatype.org/content/repositories/snapshots/ \
+-Dfile=target/program.js \
+-DgroupId=com.github.luxlang \
+-DartifactId=lux-js \
+-Dversion=0.7.0-SNAPSHOT \
+-Dpackaging=js
```
diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux
index 0156887b7..678418bca 100644
--- a/lux-js/source/program.lux
+++ b/lux-js/source/program.lux
@@ -654,7 +654,7 @@
(_.the "argv")
(_.do "slice" (list (_.int +2))))
no_inputs (_.array (list))]
- (_.statement (_.apply/1 (_.apply/1 program (runtime.lux//program_args (_.? on_node_js?
+ (_.statement (_.apply_1 (_.apply_1 program (runtime.lux//program_args (_.? on_node_js?
node_js_inputs
no_inputs)))
(_.string "")))))
@@ -700,7 +700,7 @@
(def: (scope body)
(-> _.Statement _.Statement)
- (_.statement (_.apply/* (_.closure (list) body)
+ (_.statement (_.apply_* (_.closure (list) body)
(list))))
(def: (lux_compiler it)
diff --git a/lux-jvm/source/luxc/lang/translation/jvm/function.lux b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
index f93f4d035..49147b68b 100644
--- a/lux-jvm/source/luxc/lang/translation/jvm/function.lux
+++ b/lux-jvm/source/luxc/lang/translation/jvm/function.lux
@@ -207,7 +207,7 @@
@labels (list@each $.new_label (list.repeated num_partials []))
over_extent (|> (.int function_arity) (i.- (.int apply_arity)))
casesI (|> (list@composite @labels (list @default))
- (list.zipped/2 (enum.range n.enum 0 num_partials))
+ (list.zipped_2 (enum.range n.enum 0 num_partials))
(list@each (.function (_ [stage @label])
(let [load_partialsI (if (n.> 0 stage)
(|> (enum.range n.enum 0 (-- stage))
diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux
index 983f35ee0..fbe24bba8 100644
--- a/lux-lua/source/program.lux
+++ b/lux-lua/source/program.lux
@@ -288,7 +288,7 @@
(list $input (` (..read (~ $input))))))
list#conjoint))
- (def: (apply/* to_host self parameters abstraction)
+ (def: (apply_* to_host self parameters abstraction)
(-> (-> Any java/lang/Object) net/sandius/rembulan/runtime/LuaFunction (List java/lang/Object) Any Any)
(<| try.trusted
(do [! try.monad]
@@ -343,7 +343,7 @@
void
"throws" [net/sandius/rembulan/runtime/ResolvedControlThrowable]
(<| (..return %)
- (apply/* to_host
+ (apply_* to_host
(ffi.is net/sandius/rembulan/runtime/LuaFunction self)
(list (~~ (static.literals function.identity (..input/* <arity>))))
lux_function)))]
@@ -361,7 +361,7 @@
void
"throws" [net/sandius/rembulan/runtime/ResolvedControlThrowable]
(<| (..return %)
- (apply/* to_host
+ (apply_* to_host
(ffi.is net/sandius/rembulan/runtime/LuaFunction self)
(array.list {.#None} input/*)
lux_function)))
diff --git a/stdlib/source/documentation/lux/control/concatenative.lux b/stdlib/source/documentation/lux/control/concatenative.lux
index 93dd86efa..d56a9f513 100644
--- a/stdlib/source/documentation/lux/control/concatenative.lux
+++ b/stdlib/source/documentation/lux/control/concatenative.lux
@@ -44,7 +44,7 @@
(=> [Nat] [Nat])
dup
- (apply/2 n.*))])
+ (apply_2 n.*))])
(documentation: /.apply
"A generator for functions that turn arity N functions into arity N concatenative functions."
@@ -52,7 +52,7 @@
((apply 1) ++))])
(template [<arity>]
- [(with_expansions [<name> (template.symbol [/._] ["apply/" <arity>])
+ [(with_expansions [<name> (template.symbol [/._] ["apply_" <arity>])
<doc> (template.text ["Lift a function of arity " <arity>
" into a concatenative function of arity " <arity> "."])]
(documentation: <name>
@@ -158,7 +158,7 @@
(documentation: /.dip
"Executes a block on the stack, save for the topmost value.")
-(documentation: /.dip/2
+(documentation: /.dip_2
"Executes a block on the stack, save for the 2 topmost values.")
(documentation: /.do
@@ -211,14 +211,14 @@
..||>
..word:
..apply
- ..apply/1
- ..apply/2
- ..apply/3
- ..apply/4
- ..apply/5
- ..apply/6
- ..apply/7
- ..apply/8
+ ..apply_1
+ ..apply_2
+ ..apply_3
+ ..apply_4
+ ..apply_5
+ ..apply_6
+ ..apply_7
+ ..apply_8
..push
..drop
..nip
@@ -233,7 +233,7 @@
..call
..loop
..dip
- ..dip/2
+ ..dip_2
..do
..while
..compose
diff --git a/stdlib/source/documentation/lux/control/parser/binary.lux b/stdlib/source/documentation/lux/control/parser/binary.lux
index 798ac286c..0a163f2a8 100644
--- a/stdlib/source/documentation/lux/control/parser/binary.lux
+++ b/stdlib/source/documentation/lux/control/parser/binary.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux {"-" list}
- ["$" documentation {"+" documentation:}]
- [data
- [text {"+" \n}
- ["%" format {"+" format}]]]
- [macro
- ["[0]" template]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" list}
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text {"+" \n}
+ ["%" format {"+" format}]]]
+ [macro
+ ["[0]" template]]]]
+ [\\library
+ ["[0]" /]])
(documentation: /.Offset
"An offset for reading within binary data.")
@@ -46,30 +46,30 @@
[(documentation: <name>
(format "Parses a block of data prefixed with a size that is " (%.nat <size>) " bytes long."))]
- [08 /.binary/8]
- [16 /.binary/16]
- [32 /.binary/32]
- [64 /.binary/64]
+ [08 /.binary_8]
+ [16 /.binary_16]
+ [32 /.binary_32]
+ [64 /.binary_64]
)
(template [<size> <name>]
[(documentation: <name>
(format "Parses a block of (UTF-8 encoded) text prefixed with a size that is " (%.nat <size>) " bytes long."))]
- [08 /.utf8/8]
- [16 /.utf8/16]
- [32 /.utf8/32]
- [64 /.utf8/64]
+ [08 /.utf8_8]
+ [16 /.utf8_16]
+ [32 /.utf8_32]
+ [64 /.utf8_64]
)
(template [<size> <name>]
[(documentation: <name>
(format "Parses a sequence of values prefixed with a size that is " (%.nat <size>) " bytes long."))]
- [08 /.sequence/8]
- [16 /.sequence/16]
- [32 /.sequence/32]
- [64 /.sequence/64]
+ [08 /.sequence_8]
+ [16 /.sequence_16]
+ [32 /.sequence_32]
+ [64 /.sequence_64]
)
(documentation: /.list
@@ -95,32 +95,32 @@
..any
..segment
- ..binary/8
- ..binary/16
- ..binary/32
- ..binary/64
+ ..binary_8
+ ..binary_16
+ ..binary_32
+ ..binary_64
- ..utf8/8
- ..utf8/16
- ..utf8/32
- ..utf8/64
+ ..utf8_8
+ ..utf8_16
+ ..utf8_32
+ ..utf8_64
- ..sequence/8
- ..sequence/16
- ..sequence/32
- ..sequence/64
+ ..sequence_8
+ ..sequence_16
+ ..sequence_32
+ ..sequence_64
..list
..set
($.default /.binary_was_not_fully_read)
- ($.default /.size/8)
- ($.default /.size/16)
- ($.default /.size/32)
- ($.default /.size/64)
- ($.default /.bits/8)
- ($.default /.bits/16)
- ($.default /.bits/32)
- ($.default /.bits/64)
+ ($.default /.size_8)
+ ($.default /.size_16)
+ ($.default /.size_32)
+ ($.default /.size_64)
+ ($.default /.bits_8)
+ ($.default /.bits_16)
+ ($.default /.bits_32)
+ ($.default /.bits_64)
($.default /.nat)
($.default /.int)
($.default /.rev)
diff --git a/stdlib/source/documentation/lux/data/binary.lux b/stdlib/source/documentation/lux/data/binary.lux
index 2bb9dd97f..1bc5e4146 100644
--- a/stdlib/source/documentation/lux/data/binary.lux
+++ b/stdlib/source/documentation/lux/data/binary.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux "*"
- ["$" documentation {"+" documentation:}]
- [data
- [text {"+" \n}
- ["%" format {"+" format}]]]
- [macro
- ["[0]" template]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux "*"
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text {"+" \n}
+ ["%" format {"+" format}]]]
+ [macro
+ ["[0]" template]]]]
+ [\\library
+ ["[0]" /]])
(documentation: /.Binary
"A binary BLOB of data.")
@@ -21,37 +21,37 @@
""
[(aggregate f init binary)])
-(documentation: /.read/8!
+(documentation: /.read_8!
"Read 1 byte (8 bits) at the given index."
- [(read/8! index binary)])
+ [(read_8! index binary)])
-(documentation: /.read/16!
+(documentation: /.read_16!
"Read 2 bytes (16 bits) at the given index."
- [(read/16! index binary)])
+ [(read_16! index binary)])
-(documentation: /.read/32!
+(documentation: /.read_32!
"Read 4 bytes (32 bits) at the given index."
- [(read/32! index binary)])
+ [(read_32! index binary)])
-(documentation: /.read/64!
+(documentation: /.read_64!
"Read 8 bytes (64 bits) at the given index."
- [(read/64! index binary)])
+ [(read_64! index binary)])
-(documentation: /.write/8!
+(documentation: /.write_8!
"Write 1 byte (8 bits) at the given index."
- [(write/8! index value binary)])
+ [(write_8! index value binary)])
-(documentation: /.write/16!
+(documentation: /.write_16!
"Write 2 bytes (16 bits) at the given index."
- [(write/16! index value binary)])
+ [(write_16! index value binary)])
-(documentation: /.write/32!
+(documentation: /.write_32!
"Write 4 bytes (32 bits) at the given index."
- [(write/32! index value binary)])
+ [(write_32! index value binary)])
-(documentation: /.write/64!
+(documentation: /.write_64!
"Write 8 bytes (64 bits) at the given index."
- [(write/64! index value binary)])
+ [(write_64! index value binary)])
(documentation: /.copy
"Mutates the target binary BLOB by copying bytes from the source BLOB to it."
@@ -72,14 +72,14 @@
[..Binary
..empty
..aggregate
- ..read/8!
- ..read/16!
- ..read/32!
- ..read/64!
- ..write/8!
- ..write/16!
- ..write/32!
- ..write/64!
+ ..read_8!
+ ..read_16!
+ ..read_32!
+ ..read_64!
+ ..write_8!
+ ..write_16!
+ ..write_32!
+ ..write_64!
..copy
..slice
..after
diff --git a/stdlib/source/documentation/lux/data/collection/list.lux b/stdlib/source/documentation/lux/data/collection/list.lux
index 2aa968d1c..5497350e7 100644
--- a/stdlib/source/documentation/lux/data/collection/list.lux
+++ b/stdlib/source/documentation/lux/data/collection/list.lux
@@ -1,19 +1,19 @@
(.using
- [library
- [lux "*"
- ["$" documentation {"+" documentation:}]
- [control
- ["<>" parser
- ["<[0]>" code]]]
- [data
- ["[0]" text {"+" \n}
- ["%" format {"+" format}]]]
- [macro
- [syntax {"+" syntax:}]
- ["[0]" code]
- ["[0]" template]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux "*"
+ ["$" documentation {"+" documentation:}]
+ [control
+ ["<>" parser
+ ["<[0]>" code]]]
+ [data
+ ["[0]" text {"+" \n}
+ ["%" format {"+" format}]]]
+ [macro
+ [syntax {"+" syntax:}]
+ ["[0]" code]
+ ["[0]" template]]]]
+ [\\library
+ ["[0]" /]])
(documentation: /.mixes
""
@@ -105,16 +105,16 @@
(documentation: /.zipped
"Create list zippers with the specified number of input lists."
- [(def: zipped/2 (zipped 2))
- (def: zipped/3 (zipped 3))
- (zipped/3 xs ys zs)
+ [(def: zipped_2 (zipped 2))
+ (def: zipped_3 (zipped 3))
+ (zipped_3 xs ys zs)
((zipped 3) xs ys zs)])
(documentation: /.zipped_with
"Create list zippers with the specified number of input lists."
- [(def: zipped_with/2 (zipped_with 2))
- (def: zipped_with/3 (zipped_with 3))
- (zipped_with/2 + xs ys)
+ [(def: zipped_with_2 (zipped_with 2))
+ (def: zipped_with_3 (zipped_with 3))
+ (zipped_with_2 + xs ys)
((zipped_with 2) + xs ys)])
(documentation: /.last
@@ -194,10 +194,10 @@
($.default /.functor)
($.default /.apply)
($.default /.monad)
- ($.default /.zipped/2)
- ($.default /.zipped/3)
- ($.default /.zipped_with/2)
- ($.default /.zipped_with/3)
+ ($.default /.zipped_2)
+ ($.default /.zipped_3)
+ ($.default /.zipped_with_2)
+ ($.default /.zipped_with_3)
($.default /.first)
($.default /.after)
($.default /.while)
diff --git a/stdlib/source/documentation/lux/data/format/binary.lux b/stdlib/source/documentation/lux/data/format/binary.lux
index 4eb84ccd1..497de2dba 100644
--- a/stdlib/source/documentation/lux/data/format/binary.lux
+++ b/stdlib/source/documentation/lux/data/format/binary.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux {"-" nat int rev list type or and symbol}
- ["$" documentation {"+" documentation:}]
- [data
- [text {"+" \n}
- ["%" format {"+" format}]]]
- [macro
- ["[0]" template]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" nat int rev list type or and symbol}
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text {"+" \n}
+ ["%" format {"+" format}]]]
+ [macro
+ ["[0]" template]]]]
+ [\\library
+ ["[0]" /]])
(documentation: /.Mutation
"A mutation of binary data, tracking where in the data to transform.")
@@ -60,29 +60,29 @@
..rec
..segment
($.default /.monoid)
- ($.default /.bits/8)
- ($.default /.bits/16)
- ($.default /.bits/32)
- ($.default /.bits/64)
+ ($.default /.bits_8)
+ ($.default /.bits_16)
+ ($.default /.bits_32)
+ ($.default /.bits_64)
($.default /.any)
($.default /.bit)
($.default /.nat)
($.default /.int)
($.default /.rev)
($.default /.frac)
- ($.default /.binary/8)
- ($.default /.binary/16)
- ($.default /.binary/32)
- ($.default /.binary/64)
- ($.default /.utf8/8)
- ($.default /.utf8/16)
- ($.default /.utf8/32)
- ($.default /.utf8/64)
+ ($.default /.binary_8)
+ ($.default /.binary_16)
+ ($.default /.binary_32)
+ ($.default /.binary_64)
+ ($.default /.utf8_8)
+ ($.default /.utf8_16)
+ ($.default /.utf8_32)
+ ($.default /.utf8_64)
($.default /.text)
- ($.default /.sequence/8)
- ($.default /.sequence/16)
- ($.default /.sequence/32)
- ($.default /.sequence/64)
+ ($.default /.sequence_8)
+ ($.default /.sequence_16)
+ ($.default /.sequence_32)
+ ($.default /.sequence_64)
($.default /.maybe)
($.default /.list)
($.default /.set)
diff --git a/stdlib/source/documentation/lux/data/text.lux b/stdlib/source/documentation/lux/data/text.lux
index 7163b5416..94886667c 100644
--- a/stdlib/source/documentation/lux/data/text.lux
+++ b/stdlib/source/documentation/lux/data/text.lux
@@ -1,21 +1,21 @@
(.using
- [library
- [lux {"-" char}
- ["$" documentation {"+" documentation:}]
- [data
- [text
- ["%" format {"+" format}]]
- [collection
- ["[0]" list]]]]]
- ["[0]" / "_"
- ["[1][0]" buffer]
- ["[1][0]" encoding]
- ["[1][0]" escape]
- ["[1][0]" format]
- ["[1][0]" regex]
- ["[1][0]" unicode]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" char}
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text
+ ["%" format {"+" format}]]
+ [collection
+ ["[0]" list]]]]]
+ ["[0]" / "_"
+ ["[1][0]" buffer]
+ ["[1][0]" encoding]
+ ["[1][0]" escape]
+ ["[1][0]" format]
+ ["[1][0]" regex]
+ ["[1][0]" unicode]]
+ [\\library
+ ["[0]" /]])
(documentation: /.Char
"A character code number.")
@@ -91,9 +91,9 @@
""
[(all_split_by token sample)])
-(documentation: /.replaced/1
+(documentation: /.replaced_once
""
- [(replaced/1 pattern replacement template)])
+ [(replaced_once pattern replacement template)])
(documentation: /.replaced
""
@@ -130,7 +130,7 @@
..split_at
..split_by
..all_split_by
- ..replaced/1
+ ..replaced_once
..replaced
..interposed
..space?
diff --git a/stdlib/source/documentation/lux/data/text/format.lux b/stdlib/source/documentation/lux/data/text/format.lux
index 3ef040ea8..7cf561034 100644
--- a/stdlib/source/documentation/lux/data/text/format.lux
+++ b/stdlib/source/documentation/lux/data/text/format.lux
@@ -1,11 +1,11 @@
(.using
- [library
- [lux {"-" nat int rev type list symbol}
- ["$" documentation {"+" documentation:}]
- [macro
- ["[0]" template]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" nat int rev type list symbol}
+ ["$" documentation {"+" documentation:}]
+ [macro
+ ["[0]" template]]]]
+ [\\library
+ ["[0]" /]])
(documentation: (/.Format it)
"A way to produce readable text from values.")
@@ -45,22 +45,22 @@
($.default /.xml)
($.default /.json)
- ($.default /.nat/2)
- ($.default /.nat/8)
- ($.default /.nat/10)
- ($.default /.nat/16)
- ($.default /.int/2)
- ($.default /.int/8)
- ($.default /.int/10)
- ($.default /.int/16)
- ($.default /.rev/2)
- ($.default /.rev/8)
- ($.default /.rev/10)
- ($.default /.rev/16)
- ($.default /.frac/2)
- ($.default /.frac/8)
- ($.default /.frac/10)
- ($.default /.frac/16)
+ ($.default /.nat_2)
+ ($.default /.nat_8)
+ ($.default /.nat_10)
+ ($.default /.nat_16)
+ ($.default /.int_2)
+ ($.default /.int_8)
+ ($.default /.int_10)
+ ($.default /.int_16)
+ ($.default /.rev_2)
+ ($.default /.rev_8)
+ ($.default /.rev_10)
+ ($.default /.rev_16)
+ ($.default /.frac_2)
+ ($.default /.frac_8)
+ ($.default /.frac_10)
+ ($.default /.frac_16)
($.default /.mod)
($.default /.list)
diff --git a/stdlib/source/documentation/lux/math.lux b/stdlib/source/documentation/lux/math.lux
index 9d7ead48f..10bd8a1f3 100644
--- a/stdlib/source/documentation/lux/math.lux
+++ b/stdlib/source/documentation/lux/math.lux
@@ -1,21 +1,21 @@
(.using
- [library
- [lux {"-" char}
- ["$" documentation {"+" documentation:}]
- [data
- [text
- ["%" format {"+" format}]]
- [collection
- ["[0]" list]]]]]
- ["[0]" / "_"
- ["[1][0]" infix]
- ["[1][0]" modulus]
- ["[1][0]" modular]
- ["[1][0]" number]
- ["[1][0]" logic]
- ["[1][0]" random]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" char}
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text
+ ["%" format {"+" format}]]
+ [collection
+ ["[0]" list]]]]]
+ ["[0]" / "_"
+ ["[1][0]" infix]
+ ["[1][0]" modulus]
+ ["[1][0]" modular]
+ ["[1][0]" number]
+ ["[1][0]" logic]
+ ["[1][0]" random]]
+ [\\library
+ ["[0]" /]])
(documentation: /.e
"The base of the natural logarithm.")
@@ -30,9 +30,9 @@
""
[(pow param subject)])
-(documentation: /.atan/2
+(documentation: /.atan_2
""
- [(atan/2 x y)])
+ [(atan_2 x y)])
(documentation: /.log_by
""
@@ -46,7 +46,7 @@
..pi
..tau
..pow
- ..atan/2
+ ..atan_2
..log_by
($.default /.cos)
($.default /.sin)
@@ -58,8 +58,8 @@
($.default /.log)
($.default /.ceil)
($.default /.floor)
- ($.default /.root/2)
- ($.default /.root/3)
+ ($.default /.root_2)
+ ($.default /.root_3)
($.default /.round)
($.default /.factorial)
($.default /.hypotenuse)
diff --git a/stdlib/source/documentation/lux/math/number/complex.lux b/stdlib/source/documentation/lux/math/number/complex.lux
index b3d2799b6..fd912cd57 100644
--- a/stdlib/source/documentation/lux/math/number/complex.lux
+++ b/stdlib/source/documentation/lux/math/number/complex.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux {"-" private}
- ["$" documentation {"+" documentation:}]
- [data
- ["[0]" text {"+" \n}
- ["%" format {"+" format}]]]
- [macro
- ["[0]" template]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" private}
+ ["$" documentation {"+" documentation:}]
+ [data
+ ["[0]" text {"+" \n}
+ ["%" format {"+" format}]]]
+ [macro
+ ["[0]" template]]]]
+ [\\library
+ ["[0]" /]])
(documentation: /.Complex
"A complex number.")
@@ -53,7 +53,7 @@
($.default /.log)
($.default /.pow)
($.default /.pow')
- ($.default /.root/2)
+ ($.default /.root_2)
($.default /.reciprocal)
($.default /.acos)
($.default /.asin)
diff --git a/stdlib/source/documentation/lux/target/js.lux b/stdlib/source/documentation/lux/target/js.lux
index 4a87b312a..5f1a28577 100644
--- a/stdlib/source/documentation/lux/target/js.lux
+++ b/stdlib/source/documentation/lux/target/js.lux
@@ -34,7 +34,7 @@
($.default /.var)
($.default /.at)
($.default /.the)
- ($.default /.apply/*)
+ ($.default /.apply_*)
($.default /.do)
($.default /.object)
($.default /.,)
@@ -94,8 +94,8 @@
($.default /.comment)
($.default /.switch)
($.default /.cond)
- ($.default /.apply/1)
+ ($.default /.apply_1)
($.default /.not_a_number?)
- ($.default /.apply/2)
- ($.default /.apply/3)]
+ ($.default /.apply_2)
+ ($.default /.apply_3)]
[]))
diff --git a/stdlib/source/documentation/lux/target/lua.lux b/stdlib/source/documentation/lux/target/lua.lux
index c9926ba4e..d0ce0ef3e 100644
--- a/stdlib/source/documentation/lux/target/lua.lux
+++ b/stdlib/source/documentation/lux/target/lua.lux
@@ -38,7 +38,7 @@
($.default /.item)
($.default /.the)
($.default /.length)
- ($.default /.apply/*)
+ ($.default /.apply_*)
($.default /.do)
($.default /.=)
($.default /.<)
@@ -84,11 +84,11 @@
($.default /.set_label)
($.default /.go_to)
($.default /.cond)
- ($.default /.apply/1)
- ($.default /.apply/2)
- ($.default /.apply/3)
- ($.default /.apply/4)
- ($.default /.apply/5)
+ ($.default /.apply_1)
+ ($.default /.apply_2)
+ ($.default /.apply_3)
+ ($.default /.apply_4)
+ ($.default /.apply_5)
($.default /.error/1)
($.default /.print/1)
($.default /.require/1)
diff --git a/stdlib/source/documentation/lux/target/python.lux b/stdlib/source/documentation/lux/target/python.lux
index 54bd826f4..eeba814ae 100644
--- a/stdlib/source/documentation/lux/target/python.lux
+++ b/stdlib/source/documentation/lux/target/python.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux {"-" char}
- ["$" documentation {"+" documentation:}]
- [data
- [text {"+" \n}
- ["%" format {"+" format}]]
- [collection
- ["[0]" list]]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" char}
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text {"+" \n}
+ ["%" format {"+" format}]]
+ [collection
+ ["[0]" list]]]]]
+ [\\library
+ ["[0]" /]])
(.def: .public documentation
(.List $.Module)
@@ -49,7 +49,7 @@
($.default /.slice)
($.default /.slice_from)
($.default /.dict)
- ($.default /.apply/*)
+ ($.default /.apply_*)
($.default /.apply_poly)
($.default /.apply_keyword)
($.default /.the)
@@ -102,9 +102,9 @@
($.default /.import)
($.default /.comment)
($.default /.cond)
- ($.default /.apply/1)
- ($.default /.apply/2)
- ($.default /.apply/3)
+ ($.default /.apply_1)
+ ($.default /.apply_2)
+ ($.default /.apply_3)
($.default /.str/1)
($.default /.ord/1)
($.default /.float/1)
diff --git a/stdlib/source/documentation/lux/target/ruby.lux b/stdlib/source/documentation/lux/target/ruby.lux
index 49f3f0910..7d7d5458f 100644
--- a/stdlib/source/documentation/lux/target/ruby.lux
+++ b/stdlib/source/documentation/lux/target/ruby.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux {"-" char}
- ["$" documentation {"+" documentation:}]
- [data
- [text {"+" \n}
- ["%" format {"+" format}]]
- [collection
- ["[0]" list]]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux {"-" char}
+ ["$" documentation {"+" documentation:}]
+ [data
+ [text {"+" \n}
+ ["%" format {"+" format}]]
+ [collection
+ ["[0]" list]]]]]
+ [\\library
+ ["[0]" /]])
(.def: .public documentation
(.List $.Module)
@@ -61,7 +61,7 @@
($.default /.array_range)
($.default /.array)
($.default /.hash)
- ($.default /.apply/*)
+ ($.default /.apply_*)
($.default /.apply_lambda/*)
($.default /.the)
($.default /.item)
@@ -106,9 +106,9 @@
($.default /.comment)
($.default /.do)
($.default /.cond)
- ($.default /.apply/1)
- ($.default /.apply/2)
- ($.default /.apply/3)
+ ($.default /.apply_1)
+ ($.default /.apply_2)
+ ($.default /.apply_3)
($.default /.print/1)
($.default /.require/1)
($.default /.print/2)
diff --git a/stdlib/source/documentation/lux/world/output/video/resolution.lux b/stdlib/source/documentation/lux/world/output/video/resolution.lux
index 0a75bb938..27a42050c 100644
--- a/stdlib/source/documentation/lux/world/output/video/resolution.lux
+++ b/stdlib/source/documentation/lux/world/output/video/resolution.lux
@@ -19,7 +19,6 @@
(template [<name>]
[(documentation: <name>
(let [name (|> (template.text [<name>])
- (text.replaced "/" " ")
(text.replaced "_" " ")
text.upper_cased)]
(format name " resolution: "
@@ -31,9 +30,9 @@
[/.wsvga]
[/.xga]
[/.xga+]
- [/.wxga/16:9]
- [/.wxga/5:3]
- [/.wxga/16:10]
+ [/.wxga_16:9]
+ [/.wxga_5:3]
+ [/.wxga_16:10]
[/.sxga]
[/.wxga+]
[/.hd+]
@@ -53,9 +52,9 @@
..wsvga
..xga
..xga+
- ..wxga/16:9
- ..wxga/5:3
- ..wxga/16:10
+ ..wxga_16:9
+ ..wxga_5:3
+ ..wxga_16:10
..sxga
..wxga+
..hd+
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux
index da0e84a92..bf523ec7c 100644
--- a/stdlib/source/library/lux.lux
+++ b/stdlib/source/library/lux.lux
@@ -3871,14 +3871,14 @@
temp))
)))
-(def: (zipped/2 xs ys)
+(def: (zipped_2 xs ys)
(All (_ a b)
(-> (List a) (List b) (List [a b])))
(case xs
{#Item x xs'}
(case ys
{#Item y ys'}
- (list& [x y] (zipped/2 xs' ys'))
+ (list& [x y] (zipped_2 xs' ys'))
_
(list))
@@ -3934,7 +3934,7 @@
{#None}
(in enhanced_target))))
target
- (zipped/2 locals members))]
+ (zipped_2 locals members))]
(in (` ({(~ pattern) (~ enhanced_target)} (~ (symbol$ source)))))))))
name tags&members body)]
(in (list full_body)))))
@@ -3986,7 +3986,7 @@
g!output (..generated_symbol "")]
(case (interface_methods type)
{#Some members}
- (let [pattern (|> (zipped/2 tags (enumeration members))
+ (let [pattern (|> (zipped_2 tags (enumeration members))
(list#each (is (-> [Symbol [Nat Type]] (List Code))
(function (_ [[r_module r_name] [r_idx r_type]])
(list (symbol$ [r_module r_name])
@@ -4037,7 +4037,7 @@
(is (-> [Nat Symbol Type] (Meta (List Code)))
(function (_ [sub_tag_index sname stype])
(open_declaration alias tags' sub_tag_index sname source+ stype)))
- (enumeration (zipped/2 tags' members')))]
+ (enumeration (zipped_2 tags' members')))]
(meta#in (list#conjoint decls')))
_
@@ -4060,7 +4060,7 @@
[decls' (monad#each meta_monad (is (-> [Nat Symbol Type] (Meta (List Code)))
(function (_ [tag_index sname stype])
(open_declaration alias tags tag_index sname source stype)))
- (enumeration (zipped/2 tags members)))]
+ (enumeration (zipped_2 tags members)))]
(meta#in (list#conjoint decls')))
_
@@ -4226,7 +4226,7 @@
(do meta_monad
[g!slot (..generated_symbol "")]
(meta#in [r_slot_name r_idx g!slot]))))
- (zipped/2 tags (enumeration members)))]
+ (zipped_2 tags (enumeration members)))]
(let [pattern (|> pattern'
(list#each (is (-> [Symbol Nat Code] (List Code))
(function (_ [r_slot_name r_idx r_var])
@@ -4259,7 +4259,7 @@
(is (-> Code (Meta Code))
(function (_ _) (..generated_symbol "temp")))
slots)
- .let [pairs (zipped/2 slots bindings)
+ .let [pairs (zipped_2 slots bindings)
update_expr (list#mix (is (-> [Code Code] Code Code)
(function (_ [s b] v)
(` (..has (~ s) (~ v) (~ b)))))
@@ -4309,7 +4309,7 @@
(do meta_monad
[g!slot (..generated_symbol "")]
(meta#in [r_slot_name r_idx g!slot]))))
- (zipped/2 tags (enumeration members)))]
+ (zipped_2 tags (enumeration members)))]
(let [pattern (|> pattern'
(list#each (is (-> [Symbol Nat Code] (List Code))
(function (_ [r_slot_name r_idx r_var])
diff --git a/stdlib/source/library/lux/control/concatenative.lux b/stdlib/source/library/lux/control/concatenative.lux
index 0f01c8d9f..3fb95ed21 100644
--- a/stdlib/source/library/lux/control/concatenative.lux
+++ b/stdlib/source/library/lux/control/concatenative.lux
@@ -141,7 +141,7 @@
[(~ g!stack) ((~ g!func) (~+ g!inputs))])))))))))
(template [<arity>]
- [(`` (def: .public (~~ (template.symbol ["apply/" <arity>]))
+ [(`` (def: .public (~~ (template.symbol ["apply_" <arity>]))
(..apply <arity>)))]
[1] [2] [3] [4]
@@ -283,7 +283,7 @@
(function (_ [[stack a] quote])
[(quote stack) a]))
-(def: .public dip/2
+(def: .public dip_2
(All (_ ,,, a b)
(=> ,,, [a b (=> ,,, ,,,)]
,,, [a b]))
diff --git a/stdlib/source/library/lux/control/function/mutual.lux b/stdlib/source/library/lux/control/function/mutual.lux
index 16506a4e3..69f1bdf40 100644
--- a/stdlib/source/library/lux/control/function/mutual.lux
+++ b/stdlib/source/library/lux/control/function/mutual.lux
@@ -72,7 +72,7 @@
hidden_names (monad.each ! (//.constant (macro.symbol "mutual_function#"))
functions)
.let [definitions (list#each (..mutual_definition hidden_names g!context)
- (list.zipped/2 hidden_names
+ (list.zipped_2 hidden_names
functions))
context_types (list#each (function (_ mutual)
(` (-> (~ g!context) (~ (the #type mutual)))))
@@ -82,7 +82,7 @@
g!pop (local.push (list#each (function (_ [g!name mutual])
[[here_name (the [#declaration declaration.#name] mutual)]
(..macro g!context g!name)])
- (list.zipped/2 hidden_names
+ (list.zipped_2 hidden_names
functions)))]
(in (list (` (.let [(~ g!context) (is (Rec (~ g!context)
[(~+ context_types)])
@@ -124,7 +124,7 @@
hidden_names (monad.each ! (//.constant (macro.symbol "mutual_function#"))
functions)
.let [definitions (list#each (..mutual_definition hidden_names g!context)
- (list.zipped/2 hidden_names
+ (list.zipped_2 hidden_names
(list#each (the #mutual) functions)))
context_types (list#each (function (_ mutual)
(` (-> (~ g!context) (~ (the [#mutual #type] mutual)))))
@@ -134,7 +134,7 @@
g!pop (local.push (list#each (function (_ [g!name mutual])
[[here_name (the [#mutual #declaration declaration.#name] mutual)]
(..macro g!context g!name)])
- (list.zipped/2 hidden_names
+ (list.zipped_2 hidden_names
functions)))]
(in (list& (` (.def: (~ g!context)
[(~+ (list#each (the [#mutual #type]) functions))]
diff --git a/stdlib/source/library/lux/control/parser/binary.lux b/stdlib/source/library/lux/control/parser/binary.lux
index 0fc0350d2..a1c565360 100644
--- a/stdlib/source/library/lux/control/parser/binary.lux
+++ b/stdlib/source/library/lux/control/parser/binary.lux
@@ -69,10 +69,10 @@
(type: .public Size
Nat)
-(def: .public size/8 Size 1)
-(def: .public size/16 Size (n.* 2 size/8))
-(def: .public size/32 Size (n.* 2 size/16))
-(def: .public size/64 Size (n.* 2 size/32))
+(def: .public size_8 Size 1)
+(def: .public size_16 Size (n.* 2 size_8))
+(def: .public size_32 Size (n.* 2 size_16))
+(def: .public size_64 Size (n.* 2 size_32))
(template [<name> <size> <read>]
[(def: .public <name>
@@ -85,14 +85,14 @@
{try.#Failure error}
{try.#Failure error})))]
- [bits/8 ..size/8 /.bytes/1]
- [bits/16 ..size/16 /.bytes/2]
- [bits/32 ..size/32 /.bytes/4]
- [bits/64 ..size/64 /.bytes/8]
+ [bits_8 ..size_8 /.bits_8]
+ [bits_16 ..size_16 /.bits_16]
+ [bits_32 ..size_32 /.bits_32]
+ [bits_64 ..size_64 /.bits_64]
)
(template [<name> <type>]
- [(def: .public <name> (Parser <type>) ..bits/64)]
+ [(def: .public <name> (Parser <type>) ..bits_64)]
[nat Nat]
[int Int]
@@ -101,7 +101,7 @@
(def: .public frac
(Parser Frac)
- (//#each frac.of_bits ..bits/64))
+ (//#each frac.of_bits ..bits_64))
(exception: .public (invalid_tag [range Nat
byte Nat])
@@ -112,7 +112,7 @@
(template: (!variant <case>+)
[(do [! //.monad]
[flag (is (Parser Nat)
- ..bits/8)]
+ ..bits_8)]
(with_expansions [<case>+' (template.spliced <case>+)]
(case flag
(^.template [<number> <tag> <parser>]
@@ -145,7 +145,7 @@
(Parser Bit)
(do //.monad
[value (is (Parser Nat)
- ..bits/8)]
+ ..bits_8)]
(case value
0 (in #0)
1 (in #1)
@@ -167,10 +167,10 @@
[size (//#each (|>> .nat) <bits>)]
(..segment size))))]
- [08 binary/8 ..bits/8]
- [16 binary/16 ..bits/16]
- [32 binary/32 ..bits/32]
- [64 binary/64 ..bits/64]
+ [08 binary_8 ..bits_8]
+ [16 binary_16 ..bits_16]
+ [32 binary_32 ..bits_32]
+ [64 binary_64 ..bits_64]
)
(template [<size> <name> <binary>]
@@ -180,13 +180,13 @@
[utf8 <binary>]
(//.lifted (# utf8.codec decoded utf8)))))]
- [08 utf8/8 ..binary/8]
- [16 utf8/16 ..binary/16]
- [32 utf8/32 ..binary/32]
- [64 utf8/64 ..binary/64]
+ [08 utf8_8 ..binary_8]
+ [16 utf8_16 ..binary_16]
+ [32 utf8_32 ..binary_32]
+ [64 utf8_64 ..binary_64]
)
-(def: .public text ..utf8/64)
+(def: .public text ..utf8_64)
(template [<size> <name> <bits>]
[(def: .public (<name> valueP)
@@ -208,10 +208,10 @@
(sequence.suffix value output)))
(//#in output)))))]
- [08 sequence/8 ..bits/8]
- [16 sequence/16 ..bits/16]
- [32 sequence/32 ..bits/32]
- [64 sequence/64 ..bits/64]
+ [08 sequence_8 ..bits_8]
+ [16 sequence_16 ..bits_16]
+ [32 sequence_32 ..bits_32]
+ [64 sequence_64 ..bits_64]
)
(def: .public maybe
diff --git a/stdlib/source/library/lux/data/binary.lux b/stdlib/source/library/lux/data/binary.lux
index c65ea01a7..6615131c5 100644
--- a/stdlib/source/library/lux/data/binary.lux
+++ b/stdlib/source/library/lux/data/binary.lux
@@ -37,7 +37,7 @@
(loop (again [index 0
output init])
(if (n.< size index)
- (again (++ index) ($ (/.bytes/1 index it) output))
+ (again (++ index) ($ (/.bits_8 index it) output))
output))))
(exception: .public (index_out_of_bounds [size Nat
@@ -53,10 +53,10 @@
{try.#Success (<unsafe> index it)}
(exception.except ..index_out_of_bounds [(/.size it) index])))]
- [bytes/1 /.bytes/1 (|>)]
- [bytes/2 /.bytes/2 (n.+ 1)]
- [bytes/4 /.bytes/4 (n.+ 3)]
- [bytes/8 /.bytes/8 (n.+ 7)]
+ [bits_8 /.bits_8 (|>)]
+ [bits_16 /.bits_16 (n.+ 1)]
+ [bits_32 /.bits_32 (n.+ 3)]
+ [bits_64 /.bits_64 (n.+ 7)]
)
(template [<safe> <unsafe> <shift>]
@@ -66,10 +66,10 @@
{try.#Success (<unsafe> index value it)}
(exception.except ..index_out_of_bounds [(/.size it) index])))]
- [has/1! /.has/1! (|>)]
- [has/2! /.has/2! (n.+ 1)]
- [has/4! /.has/4! (n.+ 3)]
- [has/8! /.has/8! (n.+ 7)]
+ [has_8! /.has_8! (|>)]
+ [has_16! /.has_16! (n.+ 1)]
+ [has_32! /.has_32! (n.+ 3)]
+ [has_64! /.has_64! (n.+ 7)]
)
(implementation: .public equivalence
diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux
index 19d15e35e..48b6e45a1 100644
--- a/stdlib/source/library/lux/data/collection/list.lux
+++ b/stdlib/source/library/lux/data/collection/list.lux
@@ -491,8 +491,8 @@
_
{.#Left "Wrong syntax for zipped"}))
-(def: .public zipped/2 (zipped 2))
-(def: .public zipped/3 (zipped 3))
+(def: .public zipped_2 (zipped 2))
+(def: .public zipped_3 (zipped 3))
(macro: .public (zipped_with tokens state)
(case tokens
@@ -534,8 +534,8 @@
_
{.#Left "Wrong syntax for zipped_with"}))
-(def: .public zipped_with/2 (zipped_with 2))
-(def: .public zipped_with/3 (zipped_with 3))
+(def: .public zipped_with_2 (zipped_with 2))
+(def: .public zipped_with_3 (zipped_with 3))
(def: .public (last xs)
(All (_ a) (-> (List a) (Maybe a)))
diff --git a/stdlib/source/library/lux/data/format/binary.lux b/stdlib/source/library/lux/data/format/binary.lux
index 1d99204b6..3c43cea09 100644
--- a/stdlib/source/library/lux/data/format/binary.lux
+++ b/stdlib/source/library/lux/data/format/binary.lux
@@ -76,10 +76,10 @@
(<write> offset value)
try.trusted)])]))]
- [bits/8 /.size/8 binary.has/1!]
- [bits/16 /.size/16 binary.has/2!]
- [bits/32 /.size/32 binary.has/4!]
- [bits/64 /.size/64 binary.has/8!]
+ [bits_8 /.size_8 binary.has_8!]
+ [bits_16 /.size_16 binary.has_16!]
+ [bits_32 /.size_32 binary.has_32!]
+ [bits_64 /.size_64 binary.has_64!]
)
(def: .public (or left right)
@@ -92,7 +92,7 @@
[(.++ caseS)
(function (_ [offset binary])
(|> binary
- (binary.has/1! offset <number>)
+ (binary.has_8! offset <number>)
try.trusted
[(.++ offset)]
caseT))])])
@@ -116,10 +116,10 @@
(def: .public bit
(Writer Bit)
- (|>> (pipe.case #0 0 #1 1) ..bits/8))
+ (|>> (pipe.case #0 0 #1 1) ..bits_8))
(template [<name> <type>]
- [(def: .public <name> (Writer <type>) ..bits/64)]
+ [(def: .public <name> (Writer <type>) ..bits_64)]
[nat Nat]
[int Int]
@@ -128,7 +128,7 @@
(def: .public frac
(Writer Frac)
- (|>> frac.bits ..bits/64))
+ (|>> frac.bits ..bits_64))
(def: .public (segment size)
(-> Nat (Writer Binary))
@@ -158,10 +158,10 @@
[_ (<write> offset size binary)]
(binary.copy! size 0 value (n.+ <size> offset) binary)))])]))))]
- [binary/8 ..bits/8 /.size/8 binary.has/1!]
- [binary/16 ..bits/16 /.size/16 binary.has/2!]
- [binary/32 ..bits/32 /.size/32 binary.has/4!]
- [binary/64 ..bits/64 /.size/64 binary.has/8!]
+ [binary_8 ..bits_8 /.size_8 binary.has_8!]
+ [binary_16 ..bits_16 /.size_16 binary.has_16!]
+ [binary_32 ..bits_32 /.size_32 binary.has_32!]
+ [binary_64 ..bits_64 /.size_64 binary.has_64!]
)
(template [<name> <binary>]
@@ -169,13 +169,13 @@
(Writer Text)
(|>> (# utf8.codec encoded) <binary>))]
- [utf8/8 ..binary/8]
- [utf8/16 ..binary/16]
- [utf8/32 ..binary/32]
- [utf8/64 ..binary/64]
+ [utf8_8 ..binary_8]
+ [utf8_16 ..binary_16]
+ [utf8_32 ..binary_32]
+ [utf8_64 ..binary_64]
)
-(def: .public text ..utf8/64)
+(def: .public text ..utf8_64)
(template [<name> <size> <write>]
[(def: .public (<name> valueW)
@@ -201,10 +201,10 @@
[_ (<write> offset capped_count binary)]
(in (mutation [(n.+ <size> offset) binary])))))])))]
- [sequence/8 /.size/8 binary.has/1!]
- [sequence/16 /.size/16 binary.has/2!]
- [sequence/32 /.size/32 binary.has/4!]
- [sequence/64 /.size/64 binary.has/8!]
+ [sequence_8 /.size_8 binary.has_8!]
+ [sequence_16 /.size_16 binary.has_16!]
+ [sequence_32 /.size_32 binary.has_32!]
+ [sequence_64 /.size_64 binary.has_64!]
)
(def: .public maybe
@@ -240,7 +240,7 @@
[(.++ caseS)
(function (_ [offset binary])
(|> binary
- (binary.has/1! offset <number>)
+ (binary.has_8! offset <number>)
try.trusted
[(.++ offset)]
caseT))])])
@@ -275,7 +275,7 @@
[(.++ caseS)
(function (_ [offset binary])
(|> binary
- (binary.has/1! offset <number>)
+ (binary.has_8! offset <number>)
try.trusted
[(.++ offset)]
caseT))])])
diff --git a/stdlib/source/library/lux/data/format/css/class.lux b/stdlib/source/library/lux/data/format/css/class.lux
index 6d056d1ac..61e71e094 100644
--- a/stdlib/source/library/lux/data/format/css/class.lux
+++ b/stdlib/source/library/lux/data/format/css/class.lux
@@ -28,6 +28,6 @@
(do meta.monad
[module meta.current_module_name
class meta.seed]
- (in (list (` (..custom (~ (code.text (format "c" (%.nat/16 class)
- "_" (%.nat/16 (text#hash module)))))))))))
+ (in (list (` (..custom (~ (code.text (format "c" (%.nat_16 class)
+ "_" (%.nat_16 (text#hash module)))))))))))
)
diff --git a/stdlib/source/library/lux/data/format/css/id.lux b/stdlib/source/library/lux/data/format/css/id.lux
index 1ace95687..c2f821ccb 100644
--- a/stdlib/source/library/lux/data/format/css/id.lux
+++ b/stdlib/source/library/lux/data/format/css/id.lux
@@ -28,6 +28,6 @@
(do meta.monad
[module meta.current_module_name
id meta.seed]
- (in (list (` (..custom (~ (code.text (format "i" (%.nat/16 id)
- "_" (%.nat/16 (text#hash module)))))))))))
+ (in (list (` (..custom (~ (code.text (format "i" (%.nat_16 id)
+ "_" (%.nat_16 (text#hash module)))))))))))
)
diff --git a/stdlib/source/library/lux/data/format/tar.lux b/stdlib/source/library/lux/data/format/tar.lux
index 2f0a2b38a..afea5a3dd 100644
--- a/stdlib/source/library/lux/data/format/tar.lux
+++ b/stdlib/source/library/lux/data/format/tar.lux
@@ -121,8 +121,8 @@
(def: small_suffix
(Parser Any)
(do <>.monad
- [pre_end <binary>.bits/8
- end <binary>.bits/8
+ [pre_end <binary>.bits_8
+ end <binary>.bits_8
_ (let [expected (`` (char (~~ (static ..blank))))]
(<>.assertion (exception.error ..wrong_character [expected pre_end])
(n.= expected pre_end)))
@@ -147,7 +147,7 @@
(do <>.monad
[digits (<binary>.segment ..big_size)
digits (<>.lifted (# utf8.codec decoded digits))
- end <binary>.bits/8
+ end <binary>.bits_8
_ (let [expected (`` (char (~~ (static ..blank))))]
(<>.assertion (exception.error ..wrong_character [expected end])
(n.= expected end)))]
@@ -237,7 +237,7 @@
(case end
0 {try.#Success (# utf8.codec encoded "")}
_ (do try.monad
- [last_char (binary.bytes/1 end string)]
+ [last_char (binary.bits_8 end string)]
(`` (case (.nat last_char)
(pattern (char (~~ (static ..null))))
(again (-- end))
@@ -283,7 +283,7 @@
(Parser <type>)
(do <>.monad
[string (<binary>.segment <size>)
- end <binary>.bits/8
+ end <binary>.bits_8
.let [expected (`` (char (~~ (static ..null))))]
_ (<>.assertion (exception.error ..wrong_character [expected end])
(n.= expected end))]
@@ -326,7 +326,7 @@
(Parser Magic)
(do <>.monad
[string (<binary>.segment ..magic_size)
- end <binary>.bits/8
+ end <binary>.bits_8
.let [expected (`` (char (~~ (static ..null))))]
_ (<>.assertion (exception.error ..wrong_character [expected end])
(n.= expected end))]
@@ -401,7 +401,7 @@
(def: link_flag_writer
(Writer Link_Flag)
(|>> representation
- format.bits/8))
+ format.bits_8))
(with_expansions [<options> (these [0 old_normal]
[(char "0") normal]
@@ -427,7 +427,7 @@
(def: link_flag_parser
(Parser Link_Flag)
(do <>.monad
- [it <binary>.bits/8]
+ [it <binary>.bits_8]
(case (.nat it)
(^.template [<value> <link_flag>]
[(pattern <value>)
diff --git a/stdlib/source/library/lux/data/format/xml.lux b/stdlib/source/library/lux/data/format/xml.lux
index 81fee7699..30e75d6e6 100644
--- a/stdlib/source/library/lux/data/format/xml.lux
+++ b/stdlib/source/library/lux/data/format/xml.lux
@@ -292,7 +292,7 @@
(# (dictionary.equivalence text.equivalence) = reference/attrs sample/attrs)
(n.= (list.size reference/children)
(list.size sample/children))
- (|> (list.zipped/2 reference/children sample/children)
+ (|> (list.zipped_2 reference/children sample/children)
(list.every? (product.uncurried =))))
_
diff --git a/stdlib/source/library/lux/data/text.lux b/stdlib/source/library/lux/data/text.lux
index e52ca50c0..e5b2ec3ed 100644
--- a/stdlib/source/library/lux/data/text.lux
+++ b/stdlib/source/library/lux/data/text.lux
@@ -177,7 +177,7 @@
{.#Item input}
list.reversed))))
-(def: .public (replaced/1 pattern replacement template)
+(def: .public (replaced_once pattern replacement template)
(-> Text Text Text Text)
(<| (maybe.else template)
(do maybe.monad
diff --git a/stdlib/source/library/lux/data/text/format.lux b/stdlib/source/library/lux/data/text/format.lux
index 8160c9851..ee3f8ddc5 100644
--- a/stdlib/source/library/lux/data/text/format.lux
+++ b/stdlib/source/library/lux/data/text/format.lux
@@ -1,43 +1,43 @@
(.using
- [library
- [lux {"-" list nat int rev type symbol}
- [abstract
- [monad {"+" do}]
- [functor
- ["[0]" contravariant]]]
- [control
- ["<>" parser
- ["<[0]>" code {"+" Parser}]]]
- [data
- ["[0]" bit]
- ["[0]" text]
- [format
- ["[0]" xml]
- ["[0]" json]]
- [collection
- ["[0]" list ("[1]#[0]" monad)]]]
- ["[0]" time
- ["[0]" instant]
- ["[0]" duration]
- ["[0]" date]
- ["[0]" day]
- ["[0]" month]]
- [math
- ["[0]" modular]
- [number
- ["[0]" nat]
- ["[0]" int]
- ["[0]" rev]
- ["[0]" frac]
- ["[0]" ratio]]]
- [macro
- [syntax {"+" syntax:}]
- ["[0]" code]
- ["[0]" template]]
- [meta
- ["[0]" location]
- ["[0]" symbol]]
- ["[0]" type]]])
+ [library
+ [lux {"-" list nat int rev type symbol}
+ [abstract
+ [monad {"+" do}]
+ [functor
+ ["[0]" contravariant]]]
+ [control
+ ["<>" parser
+ ["<[0]>" code {"+" Parser}]]]
+ [data
+ ["[0]" bit]
+ ["[0]" text]
+ [format
+ ["[0]" xml]
+ ["[0]" json]]
+ [collection
+ ["[0]" list ("[1]#[0]" monad)]]]
+ ["[0]" time
+ ["[0]" instant]
+ ["[0]" duration]
+ ["[0]" date]
+ ["[0]" day]
+ ["[0]" month]]
+ [math
+ ["[0]" modular]
+ [number
+ ["[0]" nat]
+ ["[0]" int]
+ ["[0]" rev]
+ ["[0]" frac]
+ ["[0]" ratio]]]
+ [macro
+ [syntax {"+" syntax:}]
+ ["[0]" code]
+ ["[0]" template]]
+ [meta
+ ["[0]" location]
+ ["[0]" symbol]]
+ ["[0]" type]]])
(type: .public (Format a)
(-> a Text))
@@ -89,25 +89,25 @@
(~~ (template.spliced <format>,<codec>))))]
[Nat
- [[nat/2 nat.binary]
- [nat/8 nat.octal]
- [nat/10 nat.decimal]
- [nat/16 nat.hex]]]
+ [[nat_2 nat.binary]
+ [nat_8 nat.octal]
+ [nat_10 nat.decimal]
+ [nat_16 nat.hex]]]
[Int
- [[int/2 int.binary]
- [int/8 int.octal]
- [int/10 int.decimal]
- [int/16 int.hex]]]
+ [[int_2 int.binary]
+ [int_8 int.octal]
+ [int_10 int.decimal]
+ [int_16 int.hex]]]
[Rev
- [[rev/2 rev.binary]
- [rev/8 rev.octal]
- [rev/10 rev.decimal]
- [rev/16 rev.hex]]]
+ [[rev_2 rev.binary]
+ [rev_8 rev.octal]
+ [rev_10 rev.decimal]
+ [rev_16 rev.hex]]]
[Frac
- [[frac/2 frac.binary]
- [frac/8 frac.octal]
- [frac/10 frac.decimal]
- [frac/16 frac.hex]]]
+ [[frac_2 frac.binary]
+ [frac_8 frac.octal]
+ [frac_10 frac.decimal]
+ [frac_16 frac.hex]]]
)
(def: .public (mod modular)
diff --git a/stdlib/source/library/lux/documentation.lux b/stdlib/source/library/lux/documentation.lux
index 8a78ca8e6..a0aa01e82 100644
--- a/stdlib/source/library/lux/documentation.lux
+++ b/stdlib/source/library/lux/documentation.lux
@@ -341,7 +341,7 @@
_
(|> members
- (list.zipped/2 tags)
+ (list.zipped_2 tags)
(list#each (function (_ [t_name type])
(case type
{.#Product _}
@@ -365,7 +365,7 @@
_
(|> members
- (list.zipped/2 tags)
+ (list.zipped_2 tags)
(list#each (function (_ [t_name type])
(format t_name " " (type_definition' false level arity type_function_info {.#None} module type))))
(text.interposed (format \n " "))
@@ -469,9 +469,9 @@
Code
(let [c/01 "...."
c/04 (format c/01 c/01 c/01 c/01)
- c/16 (format c/04 c/04 c/04 c/04)]
+ c_16 (format c/04 c/04 c/04 c/04)]
(code.text (format blank_line
- c/16 \n c/16
+ c_16 \n c_16
blank_line))))
(type: Example
diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux
index 5b5e96a9c..2428f6bb2 100644
--- a/stdlib/source/library/lux/ffi.jvm.lux
+++ b/stdlib/source/library/lux/ffi.jvm.lux
@@ -477,7 +477,7 @@
(<code>.tuple (<>.exactly (list.size arguments) <code>.any)))))]
(in (` ("jvm member invoke constructor" (~ (code.text class_name))
(~+ (|> args
- (list.zipped/2 (list#each product.right arguments))
+ (list.zipped_2 (list#each product.right arguments))
(list#each ..decorate_input))))))))
(def: (static_method_parser class_name method_name arguments)
@@ -489,7 +489,7 @@
(<code>.tuple (<>.exactly (list.size arguments) <code>.any)))))]
(in (` ("jvm member invoke static" (~ (code.text class_name)) (~ (code.text method_name))
(~+ (|> args
- (list.zipped/2 (list#each product.right arguments))
+ (list.zipped_2 (list#each product.right arguments))
(list#each ..decorate_input))))))))
(template [<name> <jvm_op>]
@@ -505,7 +505,7 @@
[(~+ (list#each (|>> ..signature code.text) type_vars))]
(~ (code.local self_name))
(~+ (|> args
- (list.zipped/2 (list#each product.right arguments))
+ (list.zipped_2 (list#each product.right arguments))
(list#each ..decorate_input))))))))]
[special_method_parser "jvm member invoke special"]
@@ -1138,7 +1138,7 @@
("jvm object cast" (~ (code.local self_name)))
(~+ (|> args
(list#each (|>> ~ "jvm object cast" `))
- (list.zipped/2 (list#each product.right arguments))
+ (list.zipped_2 (list#each product.right arguments))
(list#each ..decorate_input)))))))))]
(` ("override"
(~ (declaration$ declaration))
@@ -1461,7 +1461,7 @@
(def: (jvm_invoke_inputs mode classes inputs)
(-> Primitive_Mode (List (Type Value)) (List [Bit Code]) (List Code))
(|> inputs
- (list.zipped/2 classes)
+ (list.zipped_2 classes)
(list#each (function (_ [class [maybe? input]])
(|> (if maybe?
(` (.is (.Primitive (~ (code.text (..reflection class))))
@@ -1516,7 +1516,7 @@
(~ (code.text full_name))
[(~+ (list#each ..var$ (the #import_member_tvars commons)))]
(~+ (|> (jvm_invoke_inputs (the #import_member_mode commons) input_jvm_types arg_function_inputs)
- (list.zipped/2 input_jvm_types)
+ (list.zipped_2 input_jvm_types)
(list#each ..decorate_input)))))]
(with_automatic_output_conversion (the #import_member_mode commons))
(with_return_maybe member true classT)
@@ -1556,10 +1556,10 @@
[(~+ (list#each ..var$ (the #import_member_tvars commons)))]
(~+ (|> object_ast
(list#each ..un_quoted)
- (list.zipped/2 (list (jvm.class full_name (list))))
+ (list.zipped_2 (list (jvm.class full_name (list))))
(list#each (with_automatic_input_conversion (the #import_member_mode commons)))))
(~+ (|> (jvm_invoke_inputs (the #import_member_mode commons) input_jvm_types arg_function_inputs)
- (list.zipped/2 input_jvm_types)
+ (list.zipped_2 input_jvm_types)
(list#each ..decorate_input))))))
jvm_interop (.is Code
(case (jvm.void? method_return)
diff --git a/stdlib/source/library/lux/ffi.old.lux b/stdlib/source/library/lux/ffi.old.lux
index 0479558f9..ce9e50959 100644
--- a/stdlib/source/library/lux/ffi.old.lux
+++ b/stdlib/source/library/lux/ffi.old.lux
@@ -1433,7 +1433,7 @@
(if maybe?
(` ((~! !!!) (~ (un_quote input))))
(un_quote input))))
- (list.zipped/2 classes)
+ (list.zipped_2 classes)
(list#each (auto_convert_input mode))))
(def: (import_name format class member)
diff --git a/stdlib/source/library/lux/macro/pattern.lux b/stdlib/source/library/lux/macro/pattern.lux
index 62d829875..d255d9a26 100644
--- a/stdlib/source/library/lux/macro/pattern.lux
+++ b/stdlib/source/library/lux/macro/pattern.lux
@@ -49,7 +49,7 @@
[symbol$]
[tuple$]
[monad#mix]
- [zipped/2]
+ [zipped_2]
[multi_level_case^]
[multi_level_case$]
diff --git a/stdlib/source/library/lux/macro/template.lux b/stdlib/source/library/lux/macro/template.lux
index f324e2efb..090a25ac4 100644
--- a/stdlib/source/library/lux/macro/template.lux
+++ b/stdlib/source/library/lux/macro/template.lux
@@ -40,7 +40,7 @@
[g!locals (|> locals
(list#each //.symbol)
(monad.all !))]
- (in (list (` (.with_expansions [(~+ (|> (list.zipped/2 locals g!locals)
+ (in (list (` (.with_expansions [(~+ (|> (list.zipped_2 locals g!locals)
(list#each (function (_ [name symbol])
(list (code.local name) symbol)))
list#conjoint))]
@@ -137,7 +137,7 @@
inputs_amount (list.size inputs)]
(if (nat.= parameters_amount inputs_amount)
(.let [environment (is Environment
- (|> (list.zipped/2 _#parameters inputs)
+ (|> (list.zipped_2 _#parameters inputs)
(dictionary.of_list text.hash)))]
{.#Right [compiler (list#each (..applied environment) _#template)]})
(exception.except ..irregular_arguments [parameters_amount inputs_amount]))))))
diff --git a/stdlib/source/library/lux/math/number/complex.lux b/stdlib/source/library/lux/math/number/complex.lux
index 470a9bfbf..7f44439d0 100644
--- a/stdlib/source/library/lux/math/number/complex.lux
+++ b/stdlib/source/library/lux/math/number/complex.lux
@@ -210,7 +210,7 @@
(-> Complex Complex)
(let [(open "[0]") subject]
[..#real (|> subject ..abs f.log)
- ..#imaginary (f.atan/2 #real #imaginary)]))
+ ..#imaginary (f.atan_2 #real #imaginary)]))
(template [<name> <type> <op>]
[(def: .public (<name> param input)
@@ -225,7 +225,7 @@
(-> Frac Frac Frac)
(f.* (f.signum sign) magnitude))
-(def: .public (root/2 input)
+(def: .public (root_2 input)
(-> Complex Complex)
(let [(open "[0]") input
t (|> input ..abs (f.+ (f.abs #real)) (f./ +2.0) (f.pow +0.5))]
@@ -237,9 +237,9 @@
..#imaginary (f./ (f.* +2.0 t)
#imaginary)])))
-(def: (root/2-1z input)
+(def: (root_2-1z input)
(-> Complex Complex)
- (|> (complex +1.0) (- (* input input)) ..root/2))
+ (|> (complex +1.0) (- (* input input)) ..root_2))
(def: .public (reciprocal (open "[0]"))
(-> Complex Complex)
@@ -259,14 +259,14 @@
(def: .public (acos input)
(-> Complex Complex)
(|> input
- (..+ (|> input ..root/2-1z (..* ..i)))
+ (..+ (|> input ..root_2-1z (..* ..i)))
..log
(..* (..opposite ..i))))
(def: .public (asin input)
(-> Complex Complex)
(|> input
- ..root/2-1z
+ ..root_2-1z
(..+ (..* ..i input))
..log
(..* (..opposite ..i))))
@@ -281,7 +281,7 @@
(def: .public (argument (open "[0]"))
(-> Complex Frac)
- (f.atan/2 #real #imaginary))
+ (f.atan_2 #real #imaginary))
(def: .public (roots nth input)
(-> Nat Complex (List Complex))
diff --git a/stdlib/source/library/lux/math/number/frac.lux b/stdlib/source/library/lux/math/number/frac.lux
index 77b54b4da..526d16ef4 100644
--- a/stdlib/source/library/lux/math/number/frac.lux
+++ b/stdlib/source/library/lux/math/number/frac.lux
@@ -54,8 +54,8 @@
[ceil "jvm invokestatic:java.lang.Math:ceil:double"]
[floor "jvm invokestatic:java.lang.Math:floor:double"]
- [root/2 "jvm invokestatic:java.lang.Math:sqrt:double"]
- [root/3 "jvm invokestatic:java.lang.Math:cbrt:double"]
+ [root_2 "jvm invokestatic:java.lang.Math:sqrt:double"]
+ [root_3 "jvm invokestatic:java.lang.Math:cbrt:double"]
)
(def: .public (pow param subject)
(-> Frac Frac Frac)
@@ -95,8 +95,8 @@
[ceil "ceil"]
[floor "floor"]
- [root/2 "sqrt"]
- [root/3 "cbrt"]
+ [root_2 "sqrt"]
+ [root_3 "cbrt"]
)
(def: .public (pow param subject)
@@ -127,8 +127,8 @@
[ceil "Math.ceil"]
[floor "Math.floor"]
- [root/2 "Math.sqrt"]
- [root/3 "Math.cbrt"]
+ [root_2 "Math.sqrt"]
+ [root_3 "Math.cbrt"]
)
(def: .public (pow param subject)
@@ -157,14 +157,14 @@
[ceil "ceil"]
[floor "floor"]
- [root/2 "sqrt"]
+ [root_2 "sqrt"]
)
(def: .public (pow param subject)
(-> Frac Frac Frac)
(as Frac ("python object do" "pow" ("python import" "math") [subject param])))
- (def: .public (root/3 it)
+ (def: .public (root_3 it)
(-> Frac Frac)
(if ("lux f64 <" +0.0 it)
(|> it
@@ -196,14 +196,14 @@
[ceil "math.ceil"]
[floor "math.floor"]
- [root/2 "math.sqrt"]
+ [root_2 "math.sqrt"]
)
(def: .public (pow param subject)
(-> Frac Frac Frac)
("lua power" param subject))
- (def: .public (root/3 it)
+ (def: .public (root_3 it)
(-> Frac Frac)
(if ("lux f64 <" +0.0 it)
(|> it
@@ -232,8 +232,8 @@
[exp "Math.exp"]
[log "Math.log"]
- [root/2 "Math.sqrt"]
- [root/3 "Math.cbrt"]
+ [root_2 "Math.sqrt"]
+ [root_3 "Math.cbrt"]
)
(template [<name> <method>]
@@ -272,14 +272,14 @@
[ceil "ceil"]
[floor "floor"]
- [root/2 "sqrt"]
+ [root_2 "sqrt"]
)
(def: .public (pow param subject)
(-> Frac Frac Frac)
(as Frac ("php apply" ("php constant" "pow") subject param)))
- (def: .public root/3
+ (def: .public root_3
(-> Frac Frac)
(..pow ("lux f64 /" +3.0 +1.0))))
@@ -304,14 +304,14 @@
[ceil "ceiling"]
[floor "floor"]
- [root/2 "sqrt"]
+ [root_2 "sqrt"]
)
(def: .public (pow param subject)
(-> Frac Frac Frac)
(as Frac ("scheme apply" ("scheme constant" "expt") subject param)))
- (def: .public root/3
+ (def: .public root_3
(-> Frac Frac)
(..pow ("lux f64 /" +3.0 +1.0))))
)
@@ -329,7 +329,7 @@
... else
floored)))
-(def: .public (atan/2 x y)
+(def: .public (atan_2 x y)
(-> Frac Frac Frac)
(cond ("lux f64 <" x +0.0)
(..atan ("lux f64 /" x y))
diff --git a/stdlib/source/library/lux/math/number/i64.lux b/stdlib/source/library/lux/math/number/i64.lux
index 927765984..299e192e2 100644
--- a/stdlib/source/library/lux/math/number/i64.lux
+++ b/stdlib/source/library/lux/math/number/i64.lux
@@ -165,18 +165,18 @@
(..or (..right_shifted size (..and high value))
(..left_shifted size (..and low value)))))))
- swap/01 (swapper 0)
- swap/02 (swapper 1)
- swap/04 (swapper 2)
- swap/08 (swapper 3)
- swap/16 (swapper 4)
- swap/32 (swapper 5)]
- (|>> swap/32
- swap/16
- swap/08
- swap/04
- swap/02
- swap/01)))
+ swap_01 (swapper 0)
+ swap_02 (swapper 1)
+ swap_04 (swapper 2)
+ swap_08 (swapper 3)
+ swap_16 (swapper 4)
+ swap_32 (swapper 5)]
+ (|>> swap_32
+ swap_16
+ swap_08
+ swap_04
+ swap_02
+ swap_01)))
(type: .public (Sub size)
(Interface
diff --git a/stdlib/source/library/lux/target/common_lisp.lux b/stdlib/source/library/lux/target/common_lisp.lux
index 15d35df29..c868a0781 100644
--- a/stdlib/source/library/lux/target/common_lisp.lux
+++ b/stdlib/source/library/lux/target/common_lisp.lux
@@ -114,7 +114,7 @@
... else
(.let [raw (%.frac value)]
(.if (text.contains? "E" raw)
- (text.replaced/1 "E" "d" raw)
+ (text.replaced_once "E" "d" raw)
(format raw "d0"))))))
(def: safe
diff --git a/stdlib/source/library/lux/target/js.lux b/stdlib/source/library/lux/target/js.lux
index d101afd55..d2b802d2f 100644
--- a/stdlib/source/library/lux/target/js.lux
+++ b/stdlib/source/library/lux/target/js.lux
@@ -139,7 +139,7 @@
(-> Text Expression Access)
(abstraction (format (representation object) "." field)))
- (def: .public (apply/* function inputs)
+ (def: .public (apply_* function inputs)
(-> Expression (List Expression) Computation)
(|> inputs
(list#each ..code)
@@ -150,7 +150,7 @@
(def: .public (do method inputs object)
(-> Text (List Expression) Expression Computation)
- (apply/* (..the method object) inputs))
+ (apply_* (..the method object) inputs))
(def: .public object
(-> (List [Text Expression]) Computation)
@@ -428,19 +428,19 @@
[(`` (def: .public (<apply> function)
(-> Expression (~~ (template.spliced <type>+)) Computation)
(.function (_ (~~ (template.spliced <arg>+)))
- (..apply/* function (list (~~ (template.spliced <arg>+)))))))
+ (..apply_* function (list (~~ (template.spliced <arg>+)))))))
(`` (template [<definition> <function>]
[(def: .public <definition> (<apply> (..var <function>)))]
(~~ (template.spliced <function>+))))]
- [apply/1 [_0] [Expression]
+ [apply_1 [_0] [Expression]
[[not_a_number? "isNaN"]]]
- [apply/2 [_0 _1] [Expression Expression]
+ [apply_2 [_0 _1] [Expression Expression]
[]]
- [apply/3 [_0 _1 _2] [Expression Expression Expression]
+ [apply_3 [_0 _1 _2] [Expression Expression Expression]
[]]
)
diff --git a/stdlib/source/library/lux/target/jvm/attribute/code.lux b/stdlib/source/library/lux/target/jvm/attribute/code.lux
index f7619a587..9916f97b0 100644
--- a/stdlib/source/library/lux/target/jvm/attribute/code.lux
+++ b/stdlib/source/library/lux/target/jvm/attribute/code.lux
@@ -73,11 +73,11 @@
(///limit.writer (the #limit code))
... u4 code_length;
... u1 code[code_length];
- (binaryF.binary/32 (the #code code))
+ (binaryF.binary_32 (the #code code))
... u2 exception_table_length;
... exception_table[exception_table_length];
- ((binaryF.sequence/16 /exception.writer) (the #exception_table code))
+ ((binaryF.sequence_16 /exception.writer) (the #exception_table code))
... u2 attributes_count;
... attribute_info attributes[attributes_count];
- ((binaryF.sequence/16 writer) (the #attributes code))
+ ((binaryF.sequence_16 writer) (the #attributes code))
))
diff --git a/stdlib/source/library/lux/target/jvm/bytecode.lux b/stdlib/source/library/lux/target/jvm/bytecode.lux
index 59dbcc697..1c5a85731 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode.lux
@@ -1005,7 +1005,7 @@
(<| (try|do >default (try#each ..big_jump (..jump @from @default)))
(try|do >cases (|> @cases
(monad.each try.monad (|>> (..jump @from) (try#each ..big_jump)))
- (try#each (|>> (list.zipped/2 (list#each product.left cases))))))
+ (try#each (|>> (list.zipped_2 (list#each product.left cases))))))
(try|in [..no_exceptions (bytecode >default >cases)]))
... {.#None}
diff --git a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
index d6717d8a9..379adfd35 100644
--- a/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
+++ b/stdlib/source/library/lux/target/jvm/bytecode/instruction.lux
@@ -79,7 +79,7 @@
(function (_ [offset binary])
[(n.+ (///unsigned.value ..opcode_size)
offset)
- (binary.has/1! offset opcode binary)]))
+ (binary.has_8! offset opcode binary)]))
(def: nullary
[Estimator (-> Opcode Instruction)]
@@ -108,7 +108,7 @@
(function (_ [offset binary])
[(n.+ (///unsigned.value <shift>) offset)
(|> binary
- (binary.has/1! offset opcode)
+ (binary.has_8! offset opcode)
(<writer> (n.+ (///unsigned.value ..opcode_size) offset)
(<unwrap> input0)))]))
@@ -119,10 +119,10 @@
[(n.+ (///unsigned.value <shift>) size)
(|>> mutation ((<private> opcode input0)))])]))]
- [..size/1 unary/1 U1 binary.has/1! ///unsigned.value]
- [..size/2 unary/2 U2 binary.has/2! ///unsigned.value]
- [..size/2 jump/2 Jump binary.has/2! ///signed.value]
- [..size/4 jump/4 Big_Jump binary.has/4! ///signed.value]
+ [..size/1 unary/1 U1 binary.has_8! ///unsigned.value]
+ [..size/2 unary/2 U2 binary.has_16! ///unsigned.value]
+ [..size/2 jump/2 Jump binary.has_16! ///signed.value]
+ [..size/4 jump/4 Big_Jump binary.has_32! ///signed.value]
)
(template [<shift> <name> <inputT> <writer>]
@@ -132,7 +132,7 @@
(function (_ [offset binary])
[(n.+ (///unsigned.value <shift>) offset)
(|> binary
- (binary.has/1! offset opcode)
+ (binary.has_8! offset opcode)
(<writer> (n.+ (///unsigned.value ..opcode_size) offset)
(///signed.value input0)))]))
@@ -143,8 +143,8 @@
[(n.+ (///unsigned.value <shift>) size)
(|>> mutation ((<private> opcode input0)))])]))]
- [..size/1 unary/1' S1 binary.has/1!]
- [..size/2 unary/2' S2 binary.has/2!]
+ [..size/1 unary/1' S1 binary.has_8!]
+ [..size/2 unary/2' S2 binary.has_16!]
)
(def: size/11
@@ -158,10 +158,10 @@
(function (_ [offset binary])
[(n.+ (///unsigned.value ..size/11) offset)
(|> binary
- (binary.has/1! offset opcode)
- (binary.has/1! (n.+ (///unsigned.value ..opcode_size) offset)
+ (binary.has_8! offset opcode)
+ (binary.has_8! (n.+ (///unsigned.value ..opcode_size) offset)
(///unsigned.value input0))
- (binary.has/1! (n.+ (///unsigned.value ..size/1) offset)
+ (binary.has_8! (n.+ (///unsigned.value ..size/1) offset)
(///unsigned.value input1)))]))
(def: binary/11
@@ -182,10 +182,10 @@
(function (_ [offset binary])
[(n.+ (///unsigned.value ..size/21) offset)
(|> binary
- (binary.has/1! offset opcode)
- (binary.has/2! (n.+ (///unsigned.value ..opcode_size) offset)
- (///unsigned.value input0))
- (binary.has/1! (n.+ (///unsigned.value ..size/2) offset)
+ (binary.has_8! offset opcode)
+ (binary.has_16! (n.+ (///unsigned.value ..opcode_size) offset)
+ (///unsigned.value input0))
+ (binary.has_8! (n.+ (///unsigned.value ..size/2) offset)
(///unsigned.value input1)))]))
(def: binary/21
@@ -207,12 +207,12 @@
(function (_ [offset binary])
[(n.+ (///unsigned.value ..size/211) offset)
(|> binary
- (binary.has/1! offset opcode)
- (binary.has/2! (n.+ (///unsigned.value ..opcode_size) offset)
- (///unsigned.value input0))
- (binary.has/1! (n.+ (///unsigned.value ..size/2) offset)
+ (binary.has_8! offset opcode)
+ (binary.has_16! (n.+ (///unsigned.value ..opcode_size) offset)
+ (///unsigned.value input0))
+ (binary.has_8! (n.+ (///unsigned.value ..size/2) offset)
(///unsigned.value input1))
- (binary.has/1! (n.+ (///unsigned.value ..size/21) offset)
+ (binary.has_8! (n.+ (///unsigned.value ..size/21) offset)
(///unsigned.value input2)))]))
(def: trinary/211
@@ -606,21 +606,21 @@
(do [! try.monad]
[amount_of_afterwards (|> amount_of_afterwards .int ///signed.s4)
maximum (///signed.+/4 minimum amount_of_afterwards)]
- (in (let [_ (binary.has/1! offset (hex "AA") binary)
+ (in (let [_ (binary.has_8! offset (hex "AA") binary)
offset (n.+ (///unsigned.value ..opcode_size) offset)
_ (case padding
3 (|> binary
- (binary.has/1! offset 0)
- (binary.has/2! (++ offset) 0))
- 2 (binary.has/2! offset 0 binary)
- 1 (binary.has/1! offset 0 binary)
+ (binary.has_8! offset 0)
+ (binary.has_16! (++ offset) 0))
+ 2 (binary.has_16! offset 0 binary)
+ 1 (binary.has_8! offset 0 binary)
_ binary)
offset (n.+ padding offset)
- _ (binary.has/4! offset (///signed.value default) binary)
+ _ (binary.has_32! offset (///signed.value default) binary)
offset (n.+ (///unsigned.value ..big_jump_size) offset)
- _ (binary.has/4! offset (///signed.value minimum) binary)
+ _ (binary.has_32! offset (///signed.value minimum) binary)
offset (n.+ (///unsigned.value ..integer_size) offset)
- _ (binary.has/4! offset (///signed.value maximum) binary)]
+ _ (binary.has_32! offset (///signed.value maximum) binary)]
(loop (again [offset (n.+ (///unsigned.value ..integer_size) offset)
afterwards (is (List Big_Jump)
{.#Item at_minimum afterwards})])
@@ -630,7 +630,7 @@
{.#Item head tail}
(exec
- (binary.has/4! offset (///signed.value head) binary)
+ (binary.has_32! offset (///signed.value head) binary)
(again (n.+ (///unsigned.value ..big_jump_size) offset)
tail))))))))]))]
[(n.+ tableswitch_size
@@ -666,19 +666,19 @@
lookupswitch_mutation (is Mutation
(function (_ [offset binary])
[(n.+ lookupswitch_size offset)
- (let [_ (binary.has/1! offset (hex "AB") binary)
+ (let [_ (binary.has_8! offset (hex "AB") binary)
offset (n.+ (///unsigned.value ..opcode_size) offset)
_ (case padding
3 (|> binary
- (binary.has/1! offset 0)
- (binary.has/2! (++ offset) 0))
- 2 (binary.has/2! offset 0 binary)
- 1 (binary.has/1! offset 0 binary)
+ (binary.has_8! offset 0)
+ (binary.has_16! (++ offset) 0))
+ 2 (binary.has_16! offset 0 binary)
+ 1 (binary.has_8! offset 0 binary)
_ binary)
offset (n.+ padding offset)
- _ (binary.has/4! offset (///signed.value default) binary)
+ _ (binary.has_32! offset (///signed.value default) binary)
offset (n.+ (///unsigned.value ..big_jump_size) offset)
- _ (binary.has/4! offset amount_of_cases binary)]
+ _ (binary.has_32! offset amount_of_cases binary)]
(loop (again [offset (n.+ (///unsigned.value ..integer_size) offset)
cases cases])
(case cases
@@ -687,8 +687,8 @@
{.#Item [value jump] tail}
(exec
- (binary.has/4! offset (///signed.value value) binary)
- (binary.has/4! (n.+ (///unsigned.value ..integer_size) offset) (///signed.value jump) binary)
+ (binary.has_32! offset (///signed.value value) binary)
+ (binary.has_32! (n.+ (///unsigned.value ..integer_size) offset) (///signed.value jump) binary)
(again (n.+ case_size offset)
tail)))))]))]
[(n.+ lookupswitch_size
diff --git a/stdlib/source/library/lux/target/jvm/class.lux b/stdlib/source/library/lux/target/jvm/class.lux
index 4d2cf203c..8447c56de 100644
--- a/stdlib/source/library/lux/target/jvm/class.lux
+++ b/stdlib/source/library/lux/target/jvm/class.lux
@@ -140,7 +140,7 @@
[//index.writer #this]
[//index.writer #super]))
(~~ (template [<writer> <slot>]
- [((binaryF.sequence/16 <writer>) (the <slot> class))]
+ [((binaryF.sequence_16 <writer>) (the <slot> class))]
[//index.writer #interfaces]
[//field.writer #fields]
diff --git a/stdlib/source/library/lux/target/jvm/constant.lux b/stdlib/source/library/lux/target/jvm/constant.lux
index edd68d05b..c32ca731c 100644
--- a/stdlib/source/library/lux/target/jvm/constant.lux
+++ b/stdlib/source/library/lux/target/jvm/constant.lux
@@ -38,7 +38,7 @@
(def: utf8_writer
(Writer UTF8)
- binaryF.utf8/16)
+ binaryF.utf8_16)
(abstract: .public Class
(Index UTF8)
@@ -119,10 +119,10 @@
(~~ (template.spliced <write>))
(~~ (template.spliced <writer>)))))]
- [integer_writer Integer [] [binaryF.bits/32]]
- [float_writer Float [java/lang/Float::floatToRawIntBits ffi.of_int .i64] [i32.i32 binaryF.bits/32]]
- [long_writer Long [] [binaryF.bits/64]]
- [double_writer Double [java/lang/Double::doubleToRawLongBits ffi.of_long] [binaryF.bits/64]]
+ [integer_writer Integer [] [binaryF.bits_32]]
+ [float_writer Float [java/lang/Float::floatToRawIntBits ffi.of_int .i64] [i32.i32 binaryF.bits_32]]
+ [long_writer Long [] [binaryF.bits_64]]
+ [double_writer Double [java/lang/Double::doubleToRawLongBits ffi.of_long] [binaryF.bits_64]]
[string_writer String [] [//index.writer]]
)
)
diff --git a/stdlib/source/library/lux/target/jvm/constant/pool.lux b/stdlib/source/library/lux/target/jvm/constant/pool.lux
index d8584aaa6..12e6609e3 100644
--- a/stdlib/source/library/lux/target/jvm/constant/pool.lux
+++ b/stdlib/source/library/lux/target/jvm/constant/pool.lux
@@ -202,7 +202,7 @@
(function (_ [next pool])
(sequence#mix (function (_ [_index post] pre)
(specification#composite pre (//.writer post)))
- (format.bits/16 (!index next))
+ (format.bits_16 (!index next))
pool)))
(def: .public empty
diff --git a/stdlib/source/library/lux/target/jvm/encoding/signed.lux b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
index 981d8c3f7..160141e3b 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/signed.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/signed.lux
@@ -105,8 +105,8 @@
(Writer <type>)
(|>> representation <writer>))]
- [writer/1 S1 format.bits/8]
- [writer/2 S2 format.bits/16]
- [writer/4 S4 format.bits/32]
+ [writer/1 S1 format.bits_8]
+ [writer/2 S2 format.bits_16]
+ [writer/4 S4 format.bits_32]
)
)
diff --git a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
index d733b0480..0282dd0b2 100644
--- a/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
+++ b/stdlib/source/library/lux/target/jvm/encoding/unsigned.lux
@@ -114,8 +114,8 @@
(Writer <type>)
(|>> representation <writer>))]
- [writer/1 U1 format.bits/8]
- [writer/2 U2 format.bits/16]
- [writer/4 U4 format.bits/32]
+ [writer/1 U1 format.bits_8]
+ [writer/2 U2 format.bits_16]
+ [writer/4 U4 format.bits_32]
)
)
diff --git a/stdlib/source/library/lux/target/jvm/field.lux b/stdlib/source/library/lux/target/jvm/field.lux
index ab2ef722c..5db3ac6b0 100644
--- a/stdlib/source/library/lux/target/jvm/field.lux
+++ b/stdlib/source/library/lux/target/jvm/field.lux
@@ -57,7 +57,7 @@
[modifier.writer #modifier]
[//index.writer #name]
[//index.writer #descriptor]
- [(binaryF.sequence/16 //attribute.writer) #attributes]))
+ [(binaryF.sequence_16 //attribute.writer) #attributes]))
)))
(def: .public (field modifier name with_signature? type attributes)
diff --git a/stdlib/source/library/lux/target/jvm/method.lux b/stdlib/source/library/lux/target/jvm/method.lux
index 264e6d475..be590f849 100644
--- a/stdlib/source/library/lux/target/jvm/method.lux
+++ b/stdlib/source/library/lux/target/jvm/method.lux
@@ -105,5 +105,5 @@
[//modifier.writer #modifier]
[//index.writer #name]
[//index.writer #descriptor]
- [(format.sequence/16 //attribute.writer) #attributes]))
+ [(format.sequence_16 //attribute.writer) #attributes]))
)))
diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux
index 44c4bda89..55b6a4185 100644
--- a/stdlib/source/library/lux/target/jvm/reflection.lux
+++ b/stdlib/source/library/lux/target/jvm/reflection.lux
@@ -304,7 +304,7 @@
(if (text#= class_name name)
(if (n.= num_class_params num_type_params)
(|> params
- (list.zipped/2 (list#each (|>> java/lang/reflect/TypeVariable::getName)
+ (list.zipped_2 (list#each (|>> java/lang/reflect/TypeVariable::getName)
class_params))
(list#mix (function (_ [name paramT] mapping)
(dictionary.has name paramT mapping))
diff --git a/stdlib/source/library/lux/test.lux b/stdlib/source/library/lux/test.lux
index 7e38a497f..2ac3daa16 100644
--- a/stdlib/source/library/lux/test.lux
+++ b/stdlib/source/library/lux/test.lux
@@ -213,7 +213,7 @@
"100%"
(let [raw (|> done_percent
%.frac
- (text.replaced/1 "+" ""))]
+ (text.replaced_once "+" ""))]
(|> raw
(text.clip 0 (if (f.< +10.0 done_percent)
4 ... X.XX
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux
index 9c5a1c045..ccb3e06ed 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/analysis/coverage.lux
@@ -113,7 +113,7 @@
(and (n.= (list.size flatR) (list.size flatS))
(list.every? (function (_ [coverageR coverageS])
(= coverageR coverageS))
- (list.zipped/2 flatR flatS))))
+ (list.zipped_2 flatR flatS))))
_
#0)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux
index fba921765..fdb485bbd 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/analysis/complex.lux
@@ -339,7 +339,7 @@
(in [])
(/.except ..record_size_mismatch [size_ts size_record recordT record]))
.let [tuple_range (list.indices size_ts)
- tag->idx (dictionary.of_list symbol.hash (list.zipped/2 slot_set tuple_range))]
+ tag->idx (dictionary.of_list symbol.hash (list.zipped_2 slot_set tuple_range))]
idx->val (monad.mix !
(function (_ [key val] idx->val)
(do !
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
index ce1654cd4..95915309c 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -1192,7 +1192,7 @@
(list.size parameters))
(list.every? (function (_ [expectedJC actualJC])
(jvm#= expectedJC (de_aliased aliasing actualJC)))
- (list.zipped/2 parameters inputsJT)))]]
+ (list.zipped_2 parameters inputsJT)))]]
(in (and correct_class?
correct_method?
same_static?
@@ -1210,7 +1210,7 @@
(n.= (list.size inputsJT) (list.size parameters))
(list.every? (function (_ [expectedJC actualJC])
(jvm#= expectedJC (de_aliased aliasing actualJC)))
- (list.zipped/2 parameters inputsJT))))))
+ (list.zipped_2 parameters inputsJT))))))
(def: index_parameter
(-> Nat .Type)
@@ -1369,7 +1369,7 @@
(def: (aliasing expected actual)
(-> (List (Type Var)) (List (Type Var)) Aliasing)
- (|> (list.zipped/2 (list#each parser.name actual)
+ (|> (list.zipped_2 (list#each parser.name actual)
(list#each parser.name expected))
(dictionary.of_list text.hash)))
@@ -1488,7 +1488,7 @@
(def: (decorate_inputs typesT inputsA)
(-> (List (Type Value)) (List Analysis) (List Analysis))
(|> inputsA
- (list.zipped/2 (list#each (|>> ..signature /////analysis.text) typesT))
+ (list.zipped_2 (list#each (|>> ..signature /////analysis.text) typesT))
(list#each (function (_ [type value])
(/////analysis.tuple (list type value))))))
@@ -2169,7 +2169,7 @@
phase.lifted)]
(|> super_parameters
(monad.each ! (..reflection_type mapping))
- (# ! each (|>> (list.zipped/2 parent_parameters)))))
+ (# ! each (|>> (list.zipped_2 parent_parameters)))))
(phase.lifted (exception.except ..mismatched_super_parameters [parent_name expected_count actual_count]))))
{.#None}
@@ -2301,7 +2301,7 @@
_ (phase.assertion ..class_parameter_mismatch [name class expected_parameters actual_parameters]
(n.= (list.size expected_parameters)
(list.size actual_parameters)))]
- (in (|> (list.zipped/2 expected_parameters actual_parameters)
+ (in (|> (list.zipped_2 expected_parameters actual_parameters)
(list#mix (function (_ [expected actual] mapping)
(case (parser.var? actual)
{.#Some actual}
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
index a018f3ab3..d2f911155 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/analysis/lux.lux
@@ -60,7 +60,7 @@
(function (_ [argT argC])
(<| (typeA.expecting argT)
(analyse archive argC)))
- (list.zipped/2 inputsT+ args))]
+ (list.zipped_2 inputsT+ args))]
(in {////analysis.#Extension extension_name argsA}))
(////analysis.except ///.incorrect_arity [extension_name num_expected num_actual]))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
index 121fd29fa..c8c48451e 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/common.lux
@@ -67,7 +67,7 @@
(def: f64//decode
(Unary Expression)
(|>> list
- (_.apply/* (_.var "parseFloat"))
+ (_.apply_* (_.var "parseFloat"))
_.return
(_.closure (list))
//runtime.lux//try))
@@ -76,7 +76,7 @@
(Unary Expression)
(|>> //runtime.i64##number
(list)
- (_.apply/* (_.var "String.fromCharCode"))))
+ (_.apply_* (_.var "String.fromCharCode"))))
... [[Text]]
(def: (text//concat [leftG rightG])
@@ -167,7 +167,7 @@
(in [(list#each (|>> .int _.int) chars)
branch!])))
conditionals))]
- ... (in (_.apply/* (_.closure (list)
+ ... (in (_.apply_* (_.closure (list)
... (_.switch (_.the //runtime.i64_low_field inputG)
... conditionals!
... {.#Some (_.return else!)}))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
index 77908df35..f3305a2d5 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/extension/generation/js/host.lux
@@ -124,7 +124,7 @@
(do [! ////////phase.monad]
[abstractionG (phase archive abstractionS)
inputsG (monad.each ! (phase archive) inputsS)]
- (in (_.apply/* abstractionG inputsG))))]))
+ (in (_.apply_* abstractionG inputsG))))]))
(def: js::function
(custom
@@ -142,9 +142,9 @@
($_ _.then
(_.define g!abstraction abstractionG)
(_.return (case (.nat arity)
- 0 (_.apply/1 g!abstraction //runtime.unit)
- 1 (_.apply/* g!abstraction g!inputs)
- _ (_.apply/1 g!abstraction (_.array g!inputs)))))))))]))
+ 0 (_.apply_1 g!abstraction //runtime.unit)
+ 1 (_.apply_* g!abstraction g!inputs)
+ _ (_.apply_1 g!abstraction (_.array g!inputs)))))))))]))
(def: .public bundle
Bundle
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
index f98ce4c6f..4fc1e5427 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/common_lisp/runtime.lux
@@ -92,7 +92,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
index 4c3e03ca3..1573a17e5 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/case.lux
@@ -63,7 +63,7 @@
[valueO (expression archive valueS)
bodyO (expression archive bodyS)]
... TODO: Find some way to do 'let' without paying the price of the closure.
- (in (_.apply/* (_.closure (list (..register register))
+ (in (_.apply_* (_.closure (list (..register register))
(_.return bodyO))
(list valueO)))))
@@ -342,4 +342,4 @@
(-> Phase! (Generator [Synthesis Path]))
(do ///////phase.monad
[pattern_matching! (..case! statement expression archive [valueS pathP])]
- (in (_.apply/* (_.closure (list) pattern_matching!) (list)))))
+ (in (_.apply_* (_.closure (list) pattern_matching!) (list)))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
index 06f2a1884..39fdda23a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/function.lux
@@ -38,7 +38,7 @@
(do [! ///////phase.monad]
[functionO (expression archive functionS)
argsO+ (monad.each ! (expression archive) argsS+)]
- (in (_.apply/* functionO argsO+))))
+ (in (_.apply_* functionO argsO+))))
(def: capture
(-> Register Var)
@@ -56,7 +56,7 @@
(|> (list.enumeration inits)
(list#each (|>> product.left ..capture)))
(_.return (_.function @self (list) body!)))
- (_.apply/* @self inits)]))
+ (_.apply_* @self inits)]))
(def: @curried
(_.var "curried"))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
index c18131d4c..5321ca9f8 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/loop.lux
@@ -93,7 +93,7 @@
_
(do [! ///////phase.monad]
[loop! (scope! statement expression archive [start initsS+ bodyS])]
- (in (_.apply/* (_.closure (list) loop!) (list))))))
+ (in (_.apply_* (_.closure (list) loop!) (list))))))
(def: @temp
(_.var "lux_again_values"))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
index af22a192b..36db99857 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/js/runtime.lux
@@ -86,7 +86,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
@@ -118,7 +118,7 @@
inputs_typesC (list#each (function.constant (` _.Expression)) inputs)]
(in (list (` (def: .public ((~ g!name) (~+ inputsC))
(-> (~+ inputs_typesC) Computation)
- (_.apply/* (~ runtime_name) (list (~+ inputsC)))))
+ (_.apply_* (~ runtime_name) (list (~+ inputsC)))))
(` (def: (~ (code.local (format "@" name)))
Statement
@@ -241,7 +241,7 @@
(runtime: (lux//try op)
(with_vars [ex]
- (_.try (_.return (..right (_.apply/1 op ..unit)))
+ (_.try (_.return (..right (_.apply_1 op ..unit)))
[ex (_.return (..left (|> ex (_.do "toString" (list)))))])))
(runtime: (lux//program_args inputs)
@@ -590,14 +590,14 @@
($_ _.then
(_.define approximate (|> (i64##number remainder)
(_./ (i64##number parameter))
- (_.apply/1 (_.var "Math.floor"))
- (_.apply/2 (_.var "Math.max") (_.i32 +1))))
+ (_.apply_1 (_.var "Math.floor"))
+ (_.apply_2 (_.var "Math.max") (_.i32 +1))))
(_.define log2 (|> approximate
- (_.apply/1 (_.var "Math.log"))
+ (_.apply_1 (_.var "Math.log"))
(_./ (_.var "Math.LN2"))
- (_.apply/1 (_.var "Math.ceil"))))
+ (_.apply_1 (_.var "Math.ceil"))))
(_.define delta (_.? (_.> (_.i32 +48) log2)
- (_.apply/2 (_.var "Math.pow")
+ (_.apply_2 (_.var "Math.pow")
(_.i32 +2)
(_.- (_.i32 +48)
log2))
@@ -692,10 +692,10 @@
end!))
(_.if (|> print _.type_of (_.= (_.string "undefined")) _.not)
($_ _.then
- (_.statement (_.apply/1 print (_.? (_.= (_.string "string")
+ (_.statement (_.apply_1 print (_.? (_.= (_.string "string")
(_.type_of message))
message
- (_.apply/1 (_.var "JSON.stringify") message))))
+ (_.apply_1 (_.var "JSON.stringify") message))))
end!))
end!)))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
index dfce813ed..be52af3e7 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/lua/runtime.lux
@@ -108,7 +108,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
index 165bbd55d..5baba49fc 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/php/runtime.lux
@@ -75,7 +75,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
index adddebae3..525b2a108 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/python/runtime.lux
@@ -114,7 +114,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
index 02c38d130..c6ff7f292 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/r/runtime.lux
@@ -81,7 +81,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
index 086c1ff0c..ed673e53a 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/ruby/runtime.lux
@@ -73,7 +73,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.local (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
index bc785f38d..f40915ce9 100644
--- a/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
+++ b/stdlib/source/library/lux/tool/compiler/language/lux/phase/generation/scheme/runtime.lux
@@ -63,7 +63,7 @@
(do [! meta.monad]
[ids (monad.all ! (list.repeated (list.size vars) meta.seed))]
(in (list (` (let [(~+ (|> vars
- (list.zipped/2 ids)
+ (list.zipped_2 ids)
(list#each (function (_ [id var])
(list (code.local var)
(` (_.var (~ (code.text (format "v" (%.nat id)))))))))
diff --git a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
index 3e9726924..26ee6ba8e 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/archive/registry.lux
@@ -135,7 +135,7 @@
dependencies (is (Writer (Set unit.ID))
(binary.set dependency))
artifacts (is (Writer (Sequence [Category Bit (Set unit.ID)]))
- (binary.sequence/64 ($_ binary.and category mandatory? dependencies)))]
+ (binary.sequence_64 ($_ binary.and category mandatory? dependencies)))]
(|>> representation
(the #artifacts)
(sequence#each (function (_ [it dependencies])
@@ -181,7 +181,7 @@
(<>.and <binary>.nat <binary>.nat))
dependencies (is (Parser (Set unit.ID))
(<binary>.set unit.hash dependency))]
- (|> (<binary>.sequence/64 ($_ <>.and category mandatory? dependencies))
+ (|> (<binary>.sequence_64 ($_ <>.and category mandatory? dependencies))
(# <>.monad each (sequence#mix (function (_ [category mandatory? dependencies] registry)
(product.right
(case category
diff --git a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
index 3abcfbf5a..548a89b36 100644
--- a/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
+++ b/stdlib/source/library/lux/tool/compiler/meta/io/context.lux
@@ -149,7 +149,7 @@
(if (text.ends_with? ..lux_extension file)
(do !
[source_code (# fs read file)]
- (async#in (dictionary.has' (text.replaced/1 context "" file) source_code enumeration)))
+ (async#in (dictionary.has' (text.replaced_once context "" file) source_code enumeration)))
(in enumeration)))
enumeration))
(# ! conjoint))]
diff --git a/stdlib/source/library/lux/type.lux b/stdlib/source/library/lux/type.lux
index 402e1a2c7..8bd91191c 100644
--- a/stdlib/source/library/lux/type.lux
+++ b/stdlib/source/library/lux/type.lux
@@ -190,7 +190,7 @@
(n.= (list.size yparams) (list.size xparams))
(list#mix (.function (_ [x y] prev) (and prev (= x y)))
#1
- (list.zipped/2 xparams yparams)))
+ (list.zipped_2 xparams yparams)))
(^.template [<tag>]
[[{<tag> xid} {<tag> yid}]
@@ -217,7 +217,7 @@
(= xbody ybody)
(list#mix (.function (_ [x y] prev) (and prev (= x y)))
#1
- (list.zipped/2 xenv yenv)))
+ (list.zipped_2 xenv yenv)))
_
#0
diff --git a/stdlib/source/library/lux/type/implicit.lux b/stdlib/source/library/lux/type/implicit.lux
index 19d3f17cf..5fde46588 100644
--- a/stdlib/source/library/lux/type/implicit.lux
+++ b/stdlib/source/library/lux/type/implicit.lux
@@ -176,7 +176,7 @@
(in (list#mix (function (_ [imported_module definitions] tail)
(available_definitions sig_type imported_module this_module_name definitions tail))
{.#End}
- (list.zipped/2 imported_modules accessible_definitions)))))
+ (list.zipped_2 imported_modules accessible_definitions)))))
(def: (on_argument arg func)
(-> Type Type (Check Type))
@@ -363,7 +363,7 @@
{.#Right [args _]}
(do [! meta.monad]
[labels (|> (macro.symbol "") (list.repeated (list.size args)) (monad.all !))]
- (in (list (` (let [(~+ (|> args (list.zipped/2 labels) (list#each ..pair_list) list#conjoint))]
+ (in (list (` (let [(~+ (|> args (list.zipped_2 labels) (list#each ..pair_list) list#conjoint))]
(..## (~ (code.symbol member)) (~+ labels)))))))
))
@@ -381,7 +381,7 @@
body <code>.any])
(do meta.monad
[g!implicit+ (implicit_bindings (list.size implementations))]
- (in (list (` (let [(~+ (|> (list.zipped/2 g!implicit+ implementations)
+ (in (list (` (let [(~+ (|> (list.zipped_2 g!implicit+ implementations)
(list#each (function (_ [g!implicit implementation])
(list g!implicit implementation)))
list#conjoint))]
@@ -390,7 +390,7 @@
(syntax: .public (implicit: [implementations ..implicits])
(do meta.monad
[g!implicit+ (implicit_bindings (list.size implementations))]
- (in (|> (list.zipped/2 g!implicit+ implementations)
+ (in (|> (list.zipped_2 g!implicit+ implementations)
(list#each (function (_ [g!implicit implementation])
(` (def: .private (~ g!implicit)
(~ implementation)))))))))
diff --git a/stdlib/source/library/lux/world/output/video/resolution.lux b/stdlib/source/library/lux/world/output/video/resolution.lux
index ffd481769..6e6bf1036 100644
--- a/stdlib/source/library/lux/world/output/video/resolution.lux
+++ b/stdlib/source/library/lux/world/output/video/resolution.lux
@@ -1,14 +1,14 @@
(.using
- [library
- [lux "*"
- [abstract
- [equivalence {"+" Equivalence}]
- [hash {"+" Hash}]]
- [data
- ["[0]" product]]
- [math
- [number
- ["[0]" nat]]]]])
+ [library
+ [lux "*"
+ [abstract
+ [equivalence {"+" Equivalence}]
+ [hash {"+" Hash}]]
+ [data
+ ["[0]" product]]
+ [math
+ [number
+ ["[0]" nat]]]]])
(type: .public Resolution
(Record
@@ -34,9 +34,9 @@
[wsvga 1024 600]
[xga 1024 768]
[xga+ 1152 864]
- [wxga/16:9 1280 720]
- [wxga/5:3 1280 768]
- [wxga/16:10 1280 800]
+ [wxga_16:9 1280 720]
+ [wxga_5:3 1280 768]
+ [wxga_16:10 1280 800]
[sxga 1280 1024]
[wxga+ 1440 900]
[hd+ 1600 900]
diff --git a/stdlib/source/library/lux/world/program.lux b/stdlib/source/library/lux/world/program.lux
index 10a2cc7b1..0561a7c66 100644
--- a/stdlib/source/library/lux/world/program.lux
+++ b/stdlib/source/library/lux/world/program.lux
@@ -300,7 +300,7 @@
{.#Some process/env}
(|> (Object::entries [process/env])
(array.list {.#None})
- (list#each (|>> (array.read! 0) maybe.trusted)))
+ (list#each (|>> (array.item 0) maybe.trusted)))
{.#None}
(list))
@@ -344,8 +344,8 @@
@.js (io.io (if ffi.on_node_js?
(case (do maybe.monad
[process/env (ffi.global Object [process env])]
- (array.read! (as Nat name)
- (as (Array Text) process/env)))
+ (array.item (as Nat name)
+ (as (Array Text) process/env)))
{.#Some value}
{try.#Success value}
diff --git a/stdlib/source/poly/lux/abstract/equivalence.lux b/stdlib/source/poly/lux/abstract/equivalence.lux
index e65bd5b5e..79c85032a 100644
--- a/stdlib/source/poly/lux/abstract/equivalence.lux
+++ b/stdlib/source/poly/lux/abstract/equivalence.lux
@@ -135,7 +135,7 @@
g!rights (list#each (|>> nat#encoded (text#composite "right") code.local) indices)]]
(in (` (is (~ (@Equivalence inputT))
(function ((~ g!_) [(~+ g!lefts)] [(~+ g!rights)])
- (and (~+ (|> (list.zipped/3 g!eqs g!lefts g!rights)
+ (and (~+ (|> (list.zipped_3 g!eqs g!lefts g!rights)
(list#each (function (_ [g!eq g!left g!right])
(` ((~ g!eq) (~ g!left) (~ g!right)))))))))))))
... Type recursion
diff --git a/stdlib/source/poly/lux/data/format/json.lux b/stdlib/source/poly/lux/data/format/json.lux
index e7b0bd1fe..e838c73b4 100644
--- a/stdlib/source/poly/lux/data/format/json.lux
+++ b/stdlib/source/poly/lux/data/format/json.lux
@@ -192,7 +192,7 @@
(function ((~ g!_) [(~+ g!members)])
((~! /.json) [(~+ (list#each (function (_ [g!member g!encoded])
(` ((~ g!encoded) (~ g!member))))
- (list.zipped/2 g!members g!encoders)))]))))))
+ (list.zipped_2 g!members g!encoders)))]))))))
... Type recursion
(do !
[[selfC non_recC] (<type>.recursive encoded)
diff --git a/stdlib/source/program/aedifex/hash.lux b/stdlib/source/program/aedifex/hash.lux
index 5adf44a9e..1455fd65f 100644
--- a/stdlib/source/program/aedifex/hash.lux
+++ b/stdlib/source/program/aedifex/hash.lux
@@ -131,7 +131,7 @@
{.#Some [head tail]}
(do try.monad
[head (# n.hex decoded head)
- output (binary.write/64! index head output)]
+ output (binary.write_64! index head output)]
(again tail (++ chunk) output))
{.#None}
@@ -143,9 +143,9 @@
[head (# n.hex decoded input)
output (<write> index head output)]
(constructor output))])
- ([1 binary.write/8!]
- [2 binary.write/16!]
- [4 binary.write/32!])
+ ([1 binary.has_8!]
+ [2 binary.has_16!]
+ [4 binary.has_32!])
_ (exception.except ..not_a_hash [(..encoding_size size) encoded])))))
(exception.except ..not_a_hash [(..encoding_size size) encoded]))))
diff --git a/stdlib/source/program/aedifex/metadata.lux b/stdlib/source/program/aedifex/metadata.lux
index 097aedac8..be3e17b55 100644
--- a/stdlib/source/program/aedifex/metadata.lux
+++ b/stdlib/source/program/aedifex/metadata.lux
@@ -36,8 +36,8 @@
(def: .public (local_uri remote_uri)
(-> URI URI)
- (text.replaced/1 ..remote_file ..local_file remote_uri))
+ (text.replaced_once ..remote_file ..local_file remote_uri))
(def: .public (remote_uri local_uri)
(-> URI URI)
- (text.replaced/1 ..local_file ..remote_file local_uri))
+ (text.replaced_once ..local_file ..remote_file local_uri))
diff --git a/stdlib/source/specification/compositor/generation/structure.lux b/stdlib/source/specification/compositor/generation/structure.lux
index cf12ae152..b7cf6423d 100644
--- a/stdlib/source/specification/compositor/generation/structure.lux
+++ b/stdlib/source/specification/compositor/generation/structure.lux
@@ -78,7 +78,7 @@
(and (n.= size (array.size tuple_out))
(list.every? (function (_ [left right])
(i.= left (as Int right)))
- (list.zipped/2 tuple_in (array.list tuple_out)))))
+ (list.zipped_2 tuple_in (array.list tuple_out)))))
{try.#Failure _}
false)))))
diff --git a/stdlib/source/test/aedifex/command/clean.lux b/stdlib/source/test/aedifex/command/clean.lux
index 21372ef80..411504a35 100644
--- a/stdlib/source/test/aedifex/command/clean.lux
+++ b/stdlib/source/test/aedifex/command/clean.lux
@@ -46,7 +46,7 @@
[count (# ! each (n.% 10) random.nat)
names (random.set text.hash count ..node_name)
contents (random.list count ($binary.random 100))]
- (in (list.zipped/2 (list#each (|>> (format prefix)) (set.list names))
+ (in (list.zipped_2 (list#each (|>> (format prefix)) (set.list names))
contents))))
(def: (create_file! fs [path content])
diff --git a/stdlib/source/test/lux/control/concatenative.lux b/stdlib/source/test/lux/control/concatenative.lux
index f6c5cb00f..f4fe24af4 100644
--- a/stdlib/source/test/lux/control/concatenative.lux
+++ b/stdlib/source/test/lux/control/concatenative.lux
@@ -78,16 +78,16 @@
(n.= (++ sample)
(||> (/.push sample)
(/.push dummy)
- (/.push (/.apply/1 ++))
+ (/.push (/.apply_1 ++))
/.dip
/.drop)))
- (_.cover [/.dip/2]
+ (_.cover [/.dip_2]
(n.= (++ sample)
(||> (/.push sample)
(/.push dummy)
(/.push dummy)
- (/.push (/.apply/1 ++))
- /.dip/2
+ (/.push (/.apply_1 ++))
+ /.dip_2
/.drop /.drop)))
))))
@@ -142,49 +142,49 @@
start random.nat
.let [distance 10
|++| (is (/.=> [Nat] [Nat])
- (/.apply/1 ++))
+ (/.apply_1 ++))
|test| (is (/.=> [Nat] [Bit])
- (/.apply/1 (|>> (n.- start) (n.< distance))))]]
+ (/.apply_1 (|>> (n.- start) (n.< distance))))]]
($_ _.and
- (_.cover [/.call /.apply/1]
+ (_.cover [/.call /.apply_1]
(n.= (++ sample)
(||> (/.push sample)
- (/.push (/.apply/1 ++))
+ (/.push (/.apply_1 ++))
/.call)))
- (_.cover [/.apply/2]
+ (_.cover [/.apply_2]
(n.= (n.+ sample sample)
(||> (/.push sample)
(/.push sample)
- (/.push (/.apply/2 n.+))
+ (/.push (/.apply_2 n.+))
/.call)))
- (_.cover [/.apply/3]
+ (_.cover [/.apply_3]
(n.= ($_ n.+ sample sample sample)
(||> (/.push sample)
(/.push sample)
(/.push sample)
- (/.push (/.apply/3 (function (_ i0 i1 i2)
+ (/.push (/.apply_3 (function (_ i0 i1 i2)
($_ n.+ i0 i1 i2))))
/.call)))
- (_.cover [/.apply/4]
+ (_.cover [/.apply_4]
(n.= ($_ n.+ sample sample sample sample)
(||> (/.push sample)
(/.push sample)
(/.push sample)
(/.push sample)
- (/.push (/.apply/4 (function (_ i0 i1 i2 i3)
+ (/.push (/.apply_4 (function (_ i0 i1 i2 i3)
($_ n.+ i0 i1 i2 i3))))
/.call)))
- (_.cover [/.apply/5]
+ (_.cover [/.apply_5]
(n.= ($_ n.+ sample sample sample sample sample)
(||> (/.push sample)
(/.push sample)
(/.push sample)
(/.push sample)
(/.push sample)
- (/.push (/.apply/5 (function (_ i0 i1 i2 i3 i4)
+ (/.push (/.apply_5 (function (_ i0 i1 i2 i3 i4)
($_ n.+ i0 i1 i2 i3 i4))))
/.call)))
- (_.cover [/.apply/6]
+ (_.cover [/.apply_6]
(n.= ($_ n.+ sample sample sample sample sample sample)
(||> (/.push sample)
(/.push sample)
@@ -192,10 +192,10 @@
(/.push sample)
(/.push sample)
(/.push sample)
- (/.push (/.apply/6 (function (_ i0 i1 i2 i3 i4 i5)
+ (/.push (/.apply_6 (function (_ i0 i1 i2 i3 i4 i5)
($_ n.+ i0 i1 i2 i3 i4 i5))))
/.call)))
- (_.cover [/.apply/7]
+ (_.cover [/.apply_7]
(n.= ($_ n.+ sample sample sample sample sample sample sample)
(||> (/.push sample)
(/.push sample)
@@ -204,10 +204,10 @@
(/.push sample)
(/.push sample)
(/.push sample)
- (/.push (/.apply/7 (function (_ i0 i1 i2 i3 i4 i5 i6)
+ (/.push (/.apply_7 (function (_ i0 i1 i2 i3 i4 i5 i6)
($_ n.+ i0 i1 i2 i3 i4 i5 i6))))
/.call)))
- (_.cover [/.apply/8]
+ (_.cover [/.apply_8]
(n.= ($_ n.+ sample sample sample sample sample sample sample sample)
(||> (/.push sample)
(/.push sample)
@@ -217,7 +217,7 @@
(/.push sample)
(/.push sample)
(/.push sample)
- (/.push (/.apply/8 (function (_ i0 i1 i2 i3 i4 i5 i6 i7)
+ (/.push (/.apply_8 (function (_ i0 i1 i2 i3 i4 i5 i6 i7)
($_ n.+ i0 i1 i2 i3 i4 i5 i6 i7))))
/.call)))
(_.cover [/.apply]
@@ -240,8 +240,8 @@
(-- sample))
(||> (/.push sample)
(/.push choice)
- (/.push (/.apply/1 ++))
- (/.push (/.apply/1 --))
+ (/.push (/.apply_1 ++))
+ (/.push (/.apply_1 --))
/.if)))
(_.cover [/.loop]
(n.= (n.+ distance start)
@@ -274,7 +274,7 @@
(n.= (n.+ sample sample)
(||> (/.push sample)
(/.push sample)
- (/.push (/.apply/2 n.+))
+ (/.push (/.apply_2 n.+))
/.partial
/.call)))
(_.cover [/.when]
@@ -283,7 +283,7 @@
sample)
(||> (/.push sample)
(/.push choice)
- (/.push (/.apply/1 ++))
+ (/.push (/.apply_1 ++))
/.when)))
(_.cover [/.?]
(n.= (if choice
@@ -299,7 +299,7 @@
(=> [Nat] [Nat])
/.dup
- (/.apply/2 n.*))
+ (/.apply_2 n.*))
(def: definition
Test
diff --git a/stdlib/source/test/lux/control/concurrency/frp.lux b/stdlib/source/test/lux/control/concurrency/frp.lux
index 7eb54cf9a..3c804559e 100644
--- a/stdlib/source/test/lux/control/concurrency/frp.lux
+++ b/stdlib/source/test/lux/control/concurrency/frp.lux
@@ -69,11 +69,11 @@
(do [! random.monad]
[inputs (random.list 5 random.nat)
sample random.nat
- distint/0 random.nat
- distint/1 (|> random.nat (random.only (|>> (n.= distint/0) not)))
- distint/2 (|> random.nat (random.only (function (_ value)
- (not (or (n.= distint/0 value)
- (n.= distint/1 value))))))
+ distinct/0 random.nat
+ distinct/1 (|> random.nat (random.only (|>> (n.= distinct/0) not)))
+ distinct/2 (|> random.nat (random.only (function (_ value)
+ (not (or (n.= distinct/0 value)
+ (n.= distinct/1 value))))))
shift random.nat]
($_ _.and
(_.for [/.functor]
@@ -181,14 +181,14 @@
(list#= (list.mixes n.+ 0 inputs)
actual))))
(in (do async.monad
- [actual (|> (list distint/0 distint/0 distint/0
- distint/1
- distint/2 distint/2)
+ [actual (|> (list distinct/0 distinct/0 distinct/0
+ distinct/1
+ distinct/2 distinct/2)
(/.sequential 0)
(/.distinct n.equivalence)
/.list)]
(_.cover' [/.distinct]
- (list#= (list distint/0 distint/1 distint/2)
+ (list#= (list distinct/0 distinct/1 distinct/2)
actual))))
(do !
[polling_delay (# ! each (|>> (n.% 10) ++) random.nat)
diff --git a/stdlib/source/test/lux/control/parser/binary.lux b/stdlib/source/test/lux/control/parser/binary.lux
index 330349078..7546bcf81 100644
--- a/stdlib/source/test/lux/control/parser/binary.lux
+++ b/stdlib/source/test/lux/control/parser/binary.lux
@@ -137,10 +137,10 @@
(n.= (.nat expected)
(.nat actual)))))))]
- [/.size/8 /.bits/8 format.bits/8]
- [/.size/16 /.bits/16 format.bits/16]
- [/.size/32 /.bits/32 format.bits/32]
- [/.size/64 /.bits/64 format.bits/64]
+ [/.size_8 /.bits_8 format.bits_8]
+ [/.size_16 /.bits_16 format.bits_16]
+ [/.size_32 /.bits_32 format.bits_32]
+ [/.size_64 /.bits_64 format.bits_64]
))))))
(def: binary
@@ -155,10 +155,10 @@
(!expect (^.multi {try.#Success actual}
(# binary.equivalence = expected actual))))))]
- [/.binary/8 format.binary/8]
- [/.binary/16 format.binary/16]
- [/.binary/32 format.binary/32]
- [/.binary/64 format.binary/64]
+ [/.binary_8 format.binary_8]
+ [/.binary_16 format.binary_16]
+ [/.binary_32 format.binary_32]
+ [/.binary_64 format.binary_64]
)))))
(def: utf8
@@ -173,10 +173,10 @@
(!expect (^.multi {try.#Success actual}
(# text.equivalence = expected actual))))))]
- [/.utf8/8 format.utf8/8]
- [/.utf8/16 format.utf8/16]
- [/.utf8/32 format.utf8/32]
- [/.utf8/64 format.utf8/64]
+ [/.utf8_8 format.utf8_8]
+ [/.utf8_16 format.utf8_16]
+ [/.utf8_32 format.utf8_32]
+ [/.utf8_64 format.utf8_64]
[/.text format.text]
)))))
@@ -193,10 +193,10 @@
(!expect (^.multi {try.#Success actual}
(# (sequence.equivalence n.equivalence) = expected actual))))))]
- [/.sequence/8 format.sequence/8]
- [/.sequence/16 format.sequence/16]
- [/.sequence/32 format.sequence/32]
- [/.sequence/64 format.sequence/64]
+ [/.sequence_8 format.sequence_8]
+ [/.sequence_16 format.sequence_16]
+ [/.sequence_32 format.sequence_32]
+ [/.sequence_64 format.sequence_64]
)))))
(def: simple
@@ -227,12 +227,12 @@
(and (frac.not_a_number? expected)
(frac.not_a_number? actual))))))))
(do [! random.monad]
- [expected (# ! each (|>> (i64.and (i64.mask /.size/8))
+ [expected (# ! each (|>> (i64.and (i64.mask /.size_8))
(n.max 2))
random.nat)]
(_.cover [/.not_a_bit]
(|> expected
- (format.result format.bits/8)
+ (format.result format.bits_8)
(/.result /.bit)
(!expect (^.multi {try.#Failure error}
(exception.match? /.not_a_bit error))))))
@@ -289,13 +289,13 @@
expected
actual))))))
(do [! random.monad]
- [tag (# ! each (|>> (i64.and (i64.mask /.size/8))
+ [tag (# ! each (|>> (i64.and (i64.mask /.size_8))
(n.max 2))
random.nat)
value random.bit]
(_.cover [/.invalid_tag]
(|> [tag value]
- (format.result (format.and format.bits/8 format.bit))
+ (format.result (format.and format.bits_8 format.bit))
(/.result (is (/.Parser (Either Bit Nat))
(/.or /.bit /.nat)))
(!expect (^.multi {try.#Failure error}
diff --git a/stdlib/source/test/lux/control/parser/json.lux b/stdlib/source/test/lux/control/parser/json.lux
index 873001415..43d184bc3 100644
--- a/stdlib/source/test/lux/control/parser/json.lux
+++ b/stdlib/source/test/lux/control/parser/json.lux
@@ -153,13 +153,13 @@
[size (# ! each (n.% 10) random.nat)
keys (random.list size (random.unicode 1))
values (random.list size (random.unicode 1))
- .let [expected (dictionary.of_list text.hash (list.zipped/2 keys values))]]
+ .let [expected (dictionary.of_list text.hash (list.zipped_2 keys values))]]
(_.cover [/.dictionary]
(|> (/.result (/.dictionary /.string)
{json.#Object
(|> values
(list#each (|>> {json.#String}))
- (list.zipped/2 keys)
+ (list.zipped_2 keys)
(dictionary.of_list text.hash))})
(!expect (^.multi {try.#Success actual}
(# (dictionary.equivalence text.equivalence) = expected actual))))))
diff --git a/stdlib/source/test/lux/data/binary.lux b/stdlib/source/test/lux/data/binary.lux
index 25877dfd7..656dbf9bf 100644
--- a/stdlib/source/test/lux/data/binary.lux
+++ b/stdlib/source/test/lux/data/binary.lux
@@ -42,7 +42,7 @@
(if (n.< size idx)
(do random.monad
[byte random.nat]
- (exec (try.trusted (/.has/1! idx byte output))
+ (exec (try.trusted (/.has_8! idx byte output))
(again (++ idx))))
(# random.monad in output)))))
@@ -115,10 +115,10 @@
(and (n.= 0 pre)
(n.= capped_value post))))]
- [0 !.bytes/1 !.has/1!]
- [1 !.bytes/2 !.has/2!]
- [2 !.bytes/4 !.has/4!]
- [3 !.bytes/8 !.has/8!]))
+ [0 !.bits_8 !.has_8!]
+ [1 !.bits_16 !.has_16!]
+ [2 !.bits_32 !.has_32!]
+ [3 !.bits_64 !.has_64!]))
(_.cover [!.slice]
(let [random_slice (!.slice offset length sample)
idxs (is (List Nat)
@@ -126,7 +126,7 @@
0 (list)
_ (enum.range n.enum 0 (-- length))))
reader (function (_ binary idx)
- (!.bytes/1 idx binary))]
+ (!.bits_8 idx binary))]
(and (n.= length (!.size random_slice))
(# (list.equivalence n.equivalence) =
(list#each (|>> (n.+ offset) (reader sample)) idxs)
@@ -135,10 +135,10 @@
(and (let [it (!.copy! size 0 sample 0 (!.empty size))]
(and (not (same? sample it))
(!.= sample it)))
- (let [sample/0 (!.bytes/1 0 sample)
+ (let [sample/0 (!.bits_8 0 sample)
copy (!.copy! 1 0 sample 0 (!.empty 2))
- copy/0 (!.bytes/1 0 copy)
- copy/1 (!.bytes/1 1 copy)]
+ copy/0 (!.bits_8 0 copy)
+ copy/1 (!.bits_8 1 copy)]
(and (n.= sample/0 copy/0)
(n.= 0 copy/1)))))
)))))
@@ -172,14 +172,14 @@
(|> (/.empty size) /.size (n.= size)))
(_.for [/.index_out_of_bounds]
($_ _.and
- (_.cover [/.bytes/1 /.has/1!]
- (..binary_io 0 /.bytes/1 /.has/1! value))
- (_.cover [/.bytes/2 /.has/2!]
- (..binary_io 1 /.bytes/2 /.has/2! value))
- (_.cover [/.bytes/4 /.has/4!]
- (..binary_io 2 /.bytes/4 /.has/4! value))
- (_.cover [/.bytes/8 /.has/8!]
- (..binary_io 3 /.bytes/8 /.has/8! value))))
+ (_.cover [/.bits_8 /.has_8!]
+ (..binary_io 0 /.bits_8 /.has_8! value))
+ (_.cover [/.bits_16 /.has_16!]
+ (..binary_io 1 /.bits_16 /.has_16! value))
+ (_.cover [/.bits_32 /.has_32!]
+ (..binary_io 2 /.bits_32 /.has_32! value))
+ (_.cover [/.bits_64 /.has_64!]
+ (..binary_io 3 /.bits_64 /.has_64! value))))
(_.cover [/.slice]
(let [random_slice (try.trusted (/.slice offset length sample))
idxs (is (List Nat)
@@ -187,7 +187,7 @@
0 (list)
_ (enum.range n.enum 0 (-- length))))
reader (function (_ binary idx)
- (/.bytes/1 idx binary))]
+ (/.bits_8 idx binary))]
(and (n.= length (/.size random_slice))
(case [(monad.each try.monad (|>> (n.+ offset) (reader sample)) idxs)
(monad.each try.monad (reader random_slice) idxs)]
@@ -223,10 +223,10 @@
false)
(succeed
(do try.monad
- [sample/0 (/.bytes/1 0 sample)
+ [sample/0 (/.bits_8 0 sample)
copy (/.copy! 1 0 sample 0 (/.empty 2))
- copy/0 (/.bytes/1 0 copy)
- copy/1 (/.bytes/1 1 copy)]
+ copy/0 (/.bits_8 0 copy)
+ copy/1 (/.bits_8 1 copy)]
(in (and (n.= sample/0 copy/0)
(n.= 0 copy/1)))))))
(_.cover [/.cannot_copy]
diff --git a/stdlib/source/test/lux/data/collection/dictionary.lux b/stdlib/source/test/lux/data/collection/dictionary.lux
index 0a1f9d295..95f2bed9e 100644
--- a/stdlib/source/test/lux/data/collection/dictionary.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary.lux
@@ -121,7 +121,7 @@
(_.cover [/.merged_with]
(list.every? (function (_ [x x*2]) (n.= (n.* 2 x) x*2))
- (list.zipped/2 (/.values dict)
+ (list.zipped_2 (/.values dict)
(/.values (/.merged_with n.+ dict dict)))))
(_.cover [/.of_list]
diff --git a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
index c20a3b480..471565d52 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/ordered.lux
@@ -50,7 +50,7 @@
random.nat)
extra_value random.nat
shift random.nat
- .let [pairs (list.zipped/2 (set.list keys)
+ .let [pairs (list.zipped_2 (set.list keys)
(set.list values))
sample (/.of_list n.order pairs)
sorted_pairs (list.sorted (function (_ [left _] [right _])
@@ -98,7 +98,7 @@
sorted_pairs))
(_.cover [/.keys /.values]
(list#= (/.entries sample)
- (list.zipped/2 (/.keys sample) (/.values sample))))
+ (list.zipped_2 (/.keys sample) (/.values sample))))
(_.cover [/.of_list]
(|> sample
/.entries (/.of_list n.order)
diff --git a/stdlib/source/test/lux/data/collection/dictionary/plist.lux b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
index 346dc5d77..fa4e221cd 100644
--- a/stdlib/source/test/lux/data/collection/dictionary/plist.lux
+++ b/stdlib/source/test/lux/data/collection/dictionary/plist.lux
@@ -1,26 +1,26 @@
(.using
- [library
- [lux "*"
- ["_" test {"+" Test}]
- [abstract
- [monad {"+" do}]
- [\\specification
- ["$[0]" equivalence]
- ["$[0]" monoid]]]
- [control
- ["[0]" maybe ("[1]#[0]" monad)]]
- [data
- ["[0]" bit ("[1]#[0]" equivalence)]
- ["[0]" text]
- [collection
- ["[0]" set]
- ["[0]" list]]]
- [math
- ["[0]" random {"+" Random}]
- [number
- ["n" nat]]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]
+ [abstract
+ [monad {"+" do}]
+ [\\specification
+ ["$[0]" equivalence]
+ ["$[0]" monoid]]]
+ [control
+ ["[0]" maybe ("[1]#[0]" monad)]]
+ [data
+ ["[0]" bit ("[1]#[0]" equivalence)]
+ ["[0]" text]
+ [collection
+ ["[0]" set]
+ ["[0]" list]]]
+ [math
+ ["[0]" random {"+" Random}]
+ [number
+ ["n" nat]]]]]
+ [\\library
+ ["[0]" /]])
(def: .public (random size gen_key gen_value)
(All (_ v)
@@ -28,7 +28,7 @@
(do random.monad
[keys (random.set text.hash size gen_key)
values (random.list size gen_value)]
- (in (list.zipped/2 (set.list keys) values))))
+ (in (list.zipped_2 (set.list keys) values))))
(def: .public test
Test
@@ -63,7 +63,7 @@
(_.cover [/.keys /.values]
(# (/.equivalence n.equivalence) =
sample
- (list.zipped/2 (/.keys sample)
+ (list.zipped_2 (/.keys sample)
(/.values sample))))
(_.cover [/.contains?]
(and (list.every? (function (_ key)
diff --git a/stdlib/source/test/lux/data/collection/list.lux b/stdlib/source/test/lux/data/collection/list.lux
index c1440d110..5fe98b03c 100644
--- a/stdlib/source/test/lux/data/collection/list.lux
+++ b/stdlib/source/test/lux/data/collection/list.lux
@@ -148,7 +148,7 @@
expected_numbers!
(/.every? (n.= (-- size))
- (/.zipped_with/2 n.+
+ (/.zipped_with_2 n.+
indices
(/.sorted n.> indices)))]
(and expected_amount!
@@ -305,8 +305,8 @@
{.#None}
(not even_sized?))))
- (_.cover [/.zipped/2]
- (let [zipped (/.zipped/2 sample/0 sample/1)
+ (_.cover [/.zipped_2]
+ (let [zipped (/.zipped_2 sample/0 sample/1)
zipped::size (/.size zipped)
size_of_smaller_list!
@@ -320,8 +320,8 @@
(/#each product.right zipped)))]
(and size_of_smaller_list!
can_extract_values!)))
- (_.cover [/.zipped/3]
- (let [zipped (/.zipped/3 sample/0 sample/1 sample/2)
+ (_.cover [/.zipped_3]
+ (let [zipped (/.zipped_3 sample/0 sample/1 sample/2)
zipped::size (/.size zipped)
size_of_smaller_list!
@@ -342,26 +342,26 @@
can_extract_values!)))
(_.cover [/.zipped]
(and (# (/.equivalence (product.equivalence n.equivalence n.equivalence)) =
- (/.zipped/2 sample/0 sample/1)
+ (/.zipped_2 sample/0 sample/1)
((/.zipped 2) sample/0 sample/1))
(# (/.equivalence ($_ product.equivalence n.equivalence n.equivalence n.equivalence)) =
- (/.zipped/3 sample/0 sample/1 sample/2)
+ (/.zipped_3 sample/0 sample/1 sample/2)
((/.zipped 3) sample/0 sample/1 sample/2))))
- (_.cover [/.zipped_with/2]
+ (_.cover [/.zipped_with_2]
(/#= (/#each (function (_ [left right])
(+/2 left right))
- (/.zipped/2 sample/0 sample/1))
- (/.zipped_with/2 +/2 sample/0 sample/1)))
- (_.cover [/.zipped_with/3]
+ (/.zipped_2 sample/0 sample/1))
+ (/.zipped_with_2 +/2 sample/0 sample/1)))
+ (_.cover [/.zipped_with_3]
(/#= (/#each (function (_ [left mid right])
(+/3 left mid right))
- (/.zipped/3 sample/0 sample/1 sample/2))
- (/.zipped_with/3 +/3 sample/0 sample/1 sample/2)))
+ (/.zipped_3 sample/0 sample/1 sample/2))
+ (/.zipped_with_3 +/3 sample/0 sample/1 sample/2)))
(_.cover [/.zipped_with]
- (and (/#= (/.zipped_with/2 +/2 sample/0 sample/1)
+ (and (/#= (/.zipped_with_2 +/2 sample/0 sample/1)
((/.zipped_with 2) +/2 sample/0 sample/1))
- (/#= (/.zipped_with/3 +/3 sample/0 sample/1 sample/2)
+ (/#= (/.zipped_with_3 +/3 sample/0 sample/1 sample/2)
((/.zipped_with 3) +/3 sample/0 sample/1 sample/2))))
(_.cover [/.together]
(and (/#= (/#composite sample/0 sample/1)
diff --git a/stdlib/source/test/lux/data/collection/set/multi.lux b/stdlib/source/test/lux/data/collection/set/multi.lux
index 73dba4b3e..755efb685 100644
--- a/stdlib/source/test/lux/data/collection/set/multi.lux
+++ b/stdlib/source/test/lux/data/collection/set/multi.lux
@@ -1,25 +1,25 @@
(.using
- [library
- [lux "*"
- ["_" test {"+" Test}]
- [abstract
- [hash {"+" Hash}]
- [monad {"+" do}]
- ["[0]" predicate]
- [\\specification
- ["$[0]" equivalence]
- ["$[0]" hash]]]
- [data
- ["[0]" bit ("[1]#[0]" equivalence)]
- [collection
- ["[0]" set]
- ["[0]" list ("[1]#[0]" mix)]]]
- [math
- ["[0]" random {"+" Random}]
- [number
- ["n" nat]]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]
+ [abstract
+ [hash {"+" Hash}]
+ [monad {"+" do}]
+ ["[0]" predicate]
+ [\\specification
+ ["$[0]" equivalence]
+ ["$[0]" hash]]]
+ [data
+ ["[0]" bit ("[1]#[0]" equivalence)]
+ [collection
+ ["[0]" set]
+ ["[0]" list ("[1]#[0]" mix)]]]
+ [math
+ ["[0]" random {"+" Random}]
+ [number
+ ["n" nat]]]]]
+ [\\library
+ ["[0]" /]])
(def: count
(Random Nat)
@@ -33,7 +33,7 @@
(in (list#mix (function (_ [count element] set)
(/.has count element set))
(/.empty hash)
- (list.zipped/2 element_counts
+ (list.zipped_2 element_counts
(set.list elements))))))
(def: signature
diff --git a/stdlib/source/test/lux/data/collection/tree/finger.lux b/stdlib/source/test/lux/data/collection/tree/finger.lux
index 06c77591e..85c5ec037 100644
--- a/stdlib/source/test/lux/data/collection/tree/finger.lux
+++ b/stdlib/source/test/lux/data/collection/tree/finger.lux
@@ -89,7 +89,7 @@
(let [tree (list#mix (function (_ [tag value] tree)
(# builder branch tree (# builder leaf tag value)))
(# builder leaf tags/H values/H)
- (list.zipped/2 tags/T values/T))]
+ (list.zipped_2 tags/T values/T))]
(and (# tags_equivalence = (list& tags/H tags/T) (/.tags tree))
(# values_equivalence = (list& values/H values/T) (/.values tree))))))
(_.cover [/.one]
diff --git a/stdlib/source/test/lux/data/format/json.lux b/stdlib/source/test/lux/data/format/json.lux
index 08e87df0f..3d10458af 100644
--- a/stdlib/source/test/lux/data/format/json.lux
+++ b/stdlib/source/test/lux/data/format/json.lux
@@ -1,35 +1,35 @@
(.using
- [library
- [lux "*"
- ["_" test {"+" Test}]
- ["[0]" meta]
- [abstract
- [monad {"+" do}]
- [\\specification
- ["$[0]" equivalence]
- ["$[0]" codec]]]
- [control
- ["[0]" try ("[1]#[0]" functor)]]
- [data
- ["[0]" product]
- ["[0]" bit]
- ["[0]" text
- ["%" format {"+" format}]]
- [collection
- ["[0]" sequence]
- ["[0]" dictionary]
- ["[0]" set]
- ["[0]" list ("[1]#[0]" functor)]]]
- [math
- ["[0]" random {"+" Random}]
- [number
- ["n" nat]
- ["[0]" frac]]]
- ["[0]" macro
- ["[0]" syntax {"+" syntax:}]
- ["[0]" code]]]]
- [\\library
- ["[0]" / {"+" JSON} ("#[0]" equivalence)]])
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]
+ ["[0]" meta]
+ [abstract
+ [monad {"+" do}]
+ [\\specification
+ ["$[0]" equivalence]
+ ["$[0]" codec]]]
+ [control
+ ["[0]" try ("[1]#[0]" functor)]]
+ [data
+ ["[0]" product]
+ ["[0]" bit]
+ ["[0]" text
+ ["%" format {"+" format}]]
+ [collection
+ ["[0]" sequence]
+ ["[0]" dictionary]
+ ["[0]" set]
+ ["[0]" list ("[1]#[0]" functor)]]]
+ [math
+ ["[0]" random {"+" Random}]
+ [number
+ ["n" nat]
+ ["[0]" frac]]]
+ ["[0]" macro
+ ["[0]" syntax {"+" syntax:}]
+ ["[0]" code]]]]
+ [\\library
+ ["[0]" / {"+" JSON} ("#[0]" equivalence)]])
(def: .public random
(Random /.JSON)
@@ -90,7 +90,7 @@
(do random.monad
[keys (random.set text.hash 3 (random.ascii/alpha 1))
values (random.set frac.hash 3 random.safe_frac)
- .let [expected (list.zipped/2 (set.list keys)
+ .let [expected (list.zipped_2 (set.list keys)
(list#each (|>> {/.#Number}) (set.list values)))
object (/.object expected)]]
($_ _.and
diff --git a/stdlib/source/test/lux/data/text.lux b/stdlib/source/test/lux/data/text.lux
index 8503e08ac..8825bc192 100644
--- a/stdlib/source/test/lux/data/text.lux
+++ b/stdlib/source/test/lux/data/text.lux
@@ -204,10 +204,10 @@
(# /.equivalence =
(/.together (set.list characters))
(/.interposed "" (set.list characters)))))
- (_.cover [/.replaced/1]
+ (_.cover [/.replaced_once]
(# /.equivalence =
(# /.monoid composite post static)
- (/.replaced/1 pre post (# /.monoid composite pre static))))
+ (/.replaced_once pre post (# /.monoid composite pre static))))
(_.cover [/.split_by]
(case (/.split_by static ($_ (# /.monoid composite) pre static post))
{.#Some [left right]}
diff --git a/stdlib/source/test/lux/data/text/format.lux b/stdlib/source/test/lux/data/text/format.lux
index b8ebe1d7f..62dfcd17d 100644
--- a/stdlib/source/test/lux/data/text/format.lux
+++ b/stdlib/source/test/lux/data/text/format.lux
@@ -1,57 +1,57 @@
(.using
- [library
- [lux "*"
- ["_" test {"+" Test}]
- [abstract
- [monad {"+" do}]
- [equivalence {"+" Equivalence}]
- [functor
- [\\specification
- ["$[0]" contravariant]]]]
- [control
- ["[0]" try]]
- [data
- ["[0]" text ("[1]#[0]" equivalence)]
- ["[0]" bit]
- [format
- ["[0]" xml]
- ["[0]" json]]
- [collection
- ["[0]" list ("[1]#[0]" functor)]]]
- ["[0]" time
- ["[0]" day]
- ["[0]" month]
- ["[0]" instant]
- ["[0]" duration]
- ["[0]" date]]
- [math
- ["[0]" random {"+" Random} ("[1]#[0]" monad)]
- ["[0]" modulus]
- ["[0]" modular]
- [number
- ["[0]" nat]
- ["[0]" int]
- ["[0]" rev]
- ["[0]" frac]
- ["[0]" ratio]]]
- [macro
- ["[0]" code]]
- [meta
- ["[0]" location]
- ["[0]" symbol]]
- ["[0]" type]]]
- ["$[0]" /// "_"
- [format
- ["[1][0]" xml]
- ["[1][0]" json]]
- [//
- ["[1][0]" type]
- [macro
- ["[1][0]" code]]
- [meta
- ["[1][0]" symbol]]]]
- [\\library
- ["[0]" /]])
+ [library
+ [lux "*"
+ ["_" test {"+" Test}]
+ [abstract
+ [monad {"+" do}]
+ [equivalence {"+" Equivalence}]
+ [functor
+ [\\specification
+ ["$[0]" contravariant]]]]
+ [control
+ ["[0]" try]]
+ [data
+ ["[0]" text ("[1]#[0]" equivalence)]
+ ["[0]" bit]
+ [format
+ ["[0]" xml]
+ ["[0]" json]]
+ [collection
+ ["[0]" list ("[1]#[0]" functor)]]]
+ ["[0]" time
+ ["[0]" day]
+ ["[0]" month]
+ ["[0]" instant]
+ ["[0]" duration]
+ ["[0]" date]]
+ [math
+ ["[0]" random {"+" Random} ("[1]#[0]" monad)]
+ ["[0]" modulus]
+ ["[0]" modular]
+ [number
+ ["[0]" nat]
+ ["[0]" int]
+ ["[0]" rev]
+ ["[0]" frac]
+ ["[0]" ratio]]]
+ [macro
+ ["[0]" code]]
+ [meta
+ ["[0]" location]
+ ["[0]" symbol]]
+ ["[0]" type]]]
+ ["$[0]" /// "_"
+ [format
+ ["[1][0]" xml]
+ ["[1][0]" json]]
+ [//
+ ["[1][0]" type]
+ [macro
+ ["[1][0]" code]]
+ [meta
+ ["[1][0]" symbol]]]]
+ [\\library
+ ["[0]" /]])
(implementation: (equivalence example)
(All (_ a) (-> a (Equivalence (/.Format a))))
@@ -96,25 +96,25 @@
[/.date date.codec random.date]
[/.time time.codec random.time]
- [/.nat/2 nat.binary random.nat]
- [/.nat/8 nat.octal random.nat]
- [/.nat/10 nat.decimal random.nat]
- [/.nat/16 nat.hex random.nat]
+ [/.nat_2 nat.binary random.nat]
+ [/.nat_8 nat.octal random.nat]
+ [/.nat_10 nat.decimal random.nat]
+ [/.nat_16 nat.hex random.nat]
- [/.int/2 int.binary random.int]
- [/.int/8 int.octal random.int]
- [/.int/10 int.decimal random.int]
- [/.int/16 int.hex random.int]
+ [/.int_2 int.binary random.int]
+ [/.int_8 int.octal random.int]
+ [/.int_10 int.decimal random.int]
+ [/.int_16 int.hex random.int]
- [/.rev/2 rev.binary random.rev]
- [/.rev/8 rev.octal random.rev]
- [/.rev/10 rev.decimal random.rev]
- [/.rev/16 rev.hex random.rev]
+ [/.rev_2 rev.binary random.rev]
+ [/.rev_8 rev.octal random.rev]
+ [/.rev_10 rev.decimal random.rev]
+ [/.rev_16 rev.hex random.rev]
- [/.frac/2 frac.binary random.frac]
- [/.frac/8 frac.octal random.frac]
- [/.frac/10 frac.decimal random.frac]
- [/.frac/16 frac.hex random.frac]
+ [/.frac_2 frac.binary random.frac]
+ [/.frac_8 frac.octal random.frac]
+ [/.frac_10 frac.decimal random.frac]
+ [/.frac_16 frac.hex random.frac]
))
)))
diff --git a/stdlib/source/test/lux/ffi.jvm.lux b/stdlib/source/test/lux/ffi.jvm.lux
index 2db7c0bc3..6169ba219 100644
--- a/stdlib/source/test/lux/ffi.jvm.lux
+++ b/stdlib/source/test/lux/ffi.jvm.lux
@@ -578,11 +578,11 @@
(n.= expected
(.nat (/.of_long (test/TestClass6::actual6 (/.as_long (.int expected)) object/7))))
- example/8!
+ example_8!
(let [expected (i.+ left right)
- object/8 (test/TestClass8::new)]
+ object_8 (test/TestClass8::new)]
(i.= expected
- (/.of_long (test/TestInterface4::actual4 (/.as_long left) (/.as_long right) object/8))))]
+ (/.of_long (test/TestInterface4::actual4 (/.as_long left) (/.as_long right) object_8))))]
.let [random_long (is (Random java/lang/Long)
(# ! each (|>> /.as_long)
@@ -609,7 +609,7 @@
example/4!
example/5!
example/7!
- example/8!))
+ example_8!))
(_.cover [/.do_to]
example/9!)
)))
diff --git a/stdlib/source/test/lux/math/number/complex.lux b/stdlib/source/test/lux/math/number/complex.lux
index bfee3adcc..7bdc17274 100644
--- a/stdlib/source/test/lux/math/number/complex.lux
+++ b/stdlib/source/test/lux/math/number/complex.lux
@@ -185,7 +185,7 @@
(and reciprocal!
own_inverse!)))
(_.cover [/.signum]
- ... Absolute value of signum is always root/2(2), 1 or 0.
+ ... Absolute value of signum is always root_2(2), 1 or 0.
(let [signum_abs (|> x /.signum /.abs)]
(or (f.= +0.0 signum_abs)
(f.= +1.0 signum_abs)
@@ -245,8 +245,8 @@
(do random.monad
[x ..random]
($_ _.and
- (_.cover [/.pow /.root/2]
- (|> x (/.pow (/.complex +2.0)) /.root/2 (/.approximately? ..margin_of_error x)))
+ (_.cover [/.pow /.root_2]
+ (|> x (/.pow (/.complex +2.0)) /.root_2 (/.approximately? ..margin_of_error x)))
(_.cover [/.pow']
(|> x (/.pow' +2.0) (/.pow' +0.5) (/.approximately? ..margin_of_error x)))
(_.cover [/.log /.exp]
diff --git a/stdlib/source/test/lux/math/number/frac.lux b/stdlib/source/test/lux/math/number/frac.lux
index 4aec70f14..22f56af05 100644
--- a/stdlib/source/test/lux/math/number/frac.lux
+++ b/stdlib/source/test/lux/math/number/frac.lux
@@ -181,15 +181,15 @@
(let [round'd (/.round sample)]
(and (|> round'd /.int i.frac (/.= round'd))
(/.<= +1.0 (/.abs (/.- sample round'd))))))
- (_.cover [/.root/2]
+ (_.cover [/.root_2]
(let [sample (/.abs sample)]
(|> sample
- /.root/2
+ /.root_2
(/.pow +2.0)
(/.approximately? ..margin_of_error sample))))
- (_.cover [/.root/3]
+ (_.cover [/.root_3]
(|> sample
- /.root/3
+ /.root_3
(/.pow +3.0)
(/.approximately? ..margin_of_error sample)))
))
@@ -252,17 +252,17 @@
tau/4 (/./ +4.0 /.tau)]
x (# ! each (/.* tau/4) random.safe_frac)
y (# ! each (/.* tau/4) random.safe_frac)]
- (_.cover [/.atan/2]
- (let [expected (/.atan/2 x y)
+ (_.cover [/.atan_2]
+ (let [expected (/.atan_2 x y)
actual (if (/.> +0.0 x)
(/.atan (/./ x y))
(if (/.< +0.0 y)
(/.- /.pi (/.atan (/./ x y)))
(/.+ /.pi (/.atan (/./ x y)))))]
(and (~= expected actual)
- (~= tau/4 (/.atan/2 +0.0 (/.abs y)))
- (~= (/.opposite tau/4) (/.atan/2 +0.0 (/.opposite (/.abs y))))
- (/.not_a_number? (/.atan/2 +0.0 +0.0))))))
+ (~= tau/4 (/.atan_2 +0.0 (/.abs y)))
+ (~= (/.opposite tau/4) (/.atan_2 +0.0 (/.opposite (/.abs y))))
+ (/.not_a_number? (/.atan_2 +0.0 +0.0))))))
(do [! random.monad]
[of (# ! each (|>> (n.% 10) ++) random.nat)]
(_.cover [/.factorial]
diff --git a/stdlib/source/test/lux/target/js.lux b/stdlib/source/test/lux/target/js.lux
index 7d6ef0284..df2857108 100644
--- a/stdlib/source/test/lux/target/js.lux
+++ b/stdlib/source/test/lux/target/js.lux
@@ -48,10 +48,10 @@
(try.else false)))
(template [<range>]
- [(`` (def: (~~ (template.symbol ["as_int/" <range>]))
+ [(`` (def: (~~ (template.symbol ["as_int_" <range>]))
(-> Int Int)
(|>> (i64.and (static.nat (-- (i64.left_shifted <range> 1)))))))
- (`` (def: (~~ (template.symbol ["int/" <range>]))
+ (`` (def: (~~ (template.symbol ["int_" <range>]))
(Random Int)
(do [! random.monad]
[negative? random.bit
@@ -71,7 +71,7 @@
(do [! random.monad]
[boolean random.bit
number random.frac
- int ..int/32
+ int ..int_32
string (random.ascii/upper 5)]
($_ _.and
(_.cover [/.null]
@@ -152,11 +152,11 @@
(def: test|i32
Test
(do [! random.monad]
- [left ..int/32
- right ..int/32
+ [left ..int_32
+ right ..int_32
- i32 ..int/32
- i16 ..int/16
+ i32 ..int_32
+ i16 ..int_16
shift (# ! each (n.% 16) random.nat)]
(`` ($_ _.and
(~~ (template [<js> <lux>]
@@ -185,7 +185,7 @@
(/.left_shift (/.int (.int shift))
(/.i32 i16)))))
(_.cover [/.logic_right_shift]
- (let [expected (i64.right_shifted shift (as_int/32 i16))]
+ (let [expected (i64.right_shifted shift (as_int_32 i16))]
(expression (|>> (as Frac) f.int (i.= expected))
(/.logic_right_shift (/.int (.int shift))
(/.i32 i16)))))
@@ -196,8 +196,8 @@
(/.i32 i16)))))
(_.cover [/.bit_not]
(let [expected (if (i.< +0 i32)
- (as_int/32 (i64.not i32))
- (i64.not (as_int/32 i32)))]
+ (as_int_32 (i64.not i32))
+ (i64.not (as_int_32 i32)))]
(expression (|>> (as Frac) f.int (i.= expected))
(/.bit_not (/.i32 i32)))))
))))
@@ -332,18 +332,18 @@
($_ _.and
(_.cover [/.var]
(expression (|>> (as Frac) (f.= number/0))
- (/.apply/* (/.closure (list $foreign) (/.return $foreign))
+ (/.apply_* (/.closure (list $foreign) (/.return $foreign))
(list (/.number number/0)))))
(_.cover [/.define]
(expression (|>> (as Frac) (f.= number/1))
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.define $local (/.number number/1))
(/.return $local)))
(list (/.number number/0)))))
(_.cover [/.declare]
(expression (|>> (as Frac) (f.= number/1))
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.declare $local)
(/.set $local (/.number number/1))
@@ -355,20 +355,20 @@
Test
(do [! random.monad]
[number/0 random.safe_frac
- int/0 ..int/16
+ int/0 ..int_16
$foreign (# ! each /.var (random.ascii/lower 10))
field (random.ascii/upper 10)]
($_ _.and
(_.cover [/.set]
(and (expression (|>> (as Frac) (f.= (f.+ number/0 number/0)))
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.+ $foreign $foreign))
(/.return $foreign)))
(list (/.number number/0))))
(expression (|>> (as Frac) (f.= (f.+ number/0 number/0)))
(let [@ (/.at (/.int +0) $foreign)]
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.array (list $foreign)))
(/.set @ (/.+ @ @))
@@ -376,7 +376,7 @@
(list (/.number number/0)))))
(expression (|>> (as Frac) (f.= (f.+ number/0 number/0)))
(let [@ (/.the field $foreign)]
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.object (list [field $foreign])))
(/.set @ (/.+ @ @))
@@ -384,18 +384,18 @@
(list (/.number number/0)))))))
(_.cover [/.delete]
(and (and (expression (|>> (as Bit))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
($_ /.then
(/.set $foreign (/.number number/0))
(/.return (/.delete $foreign))))
(list)))
(expression (|>> (as Bit) not)
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
(/.return (/.delete $foreign)))
(list (/.number number/0)))))
(expression (|>> (as Bit))
(let [@ (/.at (/.int +0) $foreign)]
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.array (list $foreign)))
(/.return (|> (/.= (/.boolean true) (/.delete @))
@@ -403,7 +403,7 @@
(list (/.number number/0)))))
(expression (|>> (as Bit))
(let [@ (/.the field $foreign)]
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.object (list [field $foreign])))
(/.return (|> (/.= (/.boolean true) (/.delete @))
@@ -413,14 +413,14 @@
(_.cover [/.Access]
(`` (and (~~ (template [<js> <lux>]
[(expression (|>> (as Frac) f.int (i.= (<lux> int/0)))
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.statement (<js> $foreign))
(/.return $foreign)))
(list (/.int int/0))))
(expression (|>> (as Frac) f.int (i.= (<lux> int/0)))
(let [@ (/.at (/.int +0) $foreign)]
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.array (list $foreign)))
(/.statement (<js> @))
@@ -428,7 +428,7 @@
(list (/.int int/0)))))
(expression (|>> (as Frac) f.int (i.= (<lux> int/0)))
(let [@ (/.the field $foreign)]
- (/.apply/* (/.closure (list $foreign)
+ (/.apply_* (/.closure (list $foreign)
($_ /.then
(/.set $foreign (/.object (list [field $foreign])))
(/.statement (<js> @))
@@ -445,7 +445,7 @@
(def: test|label
Test
(do [! random.monad]
- [input ..int/16
+ [input ..int_16
full_inner_iterations (# ! each (|>> (n.% 20) ++) random.nat)
expected_inner_iterations (# ! each (n.% full_inner_iterations) random.nat)
@@ -462,7 +462,7 @@
(_.cover [/.break]
(let [expected (i.* (.int expected_inner_iterations) input)]
(expression (|>> (as Frac) f.int (i.= expected))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $inner_index (/.int +0))
(/.define $output (/.int +0))
@@ -478,7 +478,7 @@
(_.cover [/.continue]
(let [expected (i.* (.int (n.- expected_inner_iterations full_inner_iterations)) input)]
(expression (|>> (as Frac) f.int (i.= expected))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $inner_index (/.int +0))
(/.define $output (/.int +0))
@@ -498,7 +498,7 @@
expected_inner_iterations))
input)]
(expression (|>> (as Frac) f.int (i.= expected))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $output (/.int +0))
(/.define $outer_index (/.int +0))
@@ -524,7 +524,7 @@
(n.- expected_inner_iterations full_inner_iterations)))
input)]
(expression (|>> (as Frac) f.int (i.= expected))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $output (/.int +0))
(/.define $outer_index (/.int +0))
@@ -552,7 +552,7 @@
(def: test|loop
Test
(do [! random.monad]
- [input ..int/16
+ [input ..int_16
iterations (# ! each (n.% 10) random.nat)
.let [$input (/.var "input")
$output (/.var "output")
@@ -562,7 +562,7 @@
($_ _.and
(_.cover [/.while]
(expression (|>> (as Frac) f.int (i.= expected|while))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $index (/.int +0))
(/.define $output (/.int +0))
@@ -575,7 +575,7 @@
(list (/.int input)))))
(_.cover [/.do_while]
(expression (|>> (as Frac) f.int (i.= expected|do_while))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $index (/.int +0))
(/.define $output (/.int +0))
@@ -588,7 +588,7 @@
(list (/.int input)))))
(_.cover [/.for]
(expression (|>> (as Frac) f.int (i.= expected|while))
- (/.apply/* (/.closure (list $input)
+ (/.apply_* (/.closure (list $input)
($_ /.then
(/.define $output (/.int +0))
(/.for $index (/.int +0)
@@ -611,13 +611,13 @@
($_ _.and
(_.cover [/.try]
(expression (|>> (as Frac) (f.= expected))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
(/.try (/.return (/.number expected))
[$ex (/.return (/.number dummy))]))
(list))))
(_.cover [/.throw]
(expression (|>> (as Frac) (f.= expected))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
(/.try ($_ /.then
(/.throw (/.number expected))
(/.return (/.number dummy)))
@@ -635,24 +635,24 @@
$arg/1 (# ! each /.var (random.ascii/lower 11))
$arg/2 (# ! each /.var (random.ascii/lower 12))]
(`` ($_ _.and
- (_.cover [/.apply/1]
+ (_.cover [/.apply_1]
(expression (|>> (as Frac) (f.= number/0))
- (/.apply/1 (/.closure (list $arg/0) (/.return $arg/0))
+ (/.apply_1 (/.closure (list $arg/0) (/.return $arg/0))
(/.number number/0))))
- (_.cover [/.apply/2]
+ (_.cover [/.apply_2]
(expression (|>> (as Frac) (f.= ($_ f.+ number/0 number/1)))
- (/.apply/2 (/.closure (list $arg/0 $arg/1) (/.return ($_ /.+ $arg/0 $arg/1)))
+ (/.apply_2 (/.closure (list $arg/0 $arg/1) (/.return ($_ /.+ $arg/0 $arg/1)))
(/.number number/0)
(/.number number/1))))
- (_.cover [/.apply/3]
+ (_.cover [/.apply_3]
(expression (|>> (as Frac) (f.= ($_ f.+ number/0 number/1 number/2)))
- (/.apply/3 (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2)))
+ (/.apply_3 (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2)))
(/.number number/0)
(/.number number/1)
(/.number number/2))))
- (_.cover [/.apply/*]
+ (_.cover [/.apply_*]
(expression (|>> (as Frac) (f.= ($_ f.+ number/0 number/1 number/2)))
- (/.apply/* (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2)))
+ (/.apply_* (/.closure (list $arg/0 $arg/1 $arg/2) (/.return ($_ /.+ $arg/0 $arg/1 $arg/2)))
(list (/.number number/0)
(/.number number/1)
(/.number number/2)))))
@@ -670,29 +670,29 @@
($_ _.and
(_.cover [/.closure /.return]
(expression (|>> (as Frac) (f.= number/0))
- (/.apply/* (/.closure (list) (/.return (/.number number/0)))
+ (/.apply_* (/.closure (list) (/.return (/.number number/0)))
(list))))
(_.cover [/.function]
(expression (|>> (as Frac) f.nat (n.= iterations))
- (/.apply/1 (/.function $self (list $arg/0)
+ (/.apply_1 (/.function $self (list $arg/0)
(/.return (/.? (/.< (/.int (.int iterations)) $arg/0)
- (/.apply/1 $self (/.+ (/.int +1) $arg/0))
+ (/.apply_1 $self (/.+ (/.int +1) $arg/0))
$arg/0)))
(/.int +0))))
(_.cover [/.function_definition]
(expression (|>> (as Frac) f.nat (n.= iterations))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
($_ /.then
(/.function_definition $self (list $arg/0)
(/.return (/.? (/.< (/.int (.int iterations)) $arg/0)
- (/.apply/1 $self (/.+ (/.int +1) $arg/0))
+ (/.apply_1 $self (/.+ (/.int +1) $arg/0))
$arg/0)))
- (/.return (/.apply/1 $self (/.int +0)))))
+ (/.return (/.apply_1 $self (/.int +0)))))
(list))))
(_.cover [/.new]
(let [$this (/.var "this")]
(expression (|>> (as Frac) (f.= number/0))
- (/.apply/1 (/.closure (list $arg/0)
+ (/.apply_1 (/.closure (list $arg/0)
($_ /.then
(/.function_definition $class (list)
(/.set (/.the field $this) $arg/0))
@@ -717,18 +717,18 @@
$arg/1 (/.var arg/1)
$arg/2 (/.var arg/2)]
??? random.bit
- int ..int/16]
+ int ..int_16]
($_ _.and
(_.cover [/.if]
(expression (|>> (as Frac) (f.= (if ??? number/0 number/1)))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
(/.if (/.boolean ???)
(/.return (/.number number/0))
(/.return (/.number number/1))))
(list))))
(_.cover [/.when]
(expression (|>> (as Frac) (f.= (if ??? number/0 number/1)))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
($_ /.then
(/.when (/.boolean ???)
(/.return (/.number number/0)))
@@ -739,21 +739,21 @@
number/1' (%.frac number/1)
number/2' (%.frac number/2)]
(and (expression (|>> (as Text) (text#= number/0'))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
(/.switch (/.number number/0)
(list [(list (/.number number/0)) (/.return (/.string number/0'))]
[(list (/.number number/1)) (/.return (/.string number/1'))])
{.#None}))
(list)))
(expression (|>> (as Text) (text#= number/1'))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
(/.switch (/.number number/1)
(list [(list (/.number number/0)) (/.return (/.string number/0'))]
[(list (/.number number/1)) (/.return (/.string number/1'))])
{.#Some (/.return (/.string number/2'))}))
(list)))
(expression (|>> (as Text) (text#= number/2'))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
(/.switch (/.number number/2)
(list [(list (/.number number/0)) (/.return (/.string number/0'))]
[(list (/.number number/1)) (/.return (/.string number/1'))])
@@ -772,11 +772,11 @@
$arg/1 (# ! each /.var (random.ascii/lower 11))
$arg/2 (# ! each /.var (random.ascii/lower 12))
??? random.bit
- int ..int/16]
+ int ..int_16]
(`` ($_ _.and
(_.cover [/.statement]
(expression (|>> (as Frac) (f.= number/0))
- (/.apply/1 (/.closure (list $arg/0)
+ (/.apply_1 (/.closure (list $arg/0)
($_ /.then
(/.statement (/.+ $arg/0 $arg/0))
(/.return $arg/0)))
@@ -784,7 +784,7 @@
(~~ (template [<js> <lux>]
[(_.cover [<js>]
(expression (|>> (as Frac) f.int (i.= (<lux> int)))
- (/.apply/1 (/.closure (list $arg/0)
+ (/.apply_1 (/.closure (list $arg/0)
(/.return (/., (<js> $arg/0)
$arg/0)))
(/.int int))))]
@@ -794,7 +794,7 @@
))
(_.cover [/.then]
(expression (|>> (as Frac) (f.= number/0))
- (/.apply/2 (/.closure (list $arg/0 $arg/1)
+ (/.apply_2 (/.closure (list $arg/0 $arg/1)
($_ /.then
(/.return $arg/0)
(/.return $arg/1)))
@@ -802,14 +802,14 @@
(/.number number/1))))
(_.cover [/.use_strict]
(and (expression (|>> (as Frac) (f.= number/0))
- (/.apply/* (/.closure (list)
+ (/.apply_* (/.closure (list)
($_ /.then
/.use_strict
(/.declare $arg/0)
(/.set $arg/0 (/.number number/0))
(/.return $arg/0)))
(list)))
- (|> (/.apply/* (/.closure (list)
+ (|> (/.apply_* (/.closure (list)
($_ /.then
/.use_strict
... (/.declare $arg/0)
diff --git a/stdlib/source/test/lux/target/lua.lux b/stdlib/source/test/lux/target/lua.lux
index 471aeb03a..3068a6e18 100644
--- a/stdlib/source/test/lux/target/lua.lux
+++ b/stdlib/source/test/lux/target/lua.lux
@@ -359,7 +359,7 @@
(do [! random.monad]
[float/0 random.safe_frac
float/1 random.safe_frac
- int/0 ..int/16
+ int/0 ..int_16
$foreign (# ! each /.var (random.ascii/lower 10))
$arg/0 (# ! each /.var (random.ascii/lower 11))
$arg/1 (# ! each /.var (random.ascii/lower 12))
@@ -409,7 +409,7 @@
(def: test|label
Test
(do [! random.monad]
- [input ..int/16
+ [input ..int_16
full_iterations (# ! each (|>> (n.% 20) ++) random.nat)
expected_iterations (# ! each (|>> (n.% full_iterations) .int) random.nat)
@@ -499,7 +499,7 @@
(def: test|loop
Test
(do [! random.monad]
- [input ..int/16
+ [input ..int_16
iterations (# ! each (n.% 10) random.nat)
.let [$input (/.var "input")
$output (/.var "output")
diff --git a/stdlib/source/test/lux/target/python.lux b/stdlib/source/test/lux/target/python.lux
index bca258d5e..1f53986c0 100644
--- a/stdlib/source/test/lux/target/python.lux
+++ b/stdlib/source/test/lux/target/python.lux
@@ -147,7 +147,7 @@
(/.the "major")
(/.= (/.int +3))))
-(def: int/16
+(def: int_16
(-> Int Int)
(i64.and (-- (i64.left_shifted 15 1))))
@@ -157,7 +157,7 @@
[left random.int
right random.int
- i16 (# ! each ..int/16 random.int)
+ i16 (# ! each ..int_16 random.int)
shift (# ! each (n.% 16) random.nat)]
(`` ($_ _.and
(~~ (template [</> <lux>]
diff --git a/stdlib/source/test/lux/target/ruby.lux b/stdlib/source/test/lux/target/ruby.lux
index 603cded95..968d3c7bd 100644
--- a/stdlib/source/test/lux/target/ruby.lux
+++ b/stdlib/source/test/lux/target/ruby.lux
@@ -138,7 +138,7 @@
))
))))
-(def: int/16
+(def: int_16
(-> Int Int)
(i64.and (-- (i64.left_shifted 15 1))))
@@ -148,7 +148,7 @@
[left random.int
right random.int
- i16 (# ! each ..int/16 random.int)
+ i16 (# ! each ..int_16 random.int)
shift (# ! each (n.% 16) random.nat)]
(`` ($_ _.and
(~~ (template [</> <lux>]
@@ -630,7 +630,7 @@
(expression (|>> (as Int) .nat (n.= arity))
(|> (/.return (/.the "length" $inputs))
[(list (/.variadic_kv $inputs))] (/.lambda {.#None})
- (/.apply_lambda/* (list (/.double_splat (/.hash (list.zipped/2 keys vals)))))))))
+ (/.apply_lambda/* (list (/.double_splat (/.hash (list.zipped_2 keys vals)))))))))
)))
(def: test|var
@@ -716,7 +716,7 @@
(def: test|label
Test
(do [! random.monad]
- [input (# ! each ..int/16 random.int)
+ [input (# ! each ..int_16 random.int)
full_inner_iterations (# ! each (|>> (n.% 20) ++) random.nat)
expected_inner_iterations (# ! each (n.% full_inner_iterations) random.nat)
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
index aa0a98c6b..7750db2ed 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/analysis/complex.lux
@@ -113,7 +113,7 @@
(list.size actual))
(list.every? (function (_ [expected actual])
(analysed? expected actual))
- (list.zipped/2 expected actual)))
+ (list.zipped_2 expected actual)))
(^.template [<expected> <actual>]
[(pattern [[_ {<expected> expected}] (<actual> actual)])
@@ -312,7 +312,7 @@
(list.size actual))
(list.every? (function (_ [expected actual])
(..analysed? expected actual))
- (list.zipped/2 expected actual)))
+ (list.zipped_2 expected actual)))
_
false)))
@@ -337,7 +337,7 @@
(list.size actual))
(list.every? (function (_ [expected actual])
(..analysed? expected actual))
- (list.zipped/2 expected actual)))
+ (list.zipped_2 expected actual)))
_
false)))
@@ -355,7 +355,7 @@
(list.size actual))
(list.every? (function (_ [expected actual])
(..analysed? expected actual))
- (list.zipped/2 expected actual))
+ (list.zipped_2 expected actual))
(type#= productT :inferred:))
_
@@ -450,16 +450,16 @@
:record: {.#Named name (type.tuple (list#each product.left types/*,terms/*))}
tuple (list#each product.right types/*,terms/*)
local_record (|> tuple
- (list.zipped/2 (list#each (|>> [""] code.symbol) slots/0))
+ (list.zipped_2 (list#each (|>> [""] code.symbol) slots/0))
(list#each (function (_ [slot value])
(list slot value)))
list#conjoint)
global_record (|> tuple
- (list.zipped/2 (list#each (|>> [module] code.symbol) slots/0))
+ (list.zipped_2 (list#each (|>> [module] code.symbol) slots/0))
(list#each (function (_ [slot value])
(list slot value)))
list#conjoint)
- expected_record (list.zipped/2 (list#each (|>> [module]) slots/0)
+ expected_record (list.zipped_2 (list#each (|>> [module]) slots/0)
tuple)
head_slot/0 (|> slots/0 list.head maybe.trusted)
head_term/0 (|> types/*,terms/* list.head maybe.trusted product.right)
@@ -499,8 +499,8 @@
_
false)))))
(_.cover [/.order]
- (let [local_record (list.zipped/2 (list#each (|>> [""]) slots/0) tuple)
- global_record (list.zipped/2 (list#each (|>> [module]) slots/0) tuple)
+ (let [local_record (list.zipped_2 (list#each (|>> [""]) slots/0) tuple)
+ global_record (list.zipped_2 (list#each (|>> [module]) slots/0) tuple)
ordered? (is (-> Bit (List [Symbol Code]) Bit)
(function (_ pattern_matching? input)
(|> (do //phase.monad
@@ -556,8 +556,8 @@
(and (repeated? false)
(repeated? true))))
(_.cover [/.record_size_mismatch]
- (let [local_record (list.zipped/2 (list#each (|>> [""]) slots/0) tuple)
- global_record (list.zipped/2 (list#each (|>> [module]) slots/0) tuple)
+ (let [local_record (list.zipped_2 (list#each (|>> [""]) slots/0) tuple)
+ global_record (list.zipped_2 (list#each (|>> [module]) slots/0) tuple)
mismatched? (is (-> Bit (List [Symbol Code]) Bit)
(function (_ pattern_matching? input)
(|> (do //phase.monad
@@ -575,8 +575,8 @@
(mismatched? false (list#composite global_record (list.first slice global_record)))
(mismatched? true (list#composite global_record (list.first slice global_record))))))
(_.cover [/.slot_does_not_belong_to_record]
- (let [local_record (list.zipped/2 (list#each (|>> [""]) slots/01) tuple)
- global_record (list.zipped/2 (list#each (|>> [module]) slots/01) tuple)
+ (let [local_record (list.zipped_2 (list#each (|>> [""]) slots/01) tuple)
+ global_record (list.zipped_2 (list#each (|>> [module]) slots/01) tuple)
mismatched? (is (-> Bit (List [Symbol Code]) Bit)
(function (_ pattern_matching? input)
(|> (do //phase.monad
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
index aaa52ad0f..b65c3fa9d 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/case.lux
@@ -304,14 +304,14 @@
(in [(list#mix (function (_ left right)
{synthesis.#Alt left right})
(path (++ mid_size) true value/last body/last)
- (|> (list.zipped/2 value/mid body/mid)
+ (|> (list.zipped_2 value/mid body/mid)
{.#Item [value/first body/first]}
list.enumeration
(list#each (function (_ [lefts' [value body]])
(path lefts' false value body)))
list.reversed))
[(branch 0 false value/first body/first)
- (list#composite (|> (list.zipped/2 value/mid body/mid)
+ (list#composite (|> (list.zipped_2 value/mid body/mid)
list.enumeration
(list#each (function (_ [lefts' [value body]])
(branch (++ lefts') false value body))))
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
index ba3f7dc86..01ebdec3f 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/function.lux
@@ -450,7 +450,7 @@
(!expect (^.multi (pattern {try.#Success (synthesis.function/apply [funcS argsS])})
(and (//primitive.corresponds? funcA funcS)
(list.every? (product.uncurried //primitive.corresponds?)
- (list.zipped/2 argsA argsS))))))
+ (list.zipped_2 argsA argsS))))))
(|> (analysis.apply [funcA (list)])
(//.phase archive.empty)
(phase.result [///bundle.empty synthesis.init])
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
index 2de99cd64..33f3378a1 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/primitive.lux
@@ -66,7 +66,7 @@
(list.size actual))
(list.every? (function (_ [expected actual])
(corresponds? expected actual))
- (list.zipped/2 expected actual)))
+ (list.zipped_2 expected actual)))
_
false)))
diff --git a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
index 6adfb95b2..d0383c9a7 100644
--- a/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
+++ b/stdlib/source/test/lux/tool/compiler/language/lux/phase/synthesis/structure.lux
@@ -71,7 +71,7 @@
(pattern {try.#Success (////synthesis.tuple membersS)})
(and (n.= size (list.size membersS))
(list.every? (product.uncurried //primitive.corresponds?)
- (list.zipped/2 membersA membersS)))
+ (list.zipped_2 membersA membersS)))
_
false)))))
diff --git a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux
index d012390fc..595123f7f 100644
--- a/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux
+++ b/stdlib/source/test/lux/tool/compiler/meta/archive/registry.lux
@@ -146,7 +146,7 @@
(and (n.= expected_amount (sequence.size it))
(list.every? (function (_ [@it [it dependencies]])
(same? @it (the artifact.#id it)))
- (list.zipped/2 (sequence.list ids) (sequence.list it)))
+ (list.zipped_2 (sequence.list ids) (sequence.list it)))
(# (list.equivalence <equivalence>) = expected/* (<query> registry))))]
[/.definition /.definitions category.definition_equivalence (is (-> Text category.Definition)
diff --git a/stdlib/source/test/lux/world/output/video/resolution.lux b/stdlib/source/test/lux/world/output/video/resolution.lux
index 9e2ac6c29..9b385af95 100644
--- a/stdlib/source/test/lux/world/output/video/resolution.lux
+++ b/stdlib/source/test/lux/world/output/video/resolution.lux
@@ -24,9 +24,9 @@
/.wsvga
/.xga
/.xga+
- /.wxga/16:9
- /.wxga/5:3
- /.wxga/16:10
+ /.wxga_16:9
+ /.wxga_5:3
+ /.wxga_16:10
/.sxga
/.wxga+
/.hd+
diff --git a/stdlib/source/unsafe/lux/data/binary.lux b/stdlib/source/unsafe/lux/data/binary.lux
index 33d217c40..a32d5e4f2 100644
--- a/stdlib/source/unsafe/lux/data/binary.lux
+++ b/stdlib/source/unsafe/lux/data/binary.lux
@@ -124,7 +124,7 @@
<jvm> (.|> <jvm>
(.as .I64)
("lux i64 and" <byte_mask>))]
- (template: .public (bytes/1 index it)
+ (template: .public (bits_8 index it)
[(.<| (.as .I64)
(.is (.I64 .Any))
(`` (.for (~~ (.static @.old)) (~~ <jvm>)
@@ -150,40 +150,40 @@
(.i64 0)
(array.item <index> <it>)))))]))
-(template: .public (bytes/2 index' it')
+(template: .public (bits_16 index' it')
[(.<| (.let [index (.is Nat index')
it (.is ..Binary it')])
(.as .I64)
(.is (.I64 .Any))
(.$_ "lux i64 or"
- ("lux i64 left-shift" 8 (..bytes/1 index it))
- (..bytes/1 ("lux i64 +" 1 index) it)))])
+ ("lux i64 left-shift" 8 (..bits_8 index it))
+ (..bits_8 ("lux i64 +" 1 index) it)))])
-(template: .public (bytes/4 index' it')
+(template: .public (bits_32 index' it')
[(.<| (.let [index (.is Nat index')
it (.is ..Binary it')])
(.as .I64)
(.is (.I64 .Any))
(.$_ "lux i64 or"
- ("lux i64 left-shift" 24 (..bytes/1 index it))
- ("lux i64 left-shift" 16 (..bytes/1 ("lux i64 +" 1 index) it))
- ("lux i64 left-shift" 8 (..bytes/1 ("lux i64 +" 2 index) it))
- (..bytes/1 ("lux i64 +" 3 index) it)))])
+ ("lux i64 left-shift" 24 (..bits_8 index it))
+ ("lux i64 left-shift" 16 (..bits_8 ("lux i64 +" 1 index) it))
+ ("lux i64 left-shift" 8 (..bits_8 ("lux i64 +" 2 index) it))
+ (..bits_8 ("lux i64 +" 3 index) it)))])
-(template: .public (bytes/8 index' it')
+(template: .public (bits_64 index' it')
[(.<| (.let [index (.is Nat index')
it (.is ..Binary it')])
(.as .I64)
(.is (.I64 .Any))
(.$_ "lux i64 or"
- ("lux i64 left-shift" 56 (..bytes/1 index it))
- ("lux i64 left-shift" 48 (..bytes/1 ("lux i64 +" 1 index) it))
- ("lux i64 left-shift" 40 (..bytes/1 ("lux i64 +" 2 index) it))
- ("lux i64 left-shift" 32 (..bytes/1 ("lux i64 +" 3 index) it))
- ("lux i64 left-shift" 24 (..bytes/1 ("lux i64 +" 4 index) it))
- ("lux i64 left-shift" 16 (..bytes/1 ("lux i64 +" 5 index) it))
- ("lux i64 left-shift" 8 (..bytes/1 ("lux i64 +" 6 index) it))
- (..bytes/1 ("lux i64 +" 7 index) it)))])
+ ("lux i64 left-shift" 56 (..bits_8 index it))
+ ("lux i64 left-shift" 48 (..bits_8 ("lux i64 +" 1 index) it))
+ ("lux i64 left-shift" 40 (..bits_8 ("lux i64 +" 2 index) it))
+ ("lux i64 left-shift" 32 (..bits_8 ("lux i64 +" 3 index) it))
+ ("lux i64 left-shift" 24 (..bits_8 ("lux i64 +" 4 index) it))
+ ("lux i64 left-shift" 16 (..bits_8 ("lux i64 +" 5 index) it))
+ ("lux i64 left-shift" 8 (..bits_8 ("lux i64 +" 6 index) it))
+ (..bits_8 ("lux i64 +" 7 index) it)))])
(with_expansions [<byte> (hex "FF")
<it> (.is ..Binary it)
@@ -198,7 +198,7 @@
<jvm_value> <jvm_value>
<jvm_value> (ffi.long_to_byte <jvm_value>)
<jvm> (ffi.write! <index> <jvm_value> <it>)]
- (`` (template: .public (has/1! index value it)
+ (`` (template: .public (has_8! index value it)
[(.is ..Binary
(.for (~~ (.static @.old)) <jvm>
(~~ (.static @.jvm)) <jvm>
@@ -230,47 +230,47 @@
... Default
(array.has! <index> (.|> <value> .int ("lux i64 and" (.int <byte>))) <it>)))])))
-(template: .public (has/2! index' value' it)
+(template: .public (has_16! index' value' it)
[(.let [index (.is .Nat index')
value (.is (.I64 .Any) value')]
(.|> it
- (..has/1! index ("lux i64 right-shift" 8 value))
- (..has/1! ("lux i64 +" 1 index) value)))])
+ (..has_8! index ("lux i64 right-shift" 8 value))
+ (..has_8! ("lux i64 +" 1 index) value)))])
-(template: .public (has/4! index' value' it)
+(template: .public (has_32! index' value' it)
[(.let [index (.is .Nat index')
value (.is (.I64 .Any) value')]
(.|> it
- (..has/1! index ("lux i64 right-shift" 24 value))
- (..has/1! ("lux i64 +" 1 index) ("lux i64 right-shift" 16 value))
- (..has/1! ("lux i64 +" 2 index) ("lux i64 right-shift" 8 value))
- (..has/1! ("lux i64 +" 3 index) value)))])
+ (..has_8! index ("lux i64 right-shift" 24 value))
+ (..has_8! ("lux i64 +" 1 index) ("lux i64 right-shift" 16 value))
+ (..has_8! ("lux i64 +" 2 index) ("lux i64 right-shift" 8 value))
+ (..has_8! ("lux i64 +" 3 index) value)))])
-(`` (template: .public (has/8! index' value' it)
+(`` (template: .public (has_64! index' value' it)
[(.let [index (.is .Nat index')
value (.is (.I64 .Any) value')]
(.for (~~ (.static @.scheme)) (.let [write_high (.is (.-> ..Binary ..Binary)
- (.|>> (..has/1! index ("lux i64 right-shift" 56 value))
- (..has/1! ("lux i64 +" 1 index) ("lux i64 right-shift" 48 value))
- (..has/1! ("lux i64 +" 2 index) ("lux i64 right-shift" 40 value))
- (..has/1! ("lux i64 +" 3 index) ("lux i64 right-shift" 32 value))))
+ (.|>> (..has_8! index ("lux i64 right-shift" 56 value))
+ (..has_8! ("lux i64 +" 1 index) ("lux i64 right-shift" 48 value))
+ (..has_8! ("lux i64 +" 2 index) ("lux i64 right-shift" 40 value))
+ (..has_8! ("lux i64 +" 3 index) ("lux i64 right-shift" 32 value))))
write_low (.is (.-> ..Binary ..Binary)
- (.|>> (..has/1! ("lux i64 +" 4 index) ("lux i64 right-shift" 24 value))
- (..has/1! ("lux i64 +" 5 index) ("lux i64 right-shift" 16 value))
- (..has/1! ("lux i64 +" 6 index) ("lux i64 right-shift" 8 value))
- (..has/1! ("lux i64 +" 7 index) value)))]
+ (.|>> (..has_8! ("lux i64 +" 4 index) ("lux i64 right-shift" 24 value))
+ (..has_8! ("lux i64 +" 5 index) ("lux i64 right-shift" 16 value))
+ (..has_8! ("lux i64 +" 6 index) ("lux i64 right-shift" 8 value))
+ (..has_8! ("lux i64 +" 7 index) value)))]
(.|> it
write_high
write_low))
(.|> it
- (..has/1! index ("lux i64 right-shift" 56 value))
- (..has/1! ("lux i64 +" 1 index) ("lux i64 right-shift" 48 value))
- (..has/1! ("lux i64 +" 2 index) ("lux i64 right-shift" 40 value))
- (..has/1! ("lux i64 +" 3 index) ("lux i64 right-shift" 32 value))
- (..has/1! ("lux i64 +" 4 index) ("lux i64 right-shift" 24 value))
- (..has/1! ("lux i64 +" 5 index) ("lux i64 right-shift" 16 value))
- (..has/1! ("lux i64 +" 6 index) ("lux i64 right-shift" 8 value))
- (..has/1! ("lux i64 +" 7 index) value))))]))
+ (..has_8! index ("lux i64 right-shift" 56 value))
+ (..has_8! ("lux i64 +" 1 index) ("lux i64 right-shift" 48 value))
+ (..has_8! ("lux i64 +" 2 index) ("lux i64 right-shift" 40 value))
+ (..has_8! ("lux i64 +" 3 index) ("lux i64 right-shift" 32 value))
+ (..has_8! ("lux i64 +" 4 index) ("lux i64 right-shift" 24 value))
+ (..has_8! ("lux i64 +" 5 index) ("lux i64 right-shift" 16 value))
+ (..has_8! ("lux i64 +" 6 index) ("lux i64 right-shift" 8 value))
+ (..has_8! ("lux i64 +" 7 index) value))))]))
(with_expansions [<reference> (.is ..Binary reference')
<sample> (.is ..Binary sample')
@@ -287,8 +287,8 @@
(.if ("lux i64 =" limit index)
.true
(.and ("lux i64 ="
- (..bytes/1 index reference)
- (..bytes/1 index sample))
+ (..bits_8 index reference)
+ (..bits_8 index sample))
(again ("lux i64 +" 1 index))))))))])))
... TODO: Turn into a template ASAP.
@@ -307,8 +307,8 @@
(.loop (again [index 0])
(.if ("lux i64 <" (.int bytes) (.int index))
(.exec
- (..has/1! ("lux i64 +" target_offset index)
- (..bytes/1 ("lux i64 +" source_offset index) source)
+ (..has_8! ("lux i64 +" target_offset index)
+ (..bits_8 ("lux i64 +" source_offset index) source)
target)
(again ("lux i64 +" 1 index)))
target))))))