aboutsummaryrefslogtreecommitdiff
path: root/stdlib/source/lux/tool/compiler
diff options
context:
space:
mode:
authorEduardo Julian2019-03-13 21:14:22 -0400
committerEduardo Julian2019-03-13 21:14:22 -0400
commit8e4b93bfc90ca81d615bf9dd5af43f29fdd0f5ae (patch)
tree0b343949908c11f8f27d70e4d40b1ccd0f969add /stdlib/source/lux/tool/compiler
parent810c2c9f524603c161f265e4ed17c6556bdef959 (diff)
Replaced the digit separator in numbers from "_" to ",".
Diffstat (limited to '')
-rw-r--r--stdlib/source/lux/tool/compiler/default/syntax.lux2
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme.lux5
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux4
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux5
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux4
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux3
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux6
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux8
-rw-r--r--stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux5
9 files changed, 22 insertions, 20 deletions
diff --git a/stdlib/source/lux/tool/compiler/default/syntax.lux b/stdlib/source/lux/tool/compiler/default/syntax.lux
index 528fa6854..4743d26ce 100644
--- a/stdlib/source/lux/tool/compiler/default/syntax.lux
+++ b/stdlib/source/lux/tool/compiler/default/syntax.lux
@@ -105,7 +105,7 @@
(def: #export sigil "#")
-(def: #export digit-separator "_")
+(def: #export digit-separator ",")
(def: #export positive-sign "+")
(def: #export negative-sign "-")
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
index 5e1947d20..df0db4c79 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme.lux
@@ -11,8 +11,9 @@
["." case]
["." loop]
["." ///
- ["." synthesis]
- ["." extension]]])
+ ["." extension]
+ [//
+ ["." synthesis]]]])
(def: #export (generate synthesis)
Phase
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
index d0f047c9f..aa04dc975 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/case.jvm.lux
@@ -18,9 +18,9 @@
[//
["common-." reference]
["//." // ("#/." monad)
- ["." synthesis (#+ Synthesis Path)]
[//
- [reference (#+ Register)]]]]])
+ [reference (#+ Register)]
+ ["." synthesis (#+ Synthesis Path)]]]]])
(def: #export register
(common-reference.local _.var))
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
index d430aba24..602eb923b 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/extension/common.jvm.lux
@@ -20,9 +20,10 @@
[///
["." runtime (#+ Operation Phase Handler Bundle)]
["//." ///
- ["." synthesis (#+ Synthesis)]
["." extension
- ["." bundle]]]])
+ ["." bundle]]
+ [//
+ ["." synthesis (#+ Synthesis)]]]])
(syntax: (Vector {size s.nat} elemT)
(wrap (list (` [(~+ (list.repeat size elemT))]))))
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
index e6069660b..891ef736c 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/function.jvm.lux
@@ -18,10 +18,10 @@
["/." //
["common-." reference]
["//." // ("#/." monad)
- [analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)]
- [synthesis (#+ Synthesis)]
[//
[reference (#+ Register Variable)]
+ [analysis (#+ Variant Tuple Environment Arity Abstraction Application Analysis)]
+ [synthesis (#+ Synthesis)]
["." name]]]]])
(def: #export (apply generate [functionS argsS+])
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
index 0e4adcf03..a177d6290 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/loop.jvm.lux
@@ -16,7 +16,8 @@
["//." case]
["/." //
["//." //
- [synthesis (#+ Scope Synthesis)]]]])
+ [//
+ [synthesis (#+ Scope Synthesis)]]]]])
(def: @scope (_.var "scope"))
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux
index b28cb1898..b531c38f7 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/reference.jvm.lux
@@ -2,10 +2,8 @@
[lux #*
[host
["_" scheme (#+ Expression)]]]
- [//
- [//
- [common
- ["." reference]]]])
+ [///
+ ["." reference]])
(def: #export system
(reference.system (: (-> Text Expression) _.global)
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
index 136e2ff2e..063e0c55f 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/runtime.jvm.lux
@@ -17,10 +17,10 @@
["_" scheme (#+ Expression Computation Var)]]]
["." ///
["//." //
- [analysis (#+ Variant)]
- ["." synthesis]
[//
- ["." name]]]])
+ [analysis (#+ Variant)]
+ ["." name]
+ ["." synthesis]]]])
(do-template [<name> <base>]
[(type: #export <name>
@@ -295,7 +295,7 @@
(runtime: (io//current-time _)
(|> (_.apply/* (_.global "current-second") (list))
- (_.*/2 (_.int +1_000))
+ (_.*/2 (_.int +1,000))
_.exact/1))
(def: runtime//io
diff --git a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
index c586f0706..7419ad239 100644
--- a/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
+++ b/stdlib/source/lux/tool/compiler/phase/generation/scheme/structure.jvm.lux
@@ -8,8 +8,9 @@
["." runtime (#+ Operation Phase)]
["." primitive]
["." ///
- [analysis (#+ Variant Tuple)]
- ["." synthesis (#+ Synthesis)]]])
+ [//
+ [analysis (#+ Variant Tuple)]
+ ["." synthesis (#+ Synthesis)]]]])
(def: #export (tuple generate elemsS+)
(-> Phase (Tuple Synthesis) (Operation Expression))