jyapayne/Nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7045 from GULPF/fmt-str-fallback

Browse source 
Add additional $ fallback to fmt
This commit is contained in:
Dominik Picheta 2018-01-09 16:22:38 +00:00 • committed by GitHub
commit e7e37713dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pure/strformat.nim
View file

@ -221,8 +221,10 @@ template callFormat(res, arg) {.dirty.} =
template callFormatOption(res, arg, option) {.dirty.} = template callFormatOption(res, arg, option) {.dirty.} =
when compiles(format(arg, option, res)): when compiles(format(arg, option, res)):
format(arg, option, res) format(arg, option, res)
else: elif compiles(format(arg, option)):
res.add format(arg, option) res.add format(arg, option)
else:
format($arg, option, res)
macro fmt*(pattern: string{lit}): untyped = macro fmt*(pattern: string{lit}): untyped =
## For a specification of the ``fmt`` macro, see the module level documentation. ## For a specification of the ``fmt`` macro, see the module level documentation.

13
tests/stdlib/tstrformat.nim Normal file
View file

@ -0,0 +1,13 @@
discard """
action: "run"
"""
import strformat
type Obj = object
proc `$`(o: Obj): string = "foobar"
var o: Obj
doAssert fmt"{o}" == "foobar"
doAssert fmt"{o:10}" == "foobar "