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

cString => cSourceString; tyCString => tyCstring so that error msgs show cstring, not cString (#17744)

Browse source
This commit is contained in:
Timothee Cour 2021-04-17 02:14:09 -07:00 • committed by GitHub
commit 7e94420847
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 79 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/vmmarshal.nim
View file

@ -121,7 +121,7 @@ proc storeAny(s: var string; t: PType; a: PNode; stored: var IntSet;
s.add(", ")
storeAny(s, t.lastSon, a, stored, conf)
s.add("]")
of tyString, tyCString:
of tyString, tyCstring:
if a.kind == nkNilLit: s.add("null")
else: s.add(escapeJson(a.strVal))
of tyInt..tyInt64, tyUInt..tyUInt64: s.add($a.intVal)
@ -255,7 +255,7 @@ proc loadAny(p: var JsonParser, t: PType,
if p.kind == jsonArrayEnd: next(p)
else: raiseParseErr(p, "']' end of ref-address pair expected")
else: raiseParseErr(p, "int for pointer type expected")
of tyString, tyCString:
of tyString, tyCstring:
case p.kind
of jsonNull:
result = newNode(nkNilLit)