- The output directory is now being used as the cache.

- "input" has been renamed as "source" and "output" has been renamed as "target".

31 files changed, 8 insertions, 8 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
diff --git a/input/program.lux b/source/program.lux
index 984d8610f..052c0bf41 100644
--- a/input/program.lux
+++ b/source/program.lux
@@ -36,7 +36,7 @@
               (meta lux
                     macro
                     syntax)
-              math
+              (math #as m)
               ))
 
 (program args