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

fixes #11691

Browse source
This commit is contained in:
Araq 2019-07-10 15:28:15 +02:00
commit 6663dbbe57
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/ccgtypes.nim
View file

@ -405,9 +405,9 @@ proc getTypeDescWeak(m: BModule; t: PType; check: var IntSet): Rope =
m.typeCache[sig] = result m.typeCache[sig] = result
#echo "adding ", sig, " ", typeToString(t), " ", m.module.name.s #echo "adding ", sig, " ", typeToString(t), " ", m.module.name.s
appcg(m, m.s[cfsTypes], appcg(m, m.s[cfsTypes],
"struct $1 {$n" & "struct $1 {$N" &
" NI len; $1_Content* p;$n" & " NI len; $1_Content* p;$N" &
"};$n", [result]) "};$N", [result])
else: else:
result = getTypeForward(m, t, sig) & seqStar(m) result = getTypeForward(m, t, sig) & seqStar(m)
pushType(m, t) pushType(m, t)
@ -427,11 +427,11 @@ proc seqV2ContentType(m: BModule; t: PType; check: var IntSet) =
else: else:
# little hack for now to prevent multiple definitions of the same # little hack for now to prevent multiple definitions of the same
# Seq_Content: # Seq_Content:
appcg(m, m.s[cfsTypes], """ appcg(m, m.s[cfsTypes], """$N
$3ifndef $2_Content_PP $3ifndef $2_Content_PP
$3define $2_Content_PP $3define $2_Content_PP
struct $2_Content { NI cap;#AllocatorObj* allocator;$1 data[SEQ_DECL_SIZE];}; struct $2_Content { NI cap;#AllocatorObj* allocator;$1 data[SEQ_DECL_SIZE];};
$3endif $3endif$N
""", [getTypeDescAux(m, t.skipTypes(abstractInst).sons[0], check), result, rope"#"]) """, [getTypeDescAux(m, t.skipTypes(abstractInst).sons[0], check), result, rope"#"])
proc paramStorageLoc(param: PSym): TStorageLoc = proc paramStorageLoc(param: PSym): TStorageLoc =