diff options
Diffstat (limited to '')
-rw-r--r-- | source/lux.lux (renamed from input/lux.lux) | 10 | ||||
-rw-r--r-- | source/lux/codata/stream.lux (renamed from input/lux/codata/stream.lux) | 0 | ||||
-rw-r--r-- | source/lux/control/comonad.lux (renamed from input/lux/control/comonad.lux) | 0 | ||||
-rw-r--r-- | source/lux/control/functor.lux (renamed from input/lux/control/functor.lux) | 0 | ||||
-rw-r--r-- | source/lux/control/lazy.lux (renamed from input/lux/control/lazy.lux) | 0 | ||||
-rw-r--r-- | source/lux/control/monad.lux (renamed from input/lux/control/monad.lux) | 0 | ||||
-rw-r--r-- | source/lux/control/monoid.lux (renamed from input/lux/control/monoid.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/bool.lux (renamed from input/lux/data/bool.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/bounded.lux (renamed from input/lux/data/bounded.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/char.lux (renamed from input/lux/data/char.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/dict.lux (renamed from input/lux/data/dict.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/either.lux (renamed from input/lux/data/either.lux) | 2 | ||||
-rw-r--r-- | source/lux/data/eq.lux (renamed from input/lux/data/eq.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/error.lux (renamed from input/lux/data/error.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/id.lux (renamed from input/lux/data/id.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/io.lux (renamed from input/lux/data/io.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/list.lux (renamed from input/lux/data/list.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/maybe.lux (renamed from input/lux/data/maybe.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/number.lux (renamed from input/lux/data/number.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/ord.lux (renamed from input/lux/data/ord.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/reader.lux (renamed from input/lux/data/reader.lux) | 2 | ||||
-rw-r--r-- | source/lux/data/show.lux (renamed from input/lux/data/show.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/state.lux (renamed from input/lux/data/state.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/text.lux (renamed from input/lux/data/text.lux) | 0 | ||||
-rw-r--r-- | source/lux/data/writer.lux (renamed from input/lux/data/writer.lux) | 0 | ||||
-rw-r--r-- | source/lux/host/java.lux (renamed from input/lux/host/java.lux) | 0 | ||||
-rw-r--r-- | source/lux/math.lux (renamed from input/lux/math.lux) | 0 | ||||
-rw-r--r-- | source/lux/meta/lux.lux (renamed from input/lux/meta/lux.lux) | 0 | ||||
-rw-r--r-- | source/lux/meta/macro.lux (renamed from input/lux/meta/macro.lux) | 0 | ||||
-rw-r--r-- | source/lux/meta/syntax.lux (renamed from input/lux/meta/syntax.lux) | 0 |
30 files changed, 7 insertions, 7 deletions
diff --git a/input/lux.lux b/source/lux.lux index 61d99396c..50f8f1af2 100644 --- a/input/lux.lux +++ b/source/lux.lux @@ -1880,7 +1880,7 @@ (deftype Referrals (| #All (#Only (List Text)) - (#Except (List Text)) + (#Exclude (List Text)) #Nothing)) (deftype Import @@ -1896,7 +1896,7 @@ (return name) _ - (fail "only/except requires symbols.")))) + (fail "only/exclude requires symbols.")))) defs)) (def (parse-alias tokens) @@ -1921,10 +1921,10 @@ [defs' (extract-defs defs)] (return (: (, Referrals (List Syntax)) [(#Only defs') tokens']))) - (\ (#Meta [_ (#FormS (list& (#Meta [_ (#TagS ["" "except"])]) defs))])) + (\ (#Meta [_ (#FormS (list& (#Meta [_ (#TagS ["" "exclude"])]) defs))])) (do Lux/Monad [defs' (extract-defs defs)] - (return (: (, Referrals (List Syntax)) [(#Except defs') tokens']))) + (return (: (, Referrals (List Syntax)) [(#Exclude defs') tokens']))) _ (fail "Incorrect syntax for referral.")) @@ -2166,7 +2166,7 @@ [*defs (exported-defs m-name)] (;return (filter (is-member? +defs) *defs))) - (#Except -defs) + (#Exclude -defs) (do Lux/Monad [*defs (exported-defs m-name)] (;return (filter (. not (is-member? -defs)) *defs))) diff --git a/input/lux/codata/stream.lux b/source/lux/codata/stream.lux index 1d6dd1b50..1d6dd1b50 100644 --- a/input/lux/codata/stream.lux +++ b/source/lux/codata/stream.lux diff --git a/input/lux/control/comonad.lux b/source/lux/control/comonad.lux index 1830ff44f..1830ff44f 100644 --- a/input/lux/control/comonad.lux +++ b/source/lux/control/comonad.lux diff --git a/input/lux/control/functor.lux b/source/lux/control/functor.lux index 6a9dcfff8..6a9dcfff8 100644 --- a/input/lux/control/functor.lux +++ b/source/lux/control/functor.lux diff --git a/input/lux/control/lazy.lux b/source/lux/control/lazy.lux index 22dac74fe..22dac74fe 100644 --- a/input/lux/control/lazy.lux +++ b/source/lux/control/lazy.lux diff --git a/input/lux/control/monad.lux b/source/lux/control/monad.lux index b5552f987..b5552f987 100644 --- a/input/lux/control/monad.lux +++ b/source/lux/control/monad.lux diff --git a/input/lux/control/monoid.lux b/source/lux/control/monoid.lux index d32baabc5..d32baabc5 100644 --- a/input/lux/control/monoid.lux +++ b/source/lux/control/monoid.lux diff --git a/input/lux/data/bool.lux b/source/lux/data/bool.lux index d4f223612..d4f223612 100644 --- a/input/lux/data/bool.lux +++ b/source/lux/data/bool.lux diff --git a/input/lux/data/bounded.lux b/source/lux/data/bounded.lux index 9d2dabde1..9d2dabde1 100644 --- a/input/lux/data/bounded.lux +++ b/source/lux/data/bounded.lux diff --git a/input/lux/data/char.lux b/source/lux/data/char.lux index 42e57509e..42e57509e 100644 --- a/input/lux/data/char.lux +++ b/source/lux/data/char.lux diff --git a/input/lux/data/dict.lux b/source/lux/data/dict.lux index 63a66d49b..63a66d49b 100644 --- a/input/lux/data/dict.lux +++ b/source/lux/data/dict.lux diff --git a/input/lux/data/either.lux b/source/lux/data/either.lux index 7166688b5..eba6438db 100644 --- a/input/lux/data/either.lux +++ b/source/lux/data/either.lux @@ -7,7 +7,7 @@ ## You must not remove this notice, or any other, from this software. (;import lux - (lux/data (list #refer (#except partition)))) + (lux/data (list #refer (#exclude partition)))) ## [Types] ## (deftype (Either l r) diff --git a/input/lux/data/eq.lux b/source/lux/data/eq.lux index be3400208..be3400208 100644 --- a/input/lux/data/eq.lux +++ b/source/lux/data/eq.lux diff --git a/input/lux/data/error.lux b/source/lux/data/error.lux index cb5c309a6..cb5c309a6 100644 --- a/input/lux/data/error.lux +++ b/source/lux/data/error.lux diff --git a/input/lux/data/id.lux b/source/lux/data/id.lux index 0e3bdbee6..0e3bdbee6 100644 --- a/input/lux/data/id.lux +++ b/source/lux/data/id.lux diff --git a/input/lux/data/io.lux b/source/lux/data/io.lux index c08023df5..c08023df5 100644 --- a/input/lux/data/io.lux +++ b/source/lux/data/io.lux diff --git a/input/lux/data/list.lux b/source/lux/data/list.lux index 450dee275..450dee275 100644 --- a/input/lux/data/list.lux +++ b/source/lux/data/list.lux diff --git a/input/lux/data/maybe.lux b/source/lux/data/maybe.lux index faec53c2e..faec53c2e 100644 --- a/input/lux/data/maybe.lux +++ b/source/lux/data/maybe.lux diff --git a/input/lux/data/number.lux b/source/lux/data/number.lux index 8da674d88..8da674d88 100644 --- a/input/lux/data/number.lux +++ b/source/lux/data/number.lux diff --git a/input/lux/data/ord.lux b/source/lux/data/ord.lux index 80f2e4fb5..80f2e4fb5 100644 --- a/input/lux/data/ord.lux +++ b/source/lux/data/ord.lux diff --git a/input/lux/data/reader.lux b/source/lux/data/reader.lux index c3bbc2830..e91687c3a 100644 --- a/input/lux/data/reader.lux +++ b/source/lux/data/reader.lux @@ -6,7 +6,7 @@ ## the terms of this license. ## You must not remove this notice, or any other, from this software. -(;import (lux #refer (#except Reader)) +(;import (lux #refer (#exclude Reader)) (lux/control (functor #as F #refer #all) (monad #as M #refer #all))) diff --git a/input/lux/data/show.lux b/source/lux/data/show.lux index f4e1cf762..f4e1cf762 100644 --- a/input/lux/data/show.lux +++ b/source/lux/data/show.lux diff --git a/input/lux/data/state.lux b/source/lux/data/state.lux index bc9858a29..bc9858a29 100644 --- a/input/lux/data/state.lux +++ b/source/lux/data/state.lux diff --git a/input/lux/data/text.lux b/source/lux/data/text.lux index a3192a1d5..a3192a1d5 100644 --- a/input/lux/data/text.lux +++ b/source/lux/data/text.lux diff --git a/input/lux/data/writer.lux b/source/lux/data/writer.lux index f71492e35..f71492e35 100644 --- a/input/lux/data/writer.lux +++ b/source/lux/data/writer.lux diff --git a/input/lux/host/java.lux b/source/lux/host/java.lux index 12525d3f2..12525d3f2 100644 --- a/input/lux/host/java.lux +++ b/source/lux/host/java.lux diff --git a/input/lux/math.lux b/source/lux/math.lux index 2e29c5da7..2e29c5da7 100644 --- a/input/lux/math.lux +++ b/source/lux/math.lux diff --git a/input/lux/meta/lux.lux b/source/lux/meta/lux.lux index a28d6e5d4..a28d6e5d4 100644 --- a/input/lux/meta/lux.lux +++ b/source/lux/meta/lux.lux diff --git a/input/lux/meta/macro.lux b/source/lux/meta/macro.lux index 22aeaf874..22aeaf874 100644 --- a/input/lux/meta/macro.lux +++ b/source/lux/meta/macro.lux diff --git a/input/lux/meta/syntax.lux b/source/lux/meta/syntax.lux index 1fe85c32f..1fe85c32f 100644 --- a/input/lux/meta/syntax.lux +++ b/source/lux/meta/syntax.lux |