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

make tests green again

Browse Source
This commit is contained in:
Araq
2016-11-01 07:16:07 +01:00
parent 45c6f9bb69
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.magic == m:
# 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
r = nextIdentIter(ti, systemModule.tab)
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)
else: lexMessage(L, errTokenExpected, "']'")
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 len(val) > 0: add(val, ':')
confTok(L, tok) # skip ':' or '=' or '%'