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

style improvements

Browse source
This commit is contained in:
cooldome 2018-06-12 09:17:24 +01:00
commit 44d82d9492
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/patterns.nim
View file

@ -77,7 +77,7 @@ proc checkTypes(c: PPatternContext, p: PSym, n: PNode): bool =
if isNil(n.typ): if isNil(n.typ):
result = p.typ.kind in {tyVoid, tyStmt} result = p.typ.kind in {tyVoid, tyStmt}
else: else:
result = sigmatch.argtypeMatches(c.c, p.typ, n.typ, from_hlo = true) result = sigmatch.argtypeMatches(c.c, p.typ, n.typ, fromHlo = true)
proc isPatternParam(c: PPatternContext, p: PNode): bool {.inline.} = proc isPatternParam(c: PPatternContext, p: PNode): bool {.inline.} =
result = p.kind == nkSym and p.sym.kind == skParam and p.sym.owner == c.owner result = p.kind == nkSym and p.sym.kind == skParam and p.sym.owner == c.owner

4
compiler/sigmatch.nim
View file

@ -2359,14 +2359,14 @@ proc matches*(c: PContext, n, nOrig: PNode, m: var TCandidate) =
for t in m.inferredTypes: for t in m.inferredTypes:
if t.sonsLen > 1: t.sons.setLen 1 if t.sonsLen > 1: t.sons.setLen 1
proc argtypeMatches*(c: PContext, f, a: PType, from_hlo = false): bool = proc argtypeMatches*(c: PContext, f, a: PType, fromHlo = false): bool =
var m: TCandidate var m: TCandidate
initCandidate(c, m, f) initCandidate(c, m, f)
let res = paramTypesMatch(m, f, a, ast.emptyNode, nil) let res = paramTypesMatch(m, f, a, ast.emptyNode, nil)
#instantiateGenericConverters(c, res, m) #instantiateGenericConverters(c, res, m)
# XXX this is used by patterns.nim too; I think it's better to not # XXX this is used by patterns.nim too; I think it's better to not
# instantiate generic converters for that # instantiate generic converters for that
if not from_hlo: if not fromHlo:
res != nil res != nil
else: else:
# pattern templates do not allow for conversions except from int literal # pattern templates do not allow for conversions except from int literal