followup strformat PR. backslash escapes, tests, docs (#17700)

* Allow use of colons inside fmt
allowing colons inside fmt by replacing the format specifier delimiter lets arbitrary nim code be run within fmt expressions.

Co-authored-by: flywind <xzsflywind@gmail.com>

* formatting,documentation,backslash escapes

Adding support for evaluating expressions by special-casing parentheses causes this regression: `&"""{ "(hello)" }"""` no longer parses.
In addition, code such as &"""{(if open: '(' else: ')')}""" wouldn't work.
To enable that, as well as the use of, e.g. Table constructors inside curlies, I've added backslash escapes.
This also means that if/for/etc statements, unparenthesized, will work, if the colons are escaped, but i've left that under-documented.

It's not exactly elegant having two types of escape, but I believe it's the least bad option.

* changelog
* added json strformat test
* pulled my thumb out and wrote a parser

Co-authored-by: Andreas Rumpf <rumpf_a@web.de>
Co-authored-by: flywind <xzsflywind@gmail.com>
This commit is contained in:
shirleyquirk
2021-04-12 06:32:37 +01:00
committed by GitHub
parent cae1839154
commit 0bc943ad54
3 changed files with 89 additions and 5 deletions

View File

@@ -1,7 +1,7 @@
# xxx: test js target
import genericstrformat
import std/[strformat, strutils, times]
import std/[strformat, strutils, times, tables, json]
proc main() =
block: # issue #7632
@@ -284,6 +284,20 @@ proc main() =
doAssert fmt"{123.456=:>13e}" == "123.456= 1.234560e+02"
doAssert fmt"{123.456=:13e}" == "123.456= 1.234560e+02"
let x = 3.14
doAssert fmt"{(if x!=0: 1.0/x else: 0):.5}" == "0.31847"
doAssert fmt"""{(block:
var res: string
for i in 1..15:
res.add (if i mod 15 == 0: "FizzBuzz"
elif i mod 5 == 0: "Buzz"
elif i mod 3 == 0: "Fizz"
else: $i) & " "
res)}""" == "1 2 Fizz 4 Buzz Fizz 7 8 Fizz Buzz 11 Fizz 13 14 FizzBuzz "
doAssert fmt"""{ "\{(" & msg & ")\}" }""" == "{(hello)}"
doAssert fmt"""{{({ msg })}}""" == "{(hello)}"
doAssert fmt"""{ $(\{msg:1,"world":2\}) }""" == """[("hello", 1), ("world", 2)]"""
block: # tests for debug format string
var name = "hello"
let age = 21
@@ -496,6 +510,50 @@ proc main() =
block: # test low(int64)
doAssert &"{low(int64):-}" == "-9223372036854775808"
block: #expressions plus formatting
doAssert fmt"{if true\: 123.456 else\: 0=:>9.3f}" == "if true: 123.456 else: 0= 123.456"
doAssert fmt"{(if true: 123.456 else: 0)=}" == "(if true: 123.456 else: 0)=123.456"
doAssert fmt"{if true\: 123.456 else\: 0=:9.3f}" == "if true: 123.456 else: 0= 123.456"
doAssert fmt"{(if true: 123.456 else: 0)=:9.4f}" == "(if true: 123.456 else: 0)= 123.4560"
doAssert fmt"{(if true: 123.456 else: 0)=:>9.0f}" == "(if true: 123.456 else: 0)= 123."
doAssert fmt"{if true\: 123.456 else\: 0=:<9.4f}" == "if true: 123.456 else: 0=123.4560 "
doAssert fmt"""{(case true
of false: 0.0
of true: 123.456)=:e}""" == """(case true
of false: 0.0
of true: 123.456)=1.234560e+02"""
doAssert fmt"""{block\:
var res = 0.000123456
for _ in 0..5\:
res *= 10
res=:>13e}""" == """block:
var res = 0.000123456
for _ in 0..5:
res *= 10
res= 1.234560e+02"""
#side effects
var x = 5
doAssert fmt"{(x=7;123.456)=:13e}" == "(x=7;123.456)= 1.234560e+02"
doAssert x==7
block: #curly bracket expressions and tuples
proc formatValue(result: var string; value:Table|bool|JsonNode; specifier:string) = result.add $value
doAssert fmt"""{\{"a"\:1,"b"\:2\}.toTable() = }""" == """{"a":1,"b":2}.toTable() = {"a": 1, "b": 2}"""
doAssert fmt"""{(\{3: (1,"hi",0.9),4: (4,"lo",1.1)\}).toTable()}""" == """{3: (1, "hi", 0.9), 4: (4, "lo", 1.1)}"""
doAssert fmt"""{ (%* \{"name": "Isaac", "books": ["Robot Dreams"]\}) }""" == """{"name":"Isaac","books":["Robot Dreams"]}"""
doAssert """%( \%\* {"name": "Isaac"})*""".fmt('%','*') == """{"name":"Isaac"}"""
block: #parens in quotes that fool my syntax highlighter
doAssert fmt"{(if true: ')' else: '(')}" == ")"
doAssert fmt"{(if true: ']' else: ')')}" == "]"
doAssert fmt"""{(if true: "\")\"" else: "\"(")}""" == """")""""
doAssert &"""{(if true: "\")" else: "")}""" == "\")"
doAssert &"{(if true: \"\\\")\" else: \"\")}" == "\")"
doAssert fmt"""{(if true: "')" else: "")}""" == "')"
doAssert fmt"""{(if true: "'" & "'" & ')' else: "")}""" == "'')"
doAssert &"""{(if true: "'" & "'" & ')' else: "")}""" == "'')"
doAssert &"{(if true: \"\'\" & \"'\" & ')' else: \"\")}" == "'')"
doAssert fmt"""{(if true: "'" & ')' else: "")}""" == "')"
# xxx static: main()
main()