From 50c370878c0f9985a8b6d1003af9e9f6282b853e Mon Sep 17 00:00:00 2001 From: Eduardo Julian Date: Thu, 12 Oct 2017 15:22:47 -0400 Subject: - Renamed "%r" to "%f". --- stdlib/source/lux/data/format/css.lux | 2 +- stdlib/source/lux/data/text/format.lux | 2 +- stdlib/test/test/lux/data/text/format.lux | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stdlib/source/lux/data/format/css.lux b/stdlib/source/lux/data/format/css.lux index 1de9e0192..0c4551e0a 100644 --- a/stdlib/source/lux/data/format/css.lux +++ b/stdlib/source/lux/data/format/css.lux @@ -75,7 +75,7 @@ (do-template [ ] [(def: #export ( value) (-> Frac Value) - (format (%r value) ))] + (format (%f value) ))] [em "em"] [ex "ex"] diff --git a/stdlib/source/lux/data/text/format.lux b/stdlib/source/lux/data/text/format.lux index c434d4637..f0b9d0e6f 100644 --- a/stdlib/source/lux/data/text/format.lux +++ b/stdlib/source/lux/data/text/format.lux @@ -41,7 +41,7 @@ [%n Nat (:: number;Codec encode)] [%i Int (:: number;Codec encode)] [%d Deg (:: number;Codec encode)] - [%r Frac (:: number;Codec encode)] + [%f Frac (:: number;Codec encode)] [%t Text text;encode] [%ident Ident (:: ident;Codec encode)] [%code Code code;to-text] diff --git a/stdlib/test/test/lux/data/text/format.lux b/stdlib/test/test/lux/data/text/format.lux index 9ffa120bb..d1f7fc9f0 100644 --- a/stdlib/test/test/lux/data/text/format.lux +++ b/stdlib/test/test/lux/data/text/format.lux @@ -12,8 +12,10 @@ ($_ seq (test "Can format common values simply." (and (&/= "true" (%b true)) + (&/= "+123" (%n +123)) (&/= "123" (%i 123)) - (&/= "123.456" (%r 123.456)) + (&/= "123.456" (%f 123.456)) + (&/= ".5" (%d .5)) (&/= "\"YOLO\"" (%t "YOLO")) (&/= "User-id: 123 -- Active: true" (format "User-id: " (%i 123) " -- Active: " (%b true))))) ))) -- cgit v1.2.3