diff options
-rwxr-xr-x | compiler/ccgtypes.nim | 2 | ||||
-rwxr-xr-x | lib/system/channels.nim | 2 | ||||
-rwxr-xr-x | lib/system/ecmasys.nim | 4 | ||||
-rwxr-xr-x | tests/accept/compile/tdumpast.nim | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim index 20e3447b0..b1465c215 100755 --- a/compiler/ccgtypes.nim +++ b/compiler/ccgtypes.nim @@ -498,7 +498,7 @@ proc getTypeDescAux(m: BModule, typ: PType, check: var TIntSet): PRope = if not isImportedType(t): appf(m.s[cfsTypes], "typedef NU8 $1[$2];$n", [result, toRope(getSize(t))]) - of tyGenericInst, tyDistinct, tyOrdinal: + of tyGenericInst, tyDistinct, tyOrdinal, tyConst, tyMutable, tyIter: result = getTypeDescAux(m, lastSon(t), check) else: InternalError("getTypeDescAux(" & $t.kind & ')') 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`};" diff --git a/tests/accept/compile/tdumpast.nim b/tests/accept/compile/tdumpast.nim index 8561c6e42..653cdfa33 100755 --- a/tests/accept/compile/tdumpast.nim +++ b/tests/accept/compile/tdumpast.nim @@ -10,17 +10,17 @@ macro call(e: expr): expr = macro dumpAST(n: stmt): stmt = # dump AST as a side-effect and return the inner node - echo n.prettyPrint + echo n.toLisp echo n.toYaml var plusAst = getAst(plus(1, 2)) - echo plusAst.prettyPrint + echo plusAst.toLisp var callAst = getAst(call()) - echo callAst.prettyPrint + echo callAst.toLisp var e = parseExpr("foo(bar + baz)") - echo e.prettyPrint + echo e.toLisp result = n[1] |