aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--luxc/src/lux/analyser/module.clj2
-rw-r--r--luxc/src/lux/compiler/jvm/proc/common.clj10
-rw-r--r--stdlib/source/lux/control/concatenative.lux3
-rw-r--r--stdlib/source/lux/control/concurrency/actor.lux3
-rw-r--r--stdlib/source/lux/control/exception.lux3
-rw-r--r--stdlib/source/lux/macro/poly.lux3
-rw-r--r--stdlib/source/lux/tool/compiler/phase/translation/js/case.lux5
-rw-r--r--stdlib/source/lux/tool/compiler/phase/translation/js/function.lux3
-rw-r--r--stdlib/source/lux/tool/compiler/phase/translation/js/reference.lux3
-rw-r--r--stdlib/source/lux/tool/compiler/phase/translation/reference.lux (renamed from stdlib/source/lux/tool/compiler/phase/translation/common/reference.lux)25
-rw-r--r--stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux3
-rw-r--r--stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux3
-rw-r--r--stdlib/source/lux/type/abstract.lux3
-rw-r--r--stdlib/source/lux/type/unit.lux3
14 files changed, 30 insertions, 42 deletions
diff --git a/luxc/src/lux/analyser/module.clj b/luxc/src/lux/analyser/module.clj
index 5d72d5e87..70e463432 100644
--- a/luxc/src/lux/analyser/module.clj
+++ b/luxc/src/lux/analyser/module.clj
@@ -273,7 +273,7 @@
(return* state (&/T [(&/T [module name]) $def]))
_
- ((&/fail-with-loc (str "[Analyser Error @ find-def] Cannot use unexported definition: " (str module &/+name-separator+ name)
+ ((&/fail-with-loc (str "[Analyser Error @ find-def] Cannot use private definition: " (str module &/+name-separator+ name)
" at module: " current-module))
state))))
((&/fail-with-loc (str "[Analyser Error @ find-def] Definition does not exist: " (str module &/+name-separator+ name)
diff --git a/luxc/src/lux/compiler/jvm/proc/common.clj b/luxc/src/lux/compiler/jvm/proc/common.clj
index 5cff63d86..96b2dcc31 100644
--- a/luxc/src/lux/compiler/jvm/proc/common.clj
+++ b/luxc/src/lux/compiler/jvm/proc/common.clj
@@ -452,12 +452,12 @@
"int"
(case proc
- "*" (compile-int-mul compile ?values special-args)
- "/" (compile-int-div compile ?values special-args)
- "%" (compile-int-rem compile ?values special-args)
- "<" (compile-int-lt compile ?values special-args)
+ "*" (compile-int-mul compile ?values special-args)
+ "/" (compile-int-div compile ?values special-args)
+ "%" (compile-int-rem compile ?values special-args)
+ "<" (compile-int-lt compile ?values special-args)
"frac" (compile-int-frac compile ?values special-args)
- "char" (compile-int-char compile ?values special-args)
+ "char" (compile-int-char compile ?values special-args)
)
"frac"
diff --git a/stdlib/source/lux/control/concatenative.lux b/stdlib/source/lux/control/concatenative.lux
index 5806ec898..c99526fb6 100644
--- a/stdlib/source/lux/control/concatenative.lux
+++ b/stdlib/source/lux/control/concatenative.lux
@@ -17,8 +17,7 @@
["." code]
["s" syntax (#+ syntax:)]
[syntax
- ["cs" common]
- [common
+ ["cs" common
["csr" reader]
["csw" writer]]]]])
diff --git a/stdlib/source/lux/control/concurrency/actor.lux b/stdlib/source/lux/control/concurrency/actor.lux
index b47785142..7cd6a8fe1 100644
--- a/stdlib/source/lux/control/concurrency/actor.lux
+++ b/stdlib/source/lux/control/concurrency/actor.lux
@@ -16,8 +16,7 @@
["." code]
["s" syntax (#+ syntax: Syntax)]
[syntax
- ["cs" common]
- [common
+ ["cs" common
["csr" reader]
["csw" writer]]]]
[type
diff --git a/stdlib/source/lux/control/exception.lux b/stdlib/source/lux/control/exception.lux
index f5d0721e9..9a357d8a1 100644
--- a/stdlib/source/lux/control/exception.lux
+++ b/stdlib/source/lux/control/exception.lux
@@ -14,8 +14,7 @@
["." code]
["s" syntax (#+ syntax: Syntax)]
[syntax
- ["cs" common]
- [common
+ ["cs" common
["csr" reader]
["csw" writer]]]]])
diff --git a/stdlib/source/lux/macro/poly.lux b/stdlib/source/lux/macro/poly.lux
index 200d507eb..a683fe50a 100644
--- a/stdlib/source/lux/macro/poly.lux
+++ b/stdlib/source/lux/macro/poly.lux
@@ -23,8 +23,7 @@
["." code]
["s" syntax (#+ Syntax syntax:)]
[syntax
- ["cs" common]
- [common
+ ["cs" common
["csr" reader]
["csw" writer]]]]
["." type ("#/." equivalence)
diff --git a/stdlib/source/lux/tool/compiler/phase/translation/js/case.lux b/stdlib/source/lux/tool/compiler/phase/translation/js/case.lux
index 25522f112..889ad471b 100644
--- a/stdlib/source/lux/tool/compiler/phase/translation/js/case.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/js/case.lux
@@ -16,15 +16,14 @@
["//." reference]
["//." primitive]
[//
- [common
- ["common-." reference]]
+ ["." reference]
["//." // ("#/." monad)
[//
[reference (#+ Register)]
["." synthesis (#+ Synthesis Path)]]]]])
(def: #export register
- (common-reference.local _.var))
+ (reference.local _.var))
(def: #export (let translate [valueS register bodyS])
(-> Phase [Synthesis Register Synthesis]
diff --git a/stdlib/source/lux/tool/compiler/phase/translation/js/function.lux b/stdlib/source/lux/tool/compiler/phase/translation/js/function.lux
index 5727b737d..0d0d659ab 100644
--- a/stdlib/source/lux/tool/compiler/phase/translation/js/function.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/js/function.lux
@@ -16,8 +16,7 @@
["." reference]
["//." case]
["/." //
- [common
- ["common-." reference]]
+ ["common-." reference]
["//." // ("#/." monad)
[//
[reference (#+ Register Variable)]
diff --git a/stdlib/source/lux/tool/compiler/phase/translation/js/reference.lux b/stdlib/source/lux/tool/compiler/phase/translation/js/reference.lux
index 0e4cd1489..9f8555788 100644
--- a/stdlib/source/lux/tool/compiler/phase/translation/js/reference.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/js/reference.lux
@@ -4,8 +4,7 @@
["_" js (#+ Expression)]]]
[//
[//
- [common
- ["." reference]]]])
+ ["." reference]]])
(def: #export system
(reference.system (: (-> Text Expression) _.var)
diff --git a/stdlib/source/lux/tool/compiler/phase/translation/common/reference.lux b/stdlib/source/lux/tool/compiler/phase/translation/reference.lux
index af676ad85..878d96e83 100644
--- a/stdlib/source/lux/tool/compiler/phase/translation/common/reference.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/reference.lux
@@ -6,12 +6,11 @@
[text
format]]
[type (#+ :share)]]
- [//
- ["/." //
- ["//." // ("#/." monad)
- [//
- [synthesis (#+ Synthesis)]
- ["." reference (#+ Register Variable Reference)]]]]])
+ ["." //
+ ["/." // ("#/." monad)
+ [//
+ [synthesis (#+ Synthesis)]
+ ["." reference (#+ Register Variable Reference)]]]])
(signature: #export (System expression)
(: (-> Register expression)
@@ -19,13 +18,13 @@
(: (-> Register expression)
foreign)
(: (All [anchor statement]
- (-> Variable (///.Operation anchor expression statement)))
+ (-> Variable (//.Operation anchor expression statement)))
variable)
(: (All [anchor statement]
- (-> Name (///.Operation anchor expression statement)))
+ (-> Name (//.Operation anchor expression statement)))
constant)
(: (All [anchor statement]
- (-> Reference (///.Operation anchor expression statement)))
+ (-> Reference (//.Operation anchor expression statement)))
reference))
(def: (variable-maker prefix variable)
@@ -56,19 +55,19 @@
{(-> Text expression)
variable}
{(All [anchor statement]
- (-> Variable (///.Operation anchor expression statement)))
+ (-> Variable (//.Operation anchor expression statement)))
(|>> (case> (#reference.Local register)
(local register)
(#reference.Foreign register)
(foreign register))
- /////wrap)})
+ ////wrap)})
constant (:share [expression]
{(-> Text expression)
constant}
{(All [anchor statement]
- (-> Name (///.Operation anchor expression statement)))
- (|>> ///.remember (/////map constant))})]
+ (-> Name (//.Operation anchor expression statement)))
+ (|>> //.remember (////map constant))})]
(structure
(def: local local)
(def: foreign foreign)
diff --git a/stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux
index c20fea5fe..6d5cf911b 100644
--- a/stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/case.jvm.lux
@@ -16,8 +16,7 @@
["//." primitive]
["." reference]
[//
- [common
- ["common-." reference]]
+ ["common-." reference]
["//." // ("#/." monad)
["." synthesis (#+ Synthesis Path)]
[//
diff --git a/stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux b/stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux
index cc2caf056..bef6af902 100644
--- a/stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/translation/scheme/function.jvm.lux
@@ -16,8 +16,7 @@
["." reference]
["//." case]
["/." //
- [common
- ["common-." reference]]
+ ["common-." reference]
["//." // ("#/." monad)
[analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)]
[synthesis (#+ Synthesis)]
diff --git a/stdlib/source/lux/type/abstract.lux b/stdlib/source/lux/type/abstract.lux
index ccaa294b7..e59596b4d 100644
--- a/stdlib/source/lux/type/abstract.lux
+++ b/stdlib/source/lux/type/abstract.lux
@@ -14,8 +14,7 @@
["." code]
["s" syntax (#+ Syntax syntax:)]
[syntax
- ["cs" common]
- [common
+ ["cs" common
["csr" reader]
["csw" writer]]]]
[type (#+ :cast)]])
diff --git a/stdlib/source/lux/type/unit.lux b/stdlib/source/lux/type/unit.lux
index 3aece5ff1..69ff261b2 100644
--- a/stdlib/source/lux/type/unit.lux
+++ b/stdlib/source/lux/type/unit.lux
@@ -16,8 +16,7 @@
["." code]
["s" syntax (#+ syntax:)]
[syntax
- ["cs" common]
- [common
+ ["cs" common
["csr" reader]
["csw" writer]]]]
[type
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 13:16:38 +0000