diff options
| author | Aman Gupta <aman@tmm1.net> | 2015-10-02 18:08:23 -0700 |
|---|---|---|
| committer | Aman Gupta <aman@tmm1.net> | 2015-10-02 18:08:23 -0700 |
| commit | 1639de0a4e18f9e055c2412efe326a1e1b904f61 (patch) | |
| tree | 3a99e19c8023c5bf78b56a2005776cb5a2b01ca7 /lib/pure | |
| parent | 1652fd0431de1391cd2bb29166e813ad9f16db46 (diff) | |
| download | Nim-1639de0a4e18f9e055c2412efe326a1e1b904f61.tar.gz | |
remove trailing whitespace requirement from subexes test file
Diffstat (limited to 'lib/pure')
| -rw-r--r-- | lib/pure/subexes.nim | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/lib/pure/subexes.nim b/lib/pure/subexes.nim index 04c43463b..5824ace81 100644 --- a/lib/pure/subexes.nim +++ b/lib/pure/subexes.nim @@ -351,6 +351,7 @@ proc format*(formatstr: Subex, a: varargs[string, `$`]): string {.noSideEffect, {.pop.} when isMainModule: + from strutils import replace proc `%`(formatstr: string, a: openarray[string]): string = result = newStringOfCap(formatstr.len + a.len shl 4) @@ -382,18 +383,18 @@ when isMainModule: doAssert "${$1}" % "1" == "1" doAssert "${$$-1} $$1" % "1" == "1 $1" - doAssert "$#($', '10c'\n '{#..})" % ["doAssert", "longishA", "longish"] == + doAssert(("$#($', '10c'\n '{#..})" % ["doAssert", "longishA", "longish"]).replace(" \n", "\n") == """doAssert( - longishA, - longish)""" + longishA, + longish)""") - assert "type MyEnum* = enum\n $', '2i'\n '{..}" % ["fieldA", - "fieldB", "FiledClkad", "fieldD", "fieldE", "longishFieldName"] == + doAssert(("type MyEnum* = enum\n $', '2i'\n '{..}" % ["fieldA", + "fieldB", "FiledClkad", "fieldD", "fieldE", "longishFieldName"]).replace(" \n", "\n") == strutils.unindent """ type MyEnum* = enum - fieldA, fieldB, - FiledClkad, fieldD, - fieldE, longishFieldName""" + fieldA, fieldB, + FiledClkad, fieldD, + fieldE, longishFieldName""") doAssert subex"$1($', '{2..})" % ["f", "a", "b", "c"] == "f(a, b, c)" @@ -401,12 +402,10 @@ when isMainModule: doAssert subex"$['''|'|''''|']']#" % "0" == "'|" - assert subex("type\n Enum = enum\n $', '40c'\n '{..}") % [ - "fieldNameA", "fieldNameB", "fieldNameC", "fieldNameD"] == + doAssert((subex("type\n Enum = enum\n $', '40c'\n '{..}") % [ + "fieldNameA", "fieldNameB", "fieldNameC", "fieldNameD"]).replace(" \n", "\n") == strutils.unindent """ type Enum = enum - fieldNameA, fieldNameB, fieldNameC, - fieldNameD""" - - + fieldNameA, fieldNameB, fieldNameC, + fieldNameD""") |