diff options
author | Araq <rumpf_a@web.de> | 2011-09-24 11:50:46 +0200 |
---|---|---|
committer | Araq <rumpf_a@web.de> | 2011-09-24 11:50:46 +0200 |
commit | 92543a30372b742f186131e3f3265b5b965a9316 (patch) | |
tree | 84b9164e7b3a65bcf27bb3827ec1d3544cf3ecf0 /lib/system | |
parent | 98e5beb936d8743b4d8e07fc47a0ab47e5f8a342 (diff) | |
download | Nim-92543a30372b742f186131e3f3265b5b965a9316.tar.gz |
more fixes to get rid of tyPureObject
Diffstat (limited to 'lib/system')
-rwxr-xr-x | lib/system/channels.nim | 2 | ||||
-rwxr-xr-x | lib/system/ecmasys.nim | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/system/channels.nim b/lib/system/channels.nim index e443dd6c1..c2456c9c1 100755 --- a/lib/system/channels.nim +++ b/lib/system/channels.nim @@ -122,7 +122,7 @@ proc storeAux(dest, src: Pointer, mt: PNimType, t: PRawChannel, # XXX use dynamic type here! pint[] = mt storeAux(dest, src, mt.node, t, mode) - of tyTuple, tyPureObject: + of tyTuple: storeAux(dest, src, mt.node, t, mode) of tyArray, tyArrayConstr: for i in 0..(mt.size div mt.base.size)-1: diff --git a/lib/system/ecmasys.nim b/lib/system/ecmasys.nim index 5dc01f46e..e0d7db2ef 100755 --- a/lib/system/ecmasys.nim +++ b/lib/system/ecmasys.nim @@ -402,7 +402,7 @@ include "system/hti" proc isFatPointer(ti: PNimType): bool = # This has to be consistent with the code generator! return ti.base.kind notin {tyObject, - tyArray, tyArrayConstr, tyPureObject, tyTuple, + tyArray, tyArrayConstr, tyTuple, tyOpenArray, tySet, tyVar, tyRef, tyPtr} proc NimCopy(x: pointer, ti: PNimType): pointer {.compilerproc.} @@ -439,7 +439,7 @@ proc NimCopy(x: pointer, ti: PNimType): pointer = `result` = {}; for (var key in `x`) { `result`[key] = `x`[key]; } """ - of tyPureObject, tyTuple, tyObject: + of tyTuple, tyObject: if ti.base != nil: result = NimCopy(x, ti.base) elif ti.kind == tyObject: asm "`result` = {m_type: `ti`};" |