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

fixes #11048

Browse source
This commit is contained in:
Araq 2019-04-17 13:22:12 +02:00
commit 5bdab044f5
2 changed files with 3 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/ccgexprs.nim
View file

@ -808,18 +808,15 @@ proc genFieldCheck(p: BProc, e: PNode, obj: Rope, field: PSym) =
v.r.add(".") v.r.add(".")
v.r.add(disc.sym.loc.r) v.r.add(disc.sym.loc.r)
genInExprAux(p, it, u, v, test) genInExprAux(p, it, u, v, test)
let id = nodeTableTestOrSet(p.module.dataCache, let strLit = genStringLiteral(p.module, newStrNode(nkStrLit, field.name.s))
newStrNode(nkStrLit, field.name.s), p.module.labels)
let strLit = if id == p.module.labels: genStringLiteralDataOnly(p.module, field.name.s, e.info)
else: p.module.tmpBase & rope(id)
if op.magic == mNot: if op.magic == mNot:
linefmt(p, cpsStmts, linefmt(p, cpsStmts,
"if ($1) #raiseFieldError($2);$n", "if ($1) #raiseFieldError($2);$n",
[rdLoc(test), genStringLiteralFromData(p.module, strLit, e.info)]) [rdLoc(test), strLit])
else: else:
linefmt(p, cpsStmts, linefmt(p, cpsStmts,
"if (!($1)) #raiseFieldError($2);$n", "if (!($1)) #raiseFieldError($2);$n",
[rdLoc(test), genStringLiteralFromData(p.module, strLit, e.info)]) [rdLoc(test), strLit])
proc genCheckedRecordField(p: BProc, e: PNode, d: var TLoc) = proc genCheckedRecordField(p: BProc, e: PNode, d: var TLoc) =
if optFieldCheck in p.options: if optFieldCheck in p.options:

4
compiler/ccgliterals.nim
View file

@ -97,10 +97,6 @@ proc genStringLiteralDataOnly(m: BModule; s: string; info: TLineInfo): Rope =
else: else:
localError(m.config, info, "cannot determine how to produce code for string literal") localError(m.config, info, "cannot determine how to produce code for string literal")
proc genStringLiteralFromData(m: BModule; data: Rope; info: TLineInfo): Rope =
result = ropecg(m, "((#NimStringDesc*) &$1)",
[data])
proc genNilStringLiteral(m: BModule; info: TLineInfo): Rope = proc genNilStringLiteral(m: BModule; info: TLineInfo): Rope =
result = ropecg(m, "((#NimStringDesc*) NIM_NIL)", []) result = ropecg(m, "((#NimStringDesc*) NIM_NIL)", [])