fixes #10963, disallow implicit mixing of strings and ints/floats (#11292)

This commit is contained in:
Miran 2019-05-21 21:32:37 +02:00 • committed by Andreas Rumpf
commit bab5e30972
6 changed files with 25 additions and 17 deletions

View file

@ -425,7 +425,7 @@ proc value(this: var DebugPrinter; value: string) =
proc value(this: var DebugPrinter; value: BiggestInt) =
if this.useColor:
this.res.add numberStyle
this.res.add value
this.res.addInt value
if this.useColor:
this.res.add resetStyle
@ -460,7 +460,7 @@ template earlyExit(this: var DebugPrinter; n: PType | PNode | PSym) =
if this.useColor:
this.res.add backrefStyle
this.res.add "<defined "
this.res.add(this.currentLine - index)
this.res.addInt(this.currentLine - index)
this.res.add " lines upwards>"
if this.useColor:
this.res.add resetStyle

View file

@ -111,7 +111,7 @@ proc cgFormatValue(result: var string; value: string): void =
result.add value
proc cgFormatValue(result: var string; value: BiggestInt): void =
result.add value
result.addInt value
# TODO: please document
macro ropecg(m: BModule, frmt: static[FormatStr], args: untyped): Rope =

View file

@ -82,7 +82,7 @@ proc codeListing(c: ControlFlowGraph, result: var string, start=0; last = -1) =
result.add renderTree(c[i].n)
of goto, fork, join:
result.add "L"
result.add c[i].dest+i
result.addInt c[i].dest+i
result.add("\t#")
result.add(debugInfo(c[i].n.info))
result.add("\n")

View file

@ -20,9 +20,9 @@ type
proc doWrite(f: var NdiFile; s: PSym; conf: ConfigRef) =
f.buf.setLen 0
f.buf.add s.info.line.int
f.buf.addInt s.info.line.int
f.buf.add "\t"
f.buf.add s.info.col.int
f.buf.addInt s.info.col.int
f.f.write(s.name.s, "\t")
f.f.writeRope(s.loc.r)
f.f.writeLine("\t", toFullPath(conf, s.info), "\t", f.buf)