New type for Type (part 3).

LuxLang · May 5, 2024 · 2630555 · 2630555
1 parent 3514c95
commit 2630555
Show file tree

Hide file tree

Showing 25 changed files with 126 additions and 87 deletions.
diff --git a/stdlib/source/library/lux.lux b/stdlib/source/library/lux.lux
@@ -42,6 +42,39 @@
              #1)
        #1)
 
+... https://en.wikipedia.org/wiki/Quantifier_(logic)
+(.def# Quantification
+       (.is# Type
+             ..Bit)
+       #1)
+
+... https://en.wikipedia.org/wiki/Universal_quantification
+(.def# universal
+       (.is# Quantification
+             #0)
+       #1)
+
+... https://en.wikipedia.org/wiki/Existential_quantification
+(.def# existential
+       (.is# Quantification
+             #1)
+       #1)
+
+(.def# Parameter
+       (.is# Type
+             ..Bit)
+       #1)
+
+(.def# abstraction
+       (.is# Quantification
+             #0)
+       #1)
+
+(.def# argument
+       (.is# Quantification
+             #1)
+       #1)
+
 (.def# Natural
        (.is# Type
              {6 #1

diff --git a/stdlib/source/library/lux/compiler.lux b/stdlib/source/library/lux/compiler.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Code
+  [lux (.except Code Parameter
                 #module)
    [error
     [try (.only Try)]
@@ -58,7 +58,7 @@
   (-> (Key document) (Stack Parameter)
       (Compiler state document)))
 
-(exception.the .public (cannot_compile module)
-  (Exception descriptor.Module)
+(exception.the .public (cannot_compile [module])
+  (Exception [descriptor.Module])
   (exception.report
    (list ["Module" module])))
diff --git a/stdlib/source/library/lux/compiler/language/lux/analysis/type.lux b/stdlib/source/library/lux/compiler/language/lux/analysis/type.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except)
+  [lux (.except existential)
    [abstract
     [monad (.only do)]]
    [error

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/analysis.lux b/stdlib/source/library/lux/compiler/language/lux/phase/analysis.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except)
+  [lux (.except abstraction)
    [abstract
     [monad (.only do)]]
    [control

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
@@ -3,9 +3,9 @@
 
 (.using
  [library
-  [lux (.except Type Module Declaration Integer Double
+  [lux (.except Type Module Declaration Integer Double Parameter
                 #Default #Variable
-                type with)
+                type with argument)
    ["[0]" ffi (.only import)]
    [abstract
     [monad (.only do)]

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/jvm.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/declaration/jvm.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Type Definition Declaration
+  [lux (.except Type Definition Declaration Parameter
                 #Variable)
    ["[0]" ffi (.only import)]
    [abstract

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/host.lux b/stdlib/source/library/lux/compiler/language/lux/phase/extension/translation/jvm/host.lux
@@ -3,7 +3,8 @@
 
 (.using
  [library
-  [lux (.except Type)
+  [lux (.except Type Parameter
+                argument)
    [abstract
     [monad (.only do)]
     ["<>" projection (.use "[1]#[0]" functor)]]

diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/synthesis/function.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except)
+  [lux (.except abstraction)
    [abstract
     [monad (.only do)]
     ["[0]" enum]]
@@ -60,24 +60,24 @@
             (/.abstraction @ functionS)
             (if (n.= (its /.#arity functionS)
                      (list.size argsS))
-              (do !
-                [locals /.locals]
-                (in (|> functionS
-                        (//loop.optimization true locals argsS)
-                        (maybe#each (is (-> [Natural (List /.Term) /.Term]
-                                            /.Term)
-                                        (function (_ [start inits iteration])
-                                          (when iteration
-                                            (/.tail_recursion @ [start' inits' output])
-                                            (if (and (n.= start start')
-                                                     (list.empty? inits'))
-                                              (/.tail_recursion @ [start inits output])
-                                              (/.tail_recursion @ [start inits iteration]))
+                (do !
+                  [locals /.locals]
+                  (in (|> functionS
+                          (//loop.optimization true locals argsS)
+                          (maybe#each (is (-> [Natural (List /.Term) /.Term]
+                                              /.Term)
+                                          (function (_ [start inits iteration])
+                                            (when iteration
+                                              (/.tail_recursion @ [start' inits' output])
+                                              (if (and (n.= start start')
+                                                       (list.empty? inits'))
+                                                  (/.tail_recursion @ [start inits output])
+                                                  (/.tail_recursion @ [start inits iteration]))
 
-                                            _
-                                            (/.tail_recursion @ [start inits iteration])))))
-                        (maybe.else <reification>))))
-              (in <reification>))
+                                              _
+                                              (/.tail_recursion @ [start inits iteration])))))
+                          (maybe.else <reification>))))
+                (in <reification>))
 
             (/.reification @ [funcS' argsS'])
             (in (/.reification @ [funcS' (list#composite argsS' argsS)]))
@@ -259,12 +259,12 @@
      currying? /.currying?]
     (in (<| (/.abstraction @)
             (if currying?
-              abstraction
-              (when (//loop.optimization false 1 (list) abstraction)
-                {.#Some it}
-                [/.#environment environment
-                 /.#arity (its /.#arity abstraction)
-                 /.#body (/.tail_recursion @ it)]
-
-                {.#None}
-                abstraction))))))
+                abstraction
+                (when (//loop.optimization false 1 (list) abstraction)
+                  {.#Some it}
+                  [/.#environment environment
+                   /.#arity (its /.#arity abstraction)
+                   /.#body (/.tail_recursion @ it)]
+                  
+                  {.#None}
+                  abstraction))))))
diff --git a/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function.lux b/stdlib/source/library/lux/compiler/language/lux/phase/translation/jvm/function.lux
@@ -4,7 +4,7 @@
 (.using
  [library
   [lux (.except Type Label
-                with)
+                with abstraction)
    [abstract
     [monad (.only do)]]
    [error

diff --git a/stdlib/source/library/lux/compiler/language/lux/synthesis.lux b/stdlib/source/library/lux/compiler/language/lux/synthesis.lux
@@ -7,7 +7,8 @@
                 #locals #source
                 i64 local
                 let exec when its variant tuple text
-                if or and)
+                if or and
+                abstraction)
    [abstract
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]

diff --git a/stdlib/source/library/lux/data/collection/list.lux b/stdlib/source/library/lux/data/collection/list.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except only all static has revised)
+  [lux (.except only all static has revised abstraction)
    [abstract
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]

diff --git a/stdlib/source/library/lux/ffi.jvm.lux b/stdlib/source/library/lux/ffi.jvm.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Type Declaration Integer Double
+  [lux (.except Type Declaration Integer Double Parameter
                 is as type)
    [abstract
     [monad (.only do)]

diff --git a/stdlib/source/library/lux/math/number/complex.lux b/stdlib/source/library/lux/math/number/complex.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except text)
+  [lux (.except text argument)
    [abstract
     [equivalence (.only Equivalence)]
     [format (.only Format)]

diff --git a/stdlib/source/library/lux/target/jvm/reflection.lux b/stdlib/source/library/lux/target/jvm/reflection.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except type)
+  [lux (.except Parameter type)
    ["[0]" ffi (.only import)]
    [abstract
     [monad (.only do)]]

diff --git a/stdlib/source/library/lux/target/jvm/type.lux b/stdlib/source/library/lux/target/jvm/type.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Type Declaration)
+  [lux (.except Type Declaration Parameter)
    [abstract
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]]

diff --git a/stdlib/source/library/lux/target/jvm/type/alias.lux b/stdlib/source/library/lux/target/jvm/type/alias.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Type)
+  [lux (.except Type Parameter)
    [abstract
     [monad (.only do)]
     ["<>" projection (.use "[1]#[0]" functor)]]

diff --git a/stdlib/source/library/lux/target/jvm/type/category.lux b/stdlib/source/library/lux/target/jvm/type/category.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Declaration)
+  [lux (.except Declaration Parameter)
    [macro
     ["[0]" template]
     ["[0]" expansion]]

diff --git a/stdlib/source/library/lux/target/jvm/type/descriptor.lux b/stdlib/source/library/lux/target/jvm/type/descriptor.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Declaration)
+  [lux (.except Declaration Parameter)
    [abstract
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]]

diff --git a/stdlib/source/library/lux/target/jvm/type/lux.lux b/stdlib/source/library/lux/target/jvm/type/lux.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except type)
+  [lux (.except Parameter type)
    [abstract
     [monad (.only do)]
     ["<>" projection (.use "[1]#[0]" monad)]]

diff --git a/stdlib/source/library/lux/target/jvm/type/reflection.lux b/stdlib/source/library/lux/target/jvm/type/reflection.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Declaration)
+  [lux (.except Declaration Parameter)
    [abstract
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]]

diff --git a/stdlib/source/library/lux/target/jvm/type/signature.lux b/stdlib/source/library/lux/target/jvm/type/signature.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except Declaration)
+  [lux (.except Declaration Parameter)
    [abstract
     [equivalence (.only Equivalence)]
     [hash (.only Hash)]]

diff --git a/stdlib/source/library/lux/type/check.lux b/stdlib/source/library/lux/type/check.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except try except with type)
+  [lux (.except try except with type existential)
    [abstract
     [equivalence (.only Equivalence)]
     [functor (.only Functor)]

diff --git a/stdlib/source/library/lux/type/nominal.lux b/stdlib/source/library/lux/type/nominal.lux
@@ -3,7 +3,7 @@
 
 (.using
  [library
-  [lux (.except every)
+  [lux (.except every abstraction)
    [abstract
     [monad (.only do)]
     ["<>" projection (.use "[1]#[0]" monad)]]