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

make tests green again

Browse source
This commit is contained in:
Araq 2016-11-01 07:16:07 +01:00
commit 65801e4b6e
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/magicsys.nim
View file

@ -54,7 +54,7 @@ proc getSysMagic*(name: string, m: TMagic): PSym =
if r.kind == skStub: loadStub(r) if r.kind == skStub: loadStub(r)
if r.magic == m: if r.magic == m:
# prefer the tyInt variant: # prefer the tyInt variant:
if r.typ.sons[0].kind == tyInt: return r if r.typ.sons[0] != nil and r.typ.sons[0].kind == tyInt: return r
result = r result = r
r = nextIdentIter(ti, systemModule.tab) r = nextIdentIter(ti, systemModule.tab)
if result != nil: return result if result != nil: return result

2
compiler/nimconf.nim
View file

@ -179,7 +179,7 @@ proc parseAssignment(L: var TLexer, tok: var TToken) =
if tok.tokType == tkBracketRi: confTok(L, tok) if tok.tokType == tkBracketRi: confTok(L, tok)
else: lexMessage(L, errTokenExpected, "']'") else: lexMessage(L, errTokenExpected, "']'")
add(val, ']') add(val, ']')
let percent = tok.ident.s == "%=" let percent = tok.ident != nil and tok.ident.s == "%="
if tok.tokType in {tkColon, tkEquals} or percent: if tok.tokType in {tkColon, tkEquals} or percent:
if len(val) > 0: add(val, ':') if len(val) > 0: add(val, ':')
confTok(L, tok) # skip ':' or '=' or '%' confTok(L, tok) # skip ':' or '=' or '%'