Added support for radian and turn Decimal literals.

LuxLang · Feb 23, 2024 · ad983b0 · ad983b0
1 parent 6135fed
commit ad983b0
Show file tree

Hide file tree

Showing 199 changed files with 975 additions and 472 deletions.
diff --git a/lux-cl/source/program.lux b/lux-cl/source/program.lux
@@ -13,9 +13,9 @@
    ["[0]" maybe]
    ["[0]" try (.only Try)]
    ["[0]" exception (.only Exception)]
-   ["[0]" io (.only IO io)]
-   [concurrency
-    ["[0]" promise (.only Promise)]]]
+   ["[0]" io (.only IO io)]]
+  [concurrency
+   ["[0]" future (.only Future)]]
   [data
    ["[0]" text (.use "[1]#[0]" hash)
     ["%" \\injection]
@@ -409,8 +409,8 @@
 
 (the (declare_success! _)
   (-> Any
-      (Promise Any))
-  (promise.soon (by world/program.default exit +0)))
+      (Future Any))
+  (future.soon (by world/program.default exit +0)))
 
 (the (then pre post)
   (-> (_.Expression Any) (_.Expression Any)
@@ -433,7 +433,7 @@
         (let [extension ".cl"]
           (do io.monad
             [platform ..platform]
-            (exec (do promise.monad
+            (exec (do future.monad
                     [_ (/.compiler [/static.#host .common_lisp
                                     /static.#host_module_extension extension
                                     /static.#target (/cli.target service)

diff --git a/lux-js/source/program.lux b/lux-js/source/program.lux
@@ -13,8 +13,10 @@
     ["[0]" maybe (.use "[1]#[0]" monad)]
     ["[0]" try (.only Try)]
     ["[0]" exception (.only Exception)]
-    ["[0]" io (.only IO io)]
-    ["[0]" function]]
+    ["[0]" io (.only IO io)]]
+   [concurrency
+    ["[0]" future (.only Future)]]
+   ["[0]" function]
    [data
     ["[0]" product]
     [text
@@ -31,10 +33,10 @@
    ["[0]" world
     ["[0]" file]
     ["[0]" environment]]
+   [macro
+    ["^" pattern]
+    ["[0]" template]]
    [meta
-    [macro
-     ["^" pattern]
-     ["[0]" template]]
     [compiler
      [reference
       [register (.only Register)]]

diff --git a/lux-lua/source/program.lux b/lux-lua/source/program.lux
@@ -12,8 +12,10 @@
     ["[0]" maybe]
     ["[0]" try (.only Try)]
     ["[0]" exception (.only Exception)]
-    ["[0]" io (.only IO io)]
-    ["[0]" function]]
+    ["[0]" io (.only IO io)]]
+   [concurrency
+    ["[0]" future (.only Future)]]
+   ["[0]" function]
    [data
     ["[0]" text (.use "[1]#[0]" hash)
      ["%" \\injection]
@@ -26,14 +28,14 @@
     [number (.only hex)
      ["n" natural]
      ["[0]" i64]]]
+   [macro
+    ["^" pattern]
+    ["[0]" local]
+    ["[0]" expansion]
+    ["[0]" template]]
    [meta
     ["[0]" static]
     ["[0]" code]
-    [macro
-     ["^" pattern]
-     ["[0]" local]
-     ["[0]" expansion]
-     ["[0]" template]]
     ["[0]" compiler
      [target
       ["_" lua]]

diff --git a/lux-mode/lux-mode.el b/lux-mode/lux-mode.el
@@ -347,7 +347,9 @@ Called by `imenu--generic-function'."
 ;; https://www.emacswiki.org/emacs/RegularExpression
 (defconst lux-font-lock-keywords
   (eval-when-compile
-	(let* ((unit "[°g%‰‱]")
+	(let* ((natural_unit "[°g%‰‱]")
+		   (decimal_unit (altRE natural_unit
+								"[πτ]"))
 
 		   (natural "[0-9][0-9,]*")
 
@@ -358,13 +360,13 @@ Called by `imenu--generic-function'."
 		   (revolution (concat decimal_separator natural))
 		   (decimal (concat integer revolution
 							"\\(\\(e\\|E\\)" integer "\\)?"
-							unit "?"))
+							decimal_unit "?"))
 
 		   (fraction_separator "/")
 		   (fraction (altRE (concat natural fraction_separator natural)
-							(concat natural unit)))
+							(concat natural natural_unit)))
 		   (rational (altRE (concat integer fraction_separator natural)
-							(concat integer unit)))
+							(concat integer natural_unit)))
 
 		   (identifier_h|label "#")
 		   (identifier_h|type "[:upper:]")

diff --git a/lux-php/source/program.lux b/lux-php/source/program.lux
@@ -10,7 +10,7 @@
    [abstract
     ["[0]" monad (.only do)]]
    [concurrency
-    ["[0]" promise (.only Promise)]]
+    ["[0]" future (.only Future)]]
    [control
     ["[0]" pipe]
     ["[0]" maybe]
@@ -564,15 +564,15 @@
        (as_expected handler)))
 
 (the (declare_success! _)
-  (-> Any (Promise Any))
-  (promise.soon (by world/program.default exit +0)))
+  (-> Any (Future Any))
+  (future.soon (by world/program.default exit +0)))
 
 (`` (the _
       (program [service /cli.service]
         (let [extension ".php"]
           (do io.monad
             [platform ..platform]
-            (exec (do promise.monad
+            (exec (do future.monad
                     [_ (/.compiler [/static.#host .php
                                     /static.#host_module_extension extension
                                     /static.#target (/cli.target service)

diff --git a/lux-python/source/program.lux b/lux-python/source/program.lux
@@ -16,8 +16,8 @@
     ["[0]" maybe]
     ["[0]" try (.only Try) (.use "[1]#[0]" monad)]
     ["[0]" exception (.only Exception)]
-    ["[0]" io (.only IO io)]
-    ["[0]" function]]
+    ["[0]" io (.only IO io)]]
+   ["[0]" function]
    [data
     ["[0]" text (.use "[1]#[0]" hash)
      ["%" \\injection]
@@ -30,13 +30,13 @@
     [number
      ["n" natural]
      ["[0]" i64]]]
+   [macro
+    ["^" pattern]
+    ["[0]" template]
+    ["[0]" expansion]]
    [meta
     ["[0]" static]
     ["[0]" code]
-    [macro
-     ["^" pattern]
-     ["[0]" template]
-     ["[0]" expansion]]
     ["[0]" compiler
      [reference
       [register (.only Register)]]

diff --git a/lux-r/source/program.lux b/lux-r/source/program.lux
@@ -9,7 +9,7 @@
   [abstract
    ["[0]" monad (.only do)]]
   [concurrency
-   ["[0]" promise (.only Promise)]]
+   ["[0]" future (.only Future)]]
   [control
    ["[0]" pipe]
    ["[0]" maybe]
@@ -590,8 +590,8 @@
        (as_expected handler)))
 
 (the (declare_success! _)
-  (-> Any (Promise Any))
-  (promise.soon (by world/program.default exit +0)))
+  (-> Any (Future Any))
+  (future.soon (by world/program.default exit +0)))
 
 (the (scope body)
   (-> _.Expression _.Expression)
@@ -606,7 +606,7 @@
         (let [extension ".r"]
           (do io.monad
             [[interpreter platform] ..platform]
-            (exec (do promise.monad
+            (exec (do future.monad
                     [_ (/.compiler [/static.#host .r
                                     /static.#host_module_extension extension
                                     /static.#target (/cli.target service)

diff --git a/lux-ruby/source/program.lux b/lux-ruby/source/program.lux
@@ -29,10 +29,10 @@
      ["n" natural]
      ["i" integer]
      ["[0]" i64]]]
+   [macro
+    ["^" pattern]
+    ["[0]" template]]
    [meta
-    [macro
-     ["^" pattern]
-     ["[0]" template]]
     ["[0]" compiler
      [reference
       [register (.only Register)]]

diff --git a/stdlib/source/injection/lux/data/binary.lux b/stdlib/source/injection/lux/data/binary.lux
@@ -8,8 +8,8 @@
    [abstract
     [monoid (.only Monoid)]]
    [control
-    ["|" pipe]
-    ["[0]" function]]
+    ["|" pipe]]
+   ["[0]" function]
    [data
     ["[0]" product]
     [text

diff --git a/stdlib/source/library/lux/abstract/interval.lux b/stdlib/source/library/lux/abstract/interval.lux
@@ -5,9 +5,8 @@
 (.using
  [library
   [lux (.except)
-   [control
-    [function
-     [predicate (.only Predicate)]]]]]
+   [function
+    [predicate (.only Predicate)]]]]
  [//
   [equivalence (.only Equivalence)]
   [enum (.only Enum)]

diff --git a/stdlib/source/library/lux/abstract/order.lux b/stdlib/source/library/lux/abstract/order.lux
@@ -4,8 +4,7 @@
 (.using
  [library
   [lux (.except)
-   [control
-    ["[0]" function]]]]
+   ["[0]" function]]]
  [//
   ["[0]" equivalence (.only Equivalence)]
   [functor
@@ -72,30 +71,38 @@
              (list [_ {.#Tuple '*type_parameters}] 'type 'order)
              (do meta#monad
                ['_ (generated_name "'_")
-                'parameter (generated_name "'parameter")
-                'subject (generated_name "'subject")]
-               (in (list (` (the .public ((,' <) (, 'parameter) (, 'subject))
-                              (for_any ((, '_) (,* '*type_parameters))
-                                (-> (, 'type) (, 'type)
-                                    .Bit))
-                              (by (, 'order) (,' <) (, 'parameter) (, 'subject))))
-                         (` (the .public ((,' >) (, 'parameter) (, 'subject))
-                              (for_any ((, '_) (,* '*type_parameters))
-                                (-> (, 'type) (, 'type)
-                                    .Bit))
-                              (by (, 'order) (,' <) (, 'subject) (, 'parameter))))
-                         (` (the .public ((,' <=) (, 'parameter) (, 'subject))
-                              (for_any ((, '_) (,* '*type_parameters))
-                                (-> (, 'type) (, 'type)
-                                    .Bit))
-                              (or (by (, 'order) (,' <) (, 'parameter) (, 'subject))
-                                  (by (, 'order) (,' =) (, 'parameter) (, 'subject)))))
-                         (` (the .public ((,' >=) (, 'parameter) (, 'subject))
-                              (for_any ((, '_) (,* '*type_parameters))
-                                (-> (, 'type) (, 'type)
-                                    .Bit))
-                              (or (by (, 'order) (,' <) (, 'subject) (, 'parameter))
-                                  (by (, 'order) (,' =) (, 'parameter) (, 'subject))))))))
+                'reference (generated_name "'reference")
+                'it (generated_name "'it")
+                .let [order_type (` (for_any ((, '_) (,* '*type_parameters))
+                                      (-> (, 'type) (, 'type)
+                                          .Bit)))
+                      choice_type (` (for_any ((, '_) (,* '*type_parameters))
+                                       (-> (, 'type) (, 'type)
+                                           (, 'type))))]]
+               (in (list (` (the .public ((,' <) (, 'reference) (, 'it))
+                              (, order_type)
+                              (by (, 'order) (,' <) (, 'reference) (, 'it))))
+                         (` (the .public ((,' >) (, 'reference) (, 'it))
+                              (, order_type)
+                              (by (, 'order) (,' <) (, 'it) (, 'reference))))
+                         (` (the .public ((,' <=) (, 'reference) (, 'it))
+                              (, order_type)
+                              (or (by (, 'order) (,' <) (, 'reference) (, 'it))
+                                  (by (, 'order) (,' =) (, 'reference) (, 'it)))))
+                         (` (the .public ((,' >=) (, 'reference) (, 'it))
+                              (, order_type)
+                              (or (by (, 'order) (,' <) (, 'it) (, 'reference))
+                                  (by (, 'order) (,' =) (, 'reference) (, 'it)))))
+                         (` (the .public ((,' minor) (, 'reference) (, 'it))
+                              (, choice_type)
+                              (if (by (, 'order) (,' <) (, 'reference) (, 'it))
+                                (, 'it)
+                                (, 'reference))))
+                         (` (the .public ((,' major) (, 'reference) (, 'it))
+                              (, choice_type)
+                              (if (by (, 'order) (,' <) (, 'reference) (, 'it))
+                                (, 'reference)
+                                (, 'it)))))))
 
              _
              (failure .wrong_syntax)))))
diff --git a/stdlib/source/library/lux/algorithm/any.lux b/stdlib/source/library/lux/algorithm/any.lux
@@ -6,9 +6,9 @@
   [lux (.except)
    [control
     [error (.only error)]
-    ["[0]" try (.only Try)]
-    [function
-     [predicate (.only Predicate)]]]
+    ["[0]" try (.only Try)]]
+   [function
+    [predicate (.only Predicate)]]
    [data
     ["[0]" product]]]]
  ["[0]" //])

diff --git a/stdlib/source/library/lux/algorithm/any?.lux b/stdlib/source/library/lux/algorithm/any?.lux
@@ -4,9 +4,8 @@
 (.using
  [library
   [lux (.except)
-   [control
-    [function
-     [predicate (.only Predicate)]]]
+   [function
+    [predicate (.only Predicate)]]
    [data
     ["[0]" product]]]]
  ["[0]" //])

diff --git a/stdlib/source/library/lux/algorithm/empty?.lux b/stdlib/source/library/lux/algorithm/empty?.lux
@@ -4,9 +4,8 @@
 (.using
  [library
   [lux (.except)
-   [control
-    [function
-     [predicate (.only Predicate)]]]
+   [function
+    [predicate (.only Predicate)]]
    [data
     ["[0]" product]]]]
  ["[0]" //])

diff --git a/stdlib/source/library/lux/algorithm/every?.lux b/stdlib/source/library/lux/algorithm/every?.lux
@@ -4,9 +4,8 @@
 (.using
  [library
   [lux (.except)
-   [control
-    [function
-     [predicate (.only Predicate)]]]
+   [function
+    [predicate (.only Predicate)]]
    [data
     ["[0]" product]]]]
  ["[0]" //])

diff --git a/stdlib/source/library/lux/algorithm/item.lux b/stdlib/source/library/lux/algorithm/item.lux
@@ -6,9 +6,9 @@
   [lux (.except)
    [control
     [error (.only error)]
-    ["[0]" try (.only Try)]
-    [function
-     [predicate (.only Predicate)]]]
+    ["[0]" try (.only Try)]]
+   [function
+    [predicate (.only Predicate)]]
    [data
     ["[0]" product]]
    [math

diff --git a/stdlib/source/library/lux/algorithm/size.lux b/stdlib/source/library/lux/algorithm/size.lux
@@ -4,8 +4,7 @@
 (.using
  [library
   [lux (.except)
-   [control
-    ["[0]" function]]
+   ["[0]" function]
    [data
     ["[0]" product]]
    [math