aboutsummaryrefslogtreecommitdiff
path: root/stdlib
diff options
context:
space:
mode:
authorEduardo Julian2018-08-20 18:53:08 -0400
committerEduardo Julian2018-08-20 18:53:08 -0400
commitbbf5fb06275b3eef9c9209713e1d667b41d8ec47 (patch)
tree8b27f028dd5b6f5a7cec4f9cc90aa3f5e9b7cbc1 /stdlib
parentcdc41f99c2c5ca860f13ead6b13fb2ad57b0673b (diff)
Fixed syntax bug.
Diffstat (limited to 'stdlib')
-rw-r--r--stdlib/source/lux/compiler/default/syntax.lux2
-rw-r--r--stdlib/source/lux/data/number.lux4
-rw-r--r--stdlib/test/test/lux/compiler/default/syntax.lux3
3 files changed, 4 insertions, 5 deletions
diff --git a/stdlib/source/lux/compiler/default/syntax.lux b/stdlib/source/lux/compiler/default/syntax.lux
index 7556e7e46..5f2d6d93b 100644
--- a/stdlib/source/lux/compiler/default/syntax.lux
+++ b/stdlib/source/lux/compiler/default/syntax.lux
@@ -614,8 +614,8 @@
(..record where ast')
(..text where)
(..nat where)
- (..int where)
(..frac where)
+ (..int where)
(..rev where)
(..bit where)
(..identifier current-module aliases where)
diff --git a/stdlib/source/lux/data/number.lux b/stdlib/source/lux/data/number.lux
index a1303f848..4b3b786b4 100644
--- a/stdlib/source/lux/data/number.lux
+++ b/stdlib/source/lux/data/number.lux
@@ -646,12 +646,12 @@
+1.0)]
(case ("lux text index" repr "." 0)
(#.Some split-index)
- (let [whole-part (maybe.assume ("lux text clip" repr (if (f/= -1.0 sign) 1 0) split-index))
+ (let [whole-part (maybe.assume ("lux text clip" repr 1 split-index))
decimal-part (maybe.assume ("lux text clip" repr (inc split-index) ("lux text size" repr)))
as-binary (|> (<to> decimal-part)
("lux text concat" ".")
("lux text concat" (<to> whole-part))
- ("lux text concat" (if (f/= -1.0 sign) "-" "")))]
+ ("lux text concat" (if (f/= -1.0 sign) "-" "+")))]
(case (:: Binary@Codec<Text,Frac> decode as-binary)
(#error.Error _)
(#error.Error ("lux text concat" <error> repr))
diff --git a/stdlib/test/test/lux/compiler/default/syntax.lux b/stdlib/test/test/lux/compiler/default/syntax.lux
index e52a6ea02..2b4a8f5b6 100644
--- a/stdlib/test/test/lux/compiler/default/syntax.lux
+++ b/stdlib/test/test/lux/compiler/default/syntax.lux
@@ -3,7 +3,6 @@
[control
[monad (#+ do)]]
[data
- [number]
["e" error]
["." text
format
@@ -123,7 +122,7 @@
(test "Can parse frac ratio syntax."
(case (&.read "" (dict.new text.Hash<Text>)
[default-cursor 0
- (format (if signed? "-" "")
+ (format (if signed? "-" "+")
(%i (frac-to-int numerator))
"/"
(%i (frac-to-int denominator)))])