re-enable rodfiles tests; fixes #91

This commit is contained in:
Zahary Karadjov
2012-04-11 01:14:56 +03:00
parent c1ad05c4c5
commit 238202ccbc
7 changed files with 25 additions and 6 deletions

View File

@@ -53,7 +53,8 @@ proc genSingleVar(p: BProc, a: PNode) =
var targetProc = p
var immediateAsgn = a.sons[2].kind != nkEmpty
if sfGlobal in v.flags:
targetProc = p.module.preInitProc
if v.owner.kind != skModule:
targetProc = p.module.preInitProc
assignGlobalVar(targetProc, v)
genObjectInit(targetProc, cpsInit, v.typ, v.loc, true)
else:

View File

@@ -181,7 +181,12 @@ proc semTypeIdent(c: PContext, n: PNode): PSym =
if result != nil:
markUsed(n, result)
if result.kind == skParam and result.typ.kind == tyTypeDesc:
return result.typ.sons[0].sym
# This is a typedesc param. is it already bound?
# it's not bound when it's also used as return type for example
if result.typ.sonsLen > 0:
return result.typ.sons[0].sym
else:
return result.typ.sym
if result.kind != skType: GlobalError(n.info, errTypeExpected)
if result.typ.kind != tyGenericParam:
# XXX get rid of this hack!