mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-28 18:24:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

make some tests green

Browse Source
This commit is contained in:
Andreas Rumpf
2017-03-07 12:34:45 +01:00
parent 9ed322323e
commit 538c6c9898
5 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
compiler/suggest.nim
View File

@@ -156,8 +156,9 @@ proc `$`*(suggest: Suggest): string =
if suggestVersion == 2:
result.add(sep)
result.add($suggest.quality)
result.add(sep)
result.add($suggest.prefix)
if suggest.section == ideSug:
result.add(sep)
result.add($suggest.prefix)
proc symToSuggest(s: PSym, isLocal: bool, section: string;
quality: range[0..100], prefix: PrefixMatch; inTypeContext: bool): Suggest =

7
tools/nimsuggest/tester.nim
View File

@@ -164,7 +164,6 @@ proc sexpToAnswer(s: SexpNode): string =
doAssert m.kind == SList
for a in m:
doAssert a.kind == SList
var first = true
#s.section,
#s.symkind,
#s.qualifiedPath.map(newSString),
@@ -300,9 +299,11 @@ proc runTest(filename: string): int =
proc main() =
var failures = 0
when false:
let x = getAppDir() / "tests/tchk1.nim"
if os.paramCount() > 0:
let f = os.paramStr(1)
let x = getAppDir() / f
let xx = expandFilename x
failures += runTest(xx)
failures += runEpcTest(xx)
else:
for x in walkFiles(getAppDir() / "tests/t*.nim"):

6
tools/nimsuggest/tests/tdot1.nim
View File

@@ -1,9 +1,9 @@
discard """
$nimsuggest --tester $file
>sug $1
sug;;skField;;x;;int;;$file;;11;;4;;"";;100
sug;;skField;;y;;int;;$file;;11;;7;;"";;100
sug;;skProc;;tdot1.main;;proc (f: Foo);;$file;;13;;5;;"";;100
sug;;skField;;x;;int;;$file;;11;;4;;"";;100;;None
sug;;skField;;y;;int;;$file;;11;;7;;"";;100;;None
sug;;skProc;;tdot1.main;;proc (f: Foo);;$file;;13;;5;;"";;100;;None
"""
type

14
tools/nimsuggest/tests/tdot2.nim
View File

@@ -17,13 +17,13 @@ proc main(f: Foo) =
discard """
$nimsuggest --tester $file
>sug $1
sug;;skField;;x;;int;;$file;;8;;4;;"";;100
sug;;skField;;y;;int;;$file;;8;;7;;"";;100
sug;;skProc;;tdot2.main;;proc (f: Foo);;$file;;12;;5;;"";;100
sug;;skField;;x;;int;;$file;;8;;4;;"";;100;;None
sug;;skField;;y;;int;;$file;;8;;7;;"";;100;;None
sug;;skProc;;tdot2.main;;proc (f: Foo);;$file;;12;;5;;"";;100;;None
!edit 0i32 1i32
>sug $1
sug;;skField;;x;;int;;$file;;8;;4;;"";;100
sug;;skField;;y;;int;;$file;;8;;7;;"";;100
sug;;skField;;z;;string;;$file;;10;;6;;"";;100
sug;;skProc;;tdot2.main;;proc (f: Foo);;$file;;12;;5;;"";;100
sug;;skField;;x;;int;;$file;;8;;4;;"";;100;;None
sug;;skField;;y;;int;;$file;;8;;7;;"";;100;;None
sug;;skField;;z;;string;;$file;;10;;6;;"";;100;;None
sug;;skProc;;tdot2.main;;proc (f: Foo);;$file;;12;;5;;"";;100;;None
"""

14
tools/nimsuggest/tests/tdot3.nim
View File

@@ -12,16 +12,16 @@ discard """
!copy dep_v1.nim dep.nim
$nimsuggest --tester $file
>sug $1
sug;;skField;;x;;int;;*dep.nim;;8;;4;;"";;100
sug;;skField;;y;;int;;*dep.nim;;8;;8;;"";;100
sug;;skProc;;tdot3.main;;proc (f: Foo);;$file;;5;;5;;"";;100
sug;;skField;;x;;int;;*dep.nim;;8;;4;;"";;100;;None
sug;;skField;;y;;int;;*dep.nim;;8;;8;;"";;100;;None
sug;;skProc;;tdot3.main;;proc (f: Foo);;$file;;5;;5;;"";;100;;None
!copy dep_v2.nim dep.nim
>mod $path/dep.nim
>sug $1
sug;;skField;;x;;int;;*dep.nim;;8;;4;;"";;100
sug;;skField;;y;;int;;*dep.nim;;8;;8;;"";;100
sug;;skField;;z;;string;;*dep.nim;;9;;4;;"";;100
sug;;skProc;;tdot3.main;;proc (f: Foo);;$file;;5;;5;;"";;100
sug;;skField;;x;;int;;*dep.nim;;8;;4;;"";;100;;None
sug;;skField;;y;;int;;*dep.nim;;8;;8;;"";;100;;None
sug;;skField;;z;;string;;*dep.nim;;9;;4;;"";;100;;None
sug;;skProc;;tdot3.main;;proc (f: Foo);;$file;;5;;5;;"";;100;;None
!del dep.nim
"""