mirrors/Nim
1
0
Fork 0
mirror of https://github.com/nim-lang/Nim.git synced 2026-04-25 16:53:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixes #4428

Browse Source
This commit is contained in:
Andreas Rumpf
2016-07-19 15:24:42 +02:00
parent 9eb909baf9
commit 2d8572e948
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
compiler/cgmeth.nim
View File

@@ -69,13 +69,19 @@ proc sameMethodBucket(a, b: PSym): MethodResult =
else:
break
if sameType(aa, bb):
if aa.kind == tyObject and result != Invalid: result = Yes
if aa.kind == tyObject and result != Invalid:
result = Yes
elif aa.kind == tyObject and bb.kind == tyObject:
let diff = inheritanceDiff(bb, aa)
if diff < 0:
if result != Invalid: result = Yes
if result != Invalid:
result = Yes
else:
return No
elif diff != high(int):
result = Invalid
else:
return No
else:
return No

2
compiler/docgen.nim
View File

@@ -355,7 +355,7 @@ proc docstringSummary(rstText: string): string =
## Also, we hope to not break the rst, but maybe we do. If there is any
## trimming done, an ellipsis unicode char is added.
const maxDocstringChars = 100
assert (rstText.len < 2 or (rstText[0] == '#' and rstText[1] == '#'))
assert(rstText.len < 2 or (rstText[0] == '#' and rstText[1] == '#'))
result = rstText.substr(2).strip
var pos = result.find('\L')
if pos > 0: