aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source
diff options
context:
space:
mode:
Diffstat (limited to 'stdlib/source')
-rw-r--r--stdlib/source/lux/compiler/default.lux11
-rw-r--r--stdlib/source/lux/compiler/default/evaluation.lux4
-rw-r--r--stdlib/source/lux/compiler/default/init.lux11
-rw-r--r--stdlib/source/lux/compiler/default/phase.lux3
-rw-r--r--stdlib/source/lux/compiler/default/phase/analysis/expression.lux4
-rw-r--r--stdlib/source/lux/compiler/meta/archive.lux5
6 files changed, 18 insertions, 20 deletions
diff --git a/stdlib/source/lux/compiler/default.lux b/stdlib/source/lux/compiler/default.lux
index bc58c5d7b..197befb10 100644
--- a/stdlib/source/lux/compiler/default.lux
+++ b/stdlib/source/lux/compiler/default.lux
@@ -1,11 +1,2 @@
(.module:
- [lux #*
- [data
- ["." error (#+ Error)]]])
-
-(type: #export Eval
- (-> Type Code (Error Any)))
-
-(type: #export Version Text)
-
-(def: #export version Version "0.6.0")
+ [lux #*])
diff --git a/stdlib/source/lux/compiler/default/evaluation.lux b/stdlib/source/lux/compiler/default/evaluation.lux
index 26c4b0355..3e00d79c5 100644
--- a/stdlib/source/lux/compiler/default/evaluation.lux
+++ b/stdlib/source/lux/compiler/default/evaluation.lux
@@ -5,8 +5,8 @@
pipe]
[data
["." error]]]
- ["." // (#+ Eval)
- ["." phase
+ [//
+ ["." phase (#+ Eval)
["." analysis
[".A" expression]]
["." synthesis
diff --git a/stdlib/source/lux/compiler/default/init.lux b/stdlib/source/lux/compiler/default/init.lux
index af31e03a4..3bfba340b 100644
--- a/stdlib/source/lux/compiler/default/init.lux
+++ b/stdlib/source/lux/compiler/default/init.lux
@@ -1,8 +1,11 @@
(.module:
lux
- ["." //
- [//
- ["." host]]])
+ [///
+ ["." host]])
+
+(type: #export Version Text)
+
+(def: #export version Version "0.6.0")
(def: #export (cursor file)
(-> Text Cursor)
@@ -33,7 +36,7 @@
(~~ (static host.r)) host.r
(~~ (static host.ruby)) host.ruby
(~~ (static host.scheme)) host.scheme})
- #.version //.version
+ #.version ..version
#.mode #.Build}))
(def: #export (compiler host)
diff --git a/stdlib/source/lux/compiler/default/phase.lux b/stdlib/source/lux/compiler/default/phase.lux
index 24bba1229..ae146be74 100644
--- a/stdlib/source/lux/compiler/default/phase.lux
+++ b/stdlib/source/lux/compiler/default/phase.lux
@@ -67,3 +67,6 @@
[[pre/state' temp] (pre input pre/state)
[post/state' output] (post temp post/state)]
(wrap [[pre/state' post/state'] output]))))
+
+(type: #export Eval
+ (-> Type Code (Error Any)))
diff --git a/stdlib/source/lux/compiler/default/phase/analysis/expression.lux b/stdlib/source/lux/compiler/default/phase/analysis/expression.lux
index 8a0a129bc..6b0d38a53 100644
--- a/stdlib/source/lux/compiler/default/phase/analysis/expression.lux
+++ b/stdlib/source/lux/compiler/default/phase/analysis/expression.lux
@@ -13,9 +13,9 @@
["." primitive]
["." structure]
["." reference]
- ["/." //
+ ["/." // (#+ Eval)
["." extension]
- ["//." // (#+ Eval)
+ [//
## [".L" macro]
]]])
diff --git a/stdlib/source/lux/compiler/meta/archive.lux b/stdlib/source/lux/compiler/meta/archive.lux
index 47572fe04..1e9240f7b 100644
--- a/stdlib/source/lux/compiler/meta/archive.lux
+++ b/stdlib/source/lux/compiler/meta/archive.lux
@@ -16,7 +16,8 @@
[world
[file (#+ File)]]]
[///
- ["." default (#+ Version)]])
+ [default
+ ["." init (#+ Version)]]])
## Key
(type: #export Signature
@@ -44,7 +45,7 @@
(def: #export default
(Key Nothing)
(:abstraction {#name ["" ""]
- #version default.version}))
+ #version init.version}))
(def: #export signature
(-> (Key Any) Signature)