Re-organized logic modules and function poly(morph|typ)ism modules.

LuxLang · Aug 15, 2024 · 5101783 · 5101783
1 parent fbe7e46
commit 5101783
Show file tree

Hide file tree

Showing 207 changed files with 388 additions and 239 deletions.
diff --git a/stdlib/source/library/lux/abstract/functor.lux b/stdlib/source/library/lux/abstract/functor.lux
@@ -5,7 +5,8 @@
  [library
   [lux (.except function)
    [function
-    ["//" polytypism]]]])
+    [poly
+     ["//" type]]]]])
 
 ... https://en.wikipedia.org/wiki/Functor
 (every .public (Functor !)

diff --git a/stdlib/source/library/lux/abstract/functor/effect.lux b/stdlib/source/library/lux/abstract/functor/effect.lux
@@ -5,7 +5,8 @@
  [library
   [lux (.except Or or)
    [function
-    ["[0]" polytypism]]]]
+    [poly
+     ["[0]" type]]]]]
  ["[0]" // (.only Functor)])
 
 (every .public (Effect input output !)
@@ -19,7 +20,7 @@
      [input (|>> next on)])))
 
 (the .public Or
-  polytypism.Sum)
+  type.Sum)
 
 (the .public or
   //.sum)
diff --git a/stdlib/source/library/lux/compiler/default/platform.lux b/stdlib/source/library/lux/compiler/default/platform.lux
@@ -15,7 +15,6 @@
     ["[0]" exception (.only Exception)]]
    ["[0]" function]
    [data
-    ["[0]" bit]
     ["[0]" sum]
     ["[0]" product]
     ["[0]" binary (.only Binary)

diff --git a/stdlib/source/library/lux/compiler/language/lux/analysis/complex.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/complex.lux
@@ -9,11 +9,12 @@
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]]
    [data
-    ["[0]" bit]
     ["[0]" text (.only)
      ["%" \\injection]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/compiler/language/lux/analysis/coverage.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/coverage.lux
@@ -17,14 +17,15 @@
     ["[0]" exception (.only Exception)]]
    [data
     ["[0]" product]
-    ["[0]" bit]
     ["[0]" text (.only)
      ["%" \\injection]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix)]
      ["[0]" stack]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" set (.only Set)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/compiler/language/lux/analysis/simple.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/simple.lux
@@ -7,9 +7,10 @@
    [abstract
     [equivalence (.only Equivalence)]]
    [data
-    ["[0]" bit]
     ["[0]" text (.only Injection)
      ["%" \\injection]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/analysis/complex.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis/complex.lux
@@ -14,14 +14,15 @@
     ["[0]" try]
     ["[0]" exception (.only Exception)]]
    [data
-    ["[0]" bit]
     ["[0]" product]
     ["[0]" text (.only)
      ["%" \\injection]]
     [collection
      ["[0]" list (.use "[1]#[0]" monad)]
      ["[0]" stack (.use "[1]#[0]" functor)]
      ["[0]" dictionary (.only Dictionary)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/jvm.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/analysis/jvm.lux
@@ -19,7 +19,6 @@
    [function
     ["[0]" predicate]]
    [data
-    ["[0]" bit]
     ["[0]" product]
     [binary (.only Binary)
      ["[0]" \\injection]]
@@ -32,6 +31,8 @@
      ["[0]" stack]
      ["[0]" dictionary (.only Dictionary)]
      ["[0]" sequence]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      ["i[0]" /32

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/when.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/when.lux
@@ -14,11 +14,12 @@
     ["[0]" try]]
    [data
     ["[0]" product]
-    ["[0]" bit]
     ["[0]" text]
     [collection
      ["[0]" list (.use "[1]#[0]" functor mix monoid)]
      ["[0]" set (.only Set)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      ["[0]" /64 (.only)

diff --git a/stdlib/source/library/lux/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis.lux
@@ -18,12 +18,13 @@
    [data
     ["[0]" sum]
     ["[0]" product]
-    ["[0]" bit]
     ["[0]" text (.only)
      ["%" \\injection]]
     [collection
      ["[0]" list (.use "[1]#[0]" functor monoid)]
      ["[0]" dictionary (.only Dictionary)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      ["[0]" /64 (.only)

diff --git a/stdlib/source/library/lux/compiler/language/lux/synthesis/access/member.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/access/member.lux
@@ -9,9 +9,10 @@
     [hash (.only Hash)]]
    [data
     ["[0]" product]
-    ["[0]" bit]
     ["[0]" text (.only)
      ["%" \\injection]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/compiler/language/lux/synthesis/access/side.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/access/side.lux
@@ -9,9 +9,10 @@
     [hash (.only Hash)]]
    [data
     ["[0]" product]
-    ["[0]" bit]
     ["[0]" text (.only)
      ["%" \\injection]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/compiler/language/lux/synthesis/simple.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis/simple.lux
@@ -10,9 +10,10 @@
    [control
     ["[0]" pipe]]
    [data
-    ["[0]" bit]
     ["[0]" text (.only)
      ["%" \\injection]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      ["[0]" /64 (.only)

diff --git a/stdlib/source/library/lux/compiler/meta/archive/artifact.lux b/stdlib/source/library/lux/compiler/meta/archive/artifact.lux
@@ -8,9 +8,10 @@
     [equivalence (.only Equivalence)]]
    [data
     ["[0]" product]
-    ["[0]" bit]
     [collection
      ["[0]" set (.only Set)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/concurrency/actor.lux b/stdlib/source/library/lux/concurrency/actor.lux
@@ -15,10 +15,11 @@
    [function
     [predicate (.only Predicate)]]
    [data
-    ["[0]" bit]
     ["[0]" product]
     [collection
      ["[0]" list (.use "[1]#[0]" monoid)]]]
+   [logic
+    ["[0]" bit]]
    [macro
     ["[0]" local]
     ["[0]" template]]

diff --git a/stdlib/source/library/lux/control/pattern.lux b/stdlib/source/library/lux/control/pattern.lux
@@ -18,11 +18,12 @@
    ["[0]" function (.only)
     [predicate (.only Predicate)]]
    [data
-    ["[0]" bit]
     ["[0]" text]
     [collection
      ["[0]" list (.only)
       ["[0]" property]]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/data/collection/array.lux b/stdlib/source/library/lux/data/collection/array.lux
@@ -12,8 +12,9 @@
     ["[0]" try (.only Try)]]
    [function
     [predicate (.only Predicate)]
-    [polytypism
-     [mix (.only Mix)]]]
+    [poly
+     [type
+      [mix (.only Mix)]]]]
    [data
     [collection
      ["[0]" list (.use "[1]#[0]" functor)]]]

diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux
@@ -13,12 +13,12 @@
    [error (.only error)
     ["[0]" try (.only Try)]]
    [data
-    ["[0]" bit]
     ["[0]" product]]
    ["[0]" function (.only)
     ["[0]" predicate (.only Predicate)]
-    [polytypism
-     [mix (.only Mix)]]]
+    [poly
+     [type
+      [mix (.only Mix)]]]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/data/collection/sequence.lux b/stdlib/source/library/lux/data/collection/sequence.lux
@@ -20,8 +20,9 @@
     ["[0]" exception (.only Exception)]]
    [function
     [predicate (.only Predicate)]
-    [polytypism
-     [mix (.only Mix)]]]
+    [poly
+     [type
+      [mix (.only Mix)]]]]
    [data
     ["[0]" product]
     [collection

diff --git a/stdlib/source/library/lux/data/collection/stack.lux b/stdlib/source/library/lux/data/collection/stack.lux
@@ -14,10 +14,10 @@
     ["[0]" try (.only Try)]]
    [function
     [predicate (.only Predicate)]
-    [polytypism
-     [mix (.only Mix)]]]
+    [poly
+     [type
+      [mix (.only Mix)]]]]
    [data
-    ["[0]" bit]
     ["[0]" product]]
    [math
     [number

diff --git a/stdlib/source/library/lux/data/collection/tree.lux b/stdlib/source/library/lux/data/collection/tree.lux
@@ -10,8 +10,9 @@
     [monad (.only do)]
     ["<>" projection]]
    [function
-    [polytypism
-     [mix (.only Mix)]]]
+    [poly
+     [type
+      [mix (.only Mix)]]]]
    [data
     [collection
      ["[0]" list (.use "[1]#[0]" monad mix monoid)

diff --git a/stdlib/source/library/lux/data/format/json.lux b/stdlib/source/library/lux/data/format/json.lux
@@ -21,7 +21,6 @@
    ["[0]" function (.only)
     [predicate (.only Predicate)]]
    [data
-    ["[0]" bit]
     ["[0]" product]
     ["[0]" text (.only \n)
      ["<[1]>" \\projection (.only Projection)]
@@ -30,6 +29,8 @@
      ["[0]" list (.use "[1]#[0]" monoid mix functor)
       ["?[1]" \\projection]]
      ["[0]" dictionary (.only Dictionary) (.use "[1]#[0]" functor)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      ["[0]" /64 (.only)

diff --git a/stdlib/source/library/lux/debug.lux b/stdlib/source/library/lux/debug.lux
@@ -17,14 +17,15 @@
     ["[0]" exception (.only Exception)]]
    ["[0]" function]
    [data
-    ["[0]" bit]
     ["[0]" text (.only \n)
      ["%" \\injection]]
     [collection
      ["[0]" array]
      ["[0]" list (.use "[1]#[0]" monad)
       ["?[1]" \\projection]]
      ["[0]" dictionary]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/documentation.lux b/stdlib/source/library/lux/documentation.lux
@@ -17,7 +17,6 @@
     ["[0]" try]
     ["[0]" exception (.only Exception)]]
    [data
-    ["[0]" bit]
     ["[0]" sum]
     ["[0]" product]
     ["[0]" text (.only \n) (.use "[1]#[0]" order)
@@ -30,6 +29,8 @@
      ["[0]" dictionary (.only Dictionary)]]
     [format
      ["md" markdown (.only Markdown Block)]]]
+   [logic
+    ["[0]" bit]]
    [math
     [number
      [/64

diff --git a/stdlib/source/library/lux/error/condition.lux b/stdlib/source/library/lux/error/condition.lux
@@ -5,8 +5,9 @@
  [library
   [lux (.except the let)
    [function
-    [polymorphism
-     ["/" subject]]]]])
+    [poly
+     [morph
+      ["/" subject]]]]]])
 
 ... https://en.wikipedia.org/wiki/Exception_handling#Condition_systems
 ... https://en.wikipedia.org/wiki/Common_Lisp#Condition_system

diff --git a/...rary/lux/function/polymorphism/aspect.lux → ...ibrary/lux/function/poly/morph/aspect.lux b/...rary/lux/function/polymorphism/aspect.lux → ...ibrary/lux/function/poly/morph/aspect.lux
@@ -41,7 +41,7 @@
       ["[0]" analysis (.only)
        ["[0]A" module]
        ["[0]" type]]]]]]]
- ["[0]" /// (.only)
+ ["[0]" //// (.only)
   [predicate (.only Predicate)]])
 
 (every .public (Advice value)
@@ -250,7 +250,7 @@
      (analysis (_ phase archive <parameters>)
        (do [! phase.monad]
          [[type term] (<| type.inferring
-                          (with_temporary_global [(name ,extension) (///.constant old)])
+                          (with_temporary_global [(name ,extension) (////.constant old)])
                           (phase archive)
                           ,term)
           _ (type.inference type)
@@ -265,7 +265,7 @@
            {try.#Success advice}
            (<| (with_cached_expression [type term])
                (function (_ analysis))
-               (with_temporary_global [(name ,extension) (///.constant old)])
+               (with_temporary_global [(name ,extension) (////.constant old)])
                (phase archive)
                <advised>)
 

diff --git a/...ary/lux/function/polymorphism/context.lux → ...brary/lux/function/poly/morph/context.lux b/...ary/lux/function/polymorphism/context.lux → ...brary/lux/function/poly/morph/context.lux
@@ -32,7 +32,7 @@
      ["[0]" export]]]
    [type
     ["[0]" nominal]]]]
- [///
+ [////
   ["//" mixin]
   ["[0]" predicate (.only Predicate)]])
 

diff --git a/...ry/lux/function/polymorphism/implicit.lux → ...rary/lux/function/poly/morph/implicit.lux b/...ry/lux/function/polymorphism/implicit.lux → ...rary/lux/function/poly/morph/implicit.lux
diff --git a/...y/lux/function/polymorphism/predicate.lux → ...ary/lux/function/poly/morph/predicate.lux b/...y/lux/function/polymorphism/predicate.lux → ...ary/lux/function/poly/morph/predicate.lux
@@ -22,7 +22,7 @@
     ["[0]" static]
     ["[0]" code (.only)
      ["?[1]" \\projection (.only Projection)]]]]]
- [///
+ [////
   ["//" mixin]])
 
 (every Polymorphism