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

fix off by 1 error in col shown by toFileLineCol (#10138)

Browse source 
* fix off by 1 error in `col` shown by toFileLineCol
* fix test failures
This commit is contained in:
Timothee Cour 2018-12-31 06:42:01 -08:00 • committed by Andreas Rumpf
commit ab72d68ec8
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/msgs.nim
View file

@ -208,7 +208,7 @@ proc toFileLine*(conf: ConfigRef; info: TLineInfo): string {.inline.} =
result = toFilename(conf, info) & ":" & $info.line result = toFilename(conf, info) & ":" & $info.line
proc toFileLineCol*(conf: ConfigRef; info: TLineInfo): string {.inline.} = proc toFileLineCol*(conf: ConfigRef; info: TLineInfo): string {.inline.} =
result = toFilename(conf, info) & "(" & $info.line & ", " & $info.col & ")" result = toFilename(conf, info) & "(" & $info.line & ", " & $(info.col+1) & ")"
proc `$`*(conf: ConfigRef; info: TLineInfo): string = toFileLineCol(conf, info) proc `$`*(conf: ConfigRef; info: TLineInfo): string = toFileLineCol(conf, info)

2
tests/discard/tneedsdiscard.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: '''expression 'open(f, "arg.txt", fmRead, -1)' is of type 'bool' and has to be discarded; start of expression here: tneedsdiscard.nim(7, 2)''' errormsg: '''expression 'open(f, "arg.txt", fmRead, -1)' is of type 'bool' and has to be discarded; start of expression here: tneedsdiscard.nim(7, 3)'''
line: 10 line: 10
""" """

2
tests/method/tmapper.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: "invalid declaration order; cannot attach 'step' to method defined here: tmapper.nim(22, 7)" errormsg: "invalid declaration order; cannot attach 'step' to method defined here: tmapper.nim(22, 8)"
line: 25 line: 25
""" """

2
tests/modules/tmismatchedvisibility.nim
View file

@ -1,5 +1,5 @@
discard """ discard """
errormsg: "public implementation 'tmismatchedvisibility.foo(a: int)[declared in tmismatchedvisibility.nim(6, 5)]' has non-public forward declaration in " errormsg: "public implementation 'tmismatchedvisibility.foo(a: int)[declared in tmismatchedvisibility.nim(6, 6)]' has non-public forward declaration in "
line: 8 line: 8
""" """