status-im
/
NimYAML
mirror of https://github.com/status-im/NimYAML.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

make sure to also append '\0' for JS as well as C backend 

Also remove now unnecessary `os` (was imported for internal
`assertStringEqual` test) module import in `tserialization`.
This commit is contained in:
Vindaar 2018-10-11 14:46:48 +02:00 committed by flyx
parent 2d47de8c4e
commit 8a7750cb6c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/tserialization.nim
View File

@ -5,7 +5,7 @@
# distribution, for details about the copyright. # distribution, for details about the copyright.
import "../yaml" import "../yaml"
import unittest, strutils, tables, times, math, os import unittest, strutils, tables, times, math
type type
MyTuple = tuple MyTuple = tuple

10
yaml/private/lex.nim
View File

@ -1161,22 +1161,22 @@ when not defined(JS):
proc newYamlLexer*(source: string, startAt: int = 0): YamlLexer proc newYamlLexer*(source: string, startAt: int = 0): YamlLexer
{.raises: [].} = {.raises: [].} =
# append a `\0` at the very end to work around null terminator being
# inaccessible
let sourceNull = source & '\0'
when defined(JS): when defined(JS):
let sSource = StringSource(pos: startAt, lineStart: startAt, line: 1, let sSource = StringSource(pos: startAt, lineStart: startAt, line: 1,
src: source) src: sourceNull)
result = YamlLexer(buf: "", sSource: sSource, result = YamlLexer(buf: "", sSource: sSource,
inFlow: false, c: sSource.src[startAt], newlines: 0, folded: true) inFlow: false, c: sSource.src[startAt], newlines: 0, folded: true)
else: else:
let sSource = new(StringSource) let sSource = new(StringSource)
sSource[] = StringSource(pos: startAt, lineStart: startAt, line: 1, sSource[] = StringSource(pos: startAt, lineStart: startAt, line: 1,
src: source) src: sourceNull)
GC_ref(sSource) GC_ref(sSource)
new(result, proc(x: ref YamlLexerObj) {.nimcall.} = new(result, proc(x: ref YamlLexerObj) {.nimcall.} =
GC_unref(cast[ref StringSource](x.source)) GC_unref(cast[ref StringSource](x.source))
) )
# append a `\0` at the very end to work around null terminator being
# inaccessible
sSource.src.add '\0'
result[] = YamlLexerObj(buf: "", source: cast[pointer](sSource), result[] = YamlLexerObj(buf: "", source: cast[pointer](sSource),
inFlow: false, c: sSource.src[startAt], newlines: 0, folded: true) inFlow: false, c: sSource.src[startAt], newlines: 0, folded: true)
init[StringSource](result) init[StringSource](result)