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

fixes #4428

Browse source
This commit is contained in:
Andreas Rumpf 2016-07-19 15:24:42 +02:00
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,15 +69,21 @@ proc sameMethodBucket(a, b: PSym): MethodResult =
else: else:
break break
if sameType(aa, bb): 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: elif aa.kind == tyObject and bb.kind == tyObject:
let diff = inheritanceDiff(bb, aa) let diff = inheritanceDiff(bb, aa)
if diff < 0: if diff < 0:
if result != Invalid: result = Yes if result != Invalid:
result = Yes
else:
return No
elif diff != high(int): elif diff != high(int):
result = Invalid result = Invalid
else: else:
return No return No
else:
return No
proc attachDispatcher(s: PSym, dispatcher: PNode) = proc attachDispatcher(s: PSym, dispatcher: PNode) =
var L = s.ast.len-1 var L = s.ast.len-1

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 ## Also, we hope to not break the rst, but maybe we do. If there is any
## trimming done, an ellipsis unicode char is added. ## trimming done, an ellipsis unicode char is added.
const maxDocstringChars = 100 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 result = rstText.substr(2).strip
var pos = result.find('\L') var pos = result.find('\L')
if pos > 0: if pos > 0: