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

8
lib/core/typeinfo.nim
View file

@ -322,12 +322,12 @@ proc base*(x: Any): Any =
proc isNil*(x: Any): bool =
## `isNil` for an `x` that represents a cstring, proc or
## some pointer type.
assert x.rawType.kind in {tyCString, tyRef, tyPtr, tyPointer, tyProc}
assert x.rawType.kind in {tyCstring, tyRef, tyPtr, tyPointer, tyProc}
result = isNil(cast[ppointer](x.value)[])
const pointerLike =
when defined(gcDestructors): {tyCString, tyRef, tyPtr, tyPointer, tyProc}
else: {tyString, tyCString, tyRef, tyPtr, tyPointer, tySequence, tyProc}
when defined(gcDestructors): {tyCstring, tyRef, tyPtr, tyPointer, tyProc}
else: {tyString, tyCstring, tyRef, tyPtr, tyPointer, tySequence, tyProc}
proc getPointer*(x: Any): pointer =
## Retrieves the pointer value out of `x`. `x` needs to be of kind
@ -669,7 +669,7 @@ proc setString*(x: Any, y: string) =
proc getCString*(x: Any): cstring =
## Retrieves the `cstring` value out of `x`. `x` needs to represent a `cstring`.
assert x.rawType.kind == tyCString
assert x.rawType.kind == tyCstring
result = cast[ptr cstring](x.value)[]
proc assign*(x, y: Any) =