From 75e0201fadacd29b3bbee1fdd6a1ba2c16c32bb8 Mon Sep 17 00:00:00 2001 From: Bruce Hill Date: Sun, 15 Sep 2024 14:03:16 -0400 Subject: Improve automatic text quoting so it minimizes escape sequences when possible. --- test/enums.tm | 7 ++----- test/lang.tm | 2 +- test/text.tm | 8 ++++---- 3 files changed, 7 insertions(+), 10 deletions(-) (limited to 'test') diff --git a/test/enums.tm b/test/enums.tm index a96f5784..0699fc97 100644 --- a/test/enums.tm +++ b/test/enums.tm @@ -55,11 +55,11 @@ func main(): >> choose_text(Foo.Two(123, 456)) = "Two: x=123, y=456" >> choose_text(Foo.Three(123, "hi", yes)) - = "Three: Three(x=123, y=\"hi\", z=yes)" + = 'Three: Three(x=123, y="hi", z=yes)' >> choose_text(Foo.Four(1,2,3,4)) = "Four" >> choose_text(Foo.Last("XX")) - = "else: Foo.Last(\"XX\")" + = 'else: Foo.Last("XX")' i := 1 cases := [Foo.One(1), Foo.One(2), Foo.Zero] @@ -72,6 +72,3 @@ func main(): else: -1 = 2 - - - diff --git a/test/lang.tm b/test/lang.tm index e23410e7..a637b442 100644 --- a/test/lang.tm +++ b/test/lang.tm @@ -40,4 +40,4 @@ func main(): = $HTML"

Hello I <3 hax!

" >> Text(html) - = "$HTML\"Hello I <3 hax!\"" + = '$HTML"Hello I <3 hax!"' diff --git a/test/text.tm b/test/text.tm index 44e42d35..5de66a60 100644 --- a/test/text.tm +++ b/test/text.tm @@ -20,7 +20,7 @@ func main(): = ["PENGUIN"] >> \[31;1] - = "\e[31;1m" + = "$\e[31;1m" >> \UE9 == \U65\U301 = yes @@ -91,20 +91,20 @@ func main(): line one line two " - = "line one\nline two" + = "line one$\nline two" !! Interpolation tests: >> "A $(1+2)" = "A 3" >> 'A $(1+2)' - = "A $(1+2)" + = 'A $(1+2)' >> `A $(1+2)` = "A 3" >> $"A $(1+2)" = "A 3" >> $$"A $(1+2)" - = "A $(1+2)" + = 'A $(1+2)' >> $="A =(1+2)" = "A 3" >> ${one {nested} two $(1+2)} -- cgit v1.2.3