From e605b22ccfbb050c50354b648973a0ecf1fa4593 Mon Sep 17 00:00:00 2001 From: Araq Date: Fri, 21 Sep 2012 20:19:39 +0200 Subject: bugfix: typeinfo generation (2) --- compiler/ccgtypes.nim | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'compiler') diff --git a/compiler/ccgtypes.nim b/compiler/ccgtypes.nim index d99740ed4..7a254e867 100755 --- a/compiler/ccgtypes.nim +++ b/compiler/ccgtypes.nim @@ -904,8 +904,9 @@ proc genTypeInfo(m: BModule, typ: PType): PRope = discard cgsym(m, "TNimNode") appf(m.s[cfsVars], "extern TNimType $1; /* $2 */$n", [result, toRope(typeToString(t))]) - return con("&", result) - if ContainsOrIncl(m.typeInfoMarker, t.id): return con("&", result) + return con("(&".toRope, result, ")".toRope) + if ContainsOrIncl(m.typeInfoMarker, t.id): + return con("(&".toRope, result, ")".toRope) case t.kind of tyEmpty: result = toRope"0" of tyPointer, tyBool, tyChar, tyCString, tyString, tyInt..tyUInt64, tyVar: @@ -932,7 +933,7 @@ proc genTypeInfo(m: BModule, typ: PType): PRope = # results are not deterministic! genTupleInfo(m, t, result) else: InternalError("genTypeInfo(" & $t.kind & ')') - result = con("&", result) + result = con("(&".toRope, result, ")".toRope) proc genTypeSection(m: BModule, n: PNode) = nil -- cgit 1.4.1-2-gfad0