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

bugfixes: objects still invalid for constants; fixed a typo concerning 'high' in eval context

Browse source
This commit is contained in:
Araq 2011-11-15 23:03:14 +01:00
commit 7819b84475
8 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/evals.nim
View file

@ -641,7 +641,7 @@ proc evalHigh(c: PEvalContext, n: PNode): PNode =
result = evalAux(c, n.sons[1], {})
if isSpecial(result): return
case skipTypes(n.sons[1].typ, abstractVar).kind
of tyOpenArray, tySequence: result = newIntNodeT(sonsLen(result), n)
of tyOpenArray, tySequence: result = newIntNodeT(sonsLen(result)-1, n)
of tyString: result = newIntNodeT(len(result.strVal) - 1, n)
else: InternalError(n.info, "evalHigh")

7
compiler/seminst.nim
View file

@ -77,10 +77,9 @@ proc instantiateBody(c: PContext, n: PNode, result: PSym) =
if result.kind in {skProc, skMethod, skConverter}:
addResult(c, result.typ.sons[0], n.info)
addResultNode(c, n)
n.sons[bodyPos] = semStmtScope(c, n.sons[bodyPos])
if result.kind == skIterator:
# XXX Bad hack for tests/titer2:
n.sons[bodyPos] = transform(c.module, n.sons[bodyPos])
var b = semStmtScope(c, n.sons[bodyPos])
# XXX Bad hack for tests/titer2 and tests/tactiontable
n.sons[bodyPos] = transform(c.module, b)
#echo "code instantiated ", result.name.s
excl(result.flags, sfForward)
popProcCon(c)

11
compiler/transf.nim
View file

@ -736,11 +736,12 @@ proc processTransf(context: PPassContext, n: PNode): PNode =
# Note: For interactive mode we cannot call 'passes.skipCodegen' and skip
# this step! We have to rely that the semantic pass transforms too errornous
# nodes into an empty node.
if passes.skipCodegen(n) or context.fromCache: return n
if passes.skipCodegen(n) or context.fromCache or nfTransf in n.flags: return n
var c = PTransf(context)
pushTransCon(c, newTransCon(getCurrOwner(c)))
result = PNode(transform(c, n))
popTransCon(c)
incl(result.flags, nfTransf)
proc openTransf(module: PSym, filename: string): PPassContext =
var n: PTransf
@ -762,6 +763,10 @@ proc transfPass(): TPass =
result.close = processTransf # we need to process generics too!
proc transform*(module: PSym, n: PNode): PNode =
var c = openTransf(module, "")
result = processTransf(c, n)
if nfTransf in n.flags:
result = n
else:
var c = openTransf(module, "")
result = processTransf(c, n)
incl(result.flags, nfTransf)

13
compiler/types.nim
View file

@ -280,8 +280,8 @@ proc isGBCRef(t: PType): bool =
result = t.kind in {tyRef, tySequence, tyString}
proc containsGarbageCollectedRef(typ: PType): bool =
# returns true if typ contains a reference, sequence or string (all the things
# that are garbage-collected)
# returns true if typ contains a reference, sequence or string (all the
# things that are garbage-collected)
result = searchTypeFor(typ, isGBCRef)
proc isTyRef(t: PType): bool =
@ -868,11 +868,12 @@ proc typeAllowedAux(marker: var TIntSet, typ: PType, kind: TSymKind): bool =
for i in countup(0, sonsLen(t) - 1):
result = typeAllowedAux(marker, t.sons[i], kind)
if not result: break
of tyObject:
of tyObject:
if kind == skConst: return false
for i in countup(0, sonsLen(t) - 1):
result = typeAllowedAux(marker, t.sons[i], skVar)
if not result: break
if result and t.n != nil: result = typeAllowedNode(marker, t.n, skVar)
result = typeAllowedAux(marker, t.sons[i], kind)
if not result: break
if result and t.n != nil: result = typeAllowedNode(marker, t.n, kind)
proc typeAllowed(t: PType, kind: TSymKind): bool =
var marker = InitIntSet()