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

conditional TGenericSeq extension

Browse source
This commit is contained in:
Stefan Talpalaru 2015-06-16 15:15:17 +02:00
commit b487d4e425
3 changed files with 18 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
lib/core/typeinfo.nim
View file

@ -67,12 +67,16 @@ type
pbyteArray = ptr array[0.. 0xffff, int8] pbyteArray = ptr array[0.. 0xffff, int8]
TGenericSeq {.importc.} = object TGenericSeq {.importc.} = object
len, space, elemSize: int len, space: int
when defined(gogc):
elemSize: int
PGenSeq = ptr TGenericSeq PGenSeq = ptr TGenericSeq
{.deprecated: [TAny: Any, TAnyKind: AnyKind].} {.deprecated: [TAny: Any, TAnyKind: AnyKind].}
const when defined(gogc):
GenericSeqSize = (3 * sizeof(int)) const GenericSeqSize = (3 * sizeof(int))
else:
const GenericSeqSize = (2 * sizeof(int))
proc genericAssign(dest, src: pointer, mt: PNimType) {.importCompilerProc.} proc genericAssign(dest, src: pointer, mt: PNimType) {.importCompilerProc.}
proc genericShallowAssign(dest, src: pointer, mt: PNimType) {. proc genericShallowAssign(dest, src: pointer, mt: PNimType) {.

10
lib/system.nim
View file

@ -304,7 +304,9 @@ const ArrayDummySize = when defined(cpu16): 10_000 else: 100_000_000
when not defined(JS): when not defined(JS):
type type
TGenericSeq {.compilerproc, pure, inheritable.} = object TGenericSeq {.compilerproc, pure, inheritable.} = object
len, reserved, elemSize: int len, reserved: int
when defined(gogc):
elemSize: int
PGenericSeq {.exportc.} = ptr TGenericSeq PGenericSeq {.exportc.} = ptr TGenericSeq
UncheckedCharArray {.unchecked.} = array[0..ArrayDummySize, char] UncheckedCharArray {.unchecked.} = array[0..ArrayDummySize, char]
# len and space without counting the terminating zero: # len and space without counting the terminating zero:
@ -2682,8 +2684,10 @@ when not defined(JS): #and not defined(NimrodVM):
when not defined(NimrodVM): when not defined(NimrodVM):
include "system/sets" include "system/sets"
const when defined(gogc):
GenericSeqSize = (3 * sizeof(int)) const GenericSeqSize = (3 * sizeof(int))
else:
const GenericSeqSize = (2 * sizeof(int))
proc getDiscriminant(aa: pointer, n: ptr TNimNode): int = proc getDiscriminant(aa: pointer, n: ptr TNimNode): int =
sysAssert(n.kind == nkCase, "getDiscriminant: node != nkCase") sysAssert(n.kind == nkCase, "getDiscriminant: node != nkCase")

2
lib/system/sysstr.nim
View file

@ -50,6 +50,7 @@ proc rawNewStringNoInit(space: int): NimString {.compilerProc.} =
if s < 7: s = 7 if s < 7: s = 7
result = allocStrNoInit(sizeof(TGenericSeq) + s + 1) result = allocStrNoInit(sizeof(TGenericSeq) + s + 1)
result.reserved = s result.reserved = s
when defined(gogc):
result.elemSize = 1 result.elemSize = 1
proc rawNewString(space: int): NimString {.compilerProc.} = proc rawNewString(space: int): NimString {.compilerProc.} =
@ -57,6 +58,7 @@ proc rawNewString(space: int): NimString {.compilerProc.} =
if s < 7: s = 7 if s < 7: s = 7
result = allocStr(sizeof(TGenericSeq) + s + 1) result = allocStr(sizeof(TGenericSeq) + s + 1)
result.reserved = s result.reserved = s
when defined(gogc):
result.elemSize = 1 result.elemSize = 1
proc mnewString(len: int): NimString {.compilerProc.} = proc mnewString(len: int): NimString {.compilerProc.} =