mirror of https://github.com/status-im/NimYAML.git
Made tjson and tserialization compile for JS
This commit is contained in:
Felix Krause
parent
acf9e32fab
commit
5ebde01ca5
|
|
@ -6,7 +6,7 @@
|
|||
|
||||
import "../yaml"
|
||||
|
||||
import unittest, json, streams
|
||||
import unittest, json
|
||||
|
||||
proc wc(line, column: int, lineContent: string, message: string) =
|
||||
echo "Warning (", line, ",", column, "): ", message, "\n", lineContent
|
||||
|
|
@ -15,7 +15,7 @@ proc ensureEqual(yamlIn, jsonIn: string) =
|
|||
try:
|
||||
var
|
||||
parser = newYamlParser(initCoreTagLibrary(), wc)
|
||||
s = parser.parse(newStringStream(yamlIn))
|
||||
s = parser.parse(yamlIn)
|
||||
yamlResult = constructJson(s)
|
||||
jsonResult = parseJson(jsonIn)
|
||||
assert yamlResult.len == 1
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
# distribution, for details about the copyright.
|
||||
|
||||
import "../yaml"
|
||||
import unittest, strutils, streams, tables, times, math
|
||||
import unittest, strutils, tables, times, math
|
||||
|
||||
type
|
||||
MyTuple = tuple
|
||||
|
|
@ -125,12 +125,12 @@ let blockOnly = defineOptions(style=psBlockOnly)
|
|||
|
||||
suite "Serialization":
|
||||
test "Load integer without fixed length":
|
||||
var input = newStringStream("-4247")
|
||||
var input = "-4247"
|
||||
var result: int
|
||||
load(input, result)
|
||||
assert result == -4247, "result is " & $result
|
||||
|
||||
input = newStringStream($(int64(int32.high) + 1'i64))
|
||||
input = $(int64(int32.high) + 1'i64)
|
||||
var gotException = false
|
||||
try: load(input, result)
|
||||
except: gotException = true
|
||||
|
|
@ -149,49 +149,49 @@ suite "Serialization":
|
|||
assert gotException, "Expected exception, got none."
|
||||
|
||||
test "Load Hex byte (0xFF)":
|
||||
let input = newStringStream("0xFF")
|
||||
let input = "0xFF"
|
||||
var result: byte
|
||||
load(input, result)
|
||||
assert(result == 255)
|
||||
|
||||
test "Load Hex byte (0xC)":
|
||||
let input = newStringStream("0xC")
|
||||
let input = "0xC"
|
||||
var result: byte
|
||||
load(input, result)
|
||||
assert(result == 12)
|
||||
|
||||
test "Load Octal byte (0o14)":
|
||||
let input = newStringStream("0o14")
|
||||
let input = "0o14"
|
||||
var result: byte
|
||||
load(input, result)
|
||||
assert(result == 12)
|
||||
|
||||
test "Load byte (14)":
|
||||
let input = newStringStream("14")
|
||||
let input = "14"
|
||||
var result: byte
|
||||
load(input, result)
|
||||
assert(result == 14)
|
||||
|
||||
test "Load Hex int (0xFF)":
|
||||
let input = newStringStream("0xFF")
|
||||
let input = "0xFF"
|
||||
var result: int
|
||||
load(input, result)
|
||||
assert(result == 255)
|
||||
|
||||
test "Load Hex int (0xC)":
|
||||
let input = newStringStream("0xC")
|
||||
let input = "0xC"
|
||||
var result: int
|
||||
load(input, result)
|
||||
assert(result == 12)
|
||||
|
||||
test "Load Octal int (0o14)":
|
||||
let input = newStringStream("0o14")
|
||||
let input = "0o14"
|
||||
var result: int
|
||||
load(input, result)
|
||||
assert(result == 12)
|
||||
|
||||
test "Load int (14)":
|
||||
let input = newStringStream("14")
|
||||
let input = "14"
|
||||
var result: int
|
||||
load(input, result)
|
||||
assert(result == 14)
|
||||
|
|
@ -206,7 +206,7 @@ suite "Serialization":
|
|||
assert classify(result[4]) == fcNan
|
||||
|
||||
test "Load nil string":
|
||||
let input = newStringStream("!<tag:nimyaml.org,2016:nil:string> \"\"")
|
||||
let input = "!<tag:nimyaml.org,2016:nil:string> \"\""
|
||||
var result: string
|
||||
load(input, result)
|
||||
assert isNil(result)
|
||||
|
|
@ -225,7 +225,7 @@ suite "Serialization":
|
|||
# the parsed Time may have any timezone offset.
|
||||
|
||||
test "Load string sequence":
|
||||
let input = newStringStream(" - a\n - b")
|
||||
let input = " - a\n - b"
|
||||
var result: seq[string]
|
||||
load(input, result)
|
||||
assert result.len == 2
|
||||
|
|
@ -238,7 +238,7 @@ suite "Serialization":
|
|||
assertStringEqual yamlDirs & "\n- a\n- b", output
|
||||
|
||||
test "Load nil seq":
|
||||
let input = newStringStream("!<tag:nimyaml.org,2016:nil:seq> \"\"")
|
||||
let input = "!<tag:nimyaml.org,2016:nil:seq> \"\""
|
||||
var result: seq[int]
|
||||
load(input, result)
|
||||
assert isNil(result)
|
||||
|
|
@ -249,7 +249,7 @@ suite "Serialization":
|
|||
assertStringEqual yamlDirs & "\n!n!nil:seq \"\"", output
|
||||
|
||||
test "Load char set":
|
||||
let input = newStringStream("- a\n- b")
|
||||
let input = "- a\n- b"
|
||||
var result: set[char]
|
||||
load(input, result)
|
||||
assert result.card == 2
|
||||
|
|
@ -262,7 +262,7 @@ suite "Serialization":
|
|||
assertStringEqual yamlDirs & "\n- a\n- b", output
|
||||
|
||||
test "Load array":
|
||||
let input = newStringStream("- 23\n- 42\n- 47")
|
||||
let input = "- 23\n- 42\n- 47"
|
||||
var result: array[0..2, int32]
|
||||
load(input, result)
|
||||
assert result[0] == 23
|
||||
|
|
@ -275,7 +275,7 @@ suite "Serialization":
|
|||
assertStringEqual yamlDirs & "\n- 23\n- 42\n- 47", output
|
||||
|
||||
test "Load Table[int, string]":
|
||||
let input = newStringStream("23: dreiundzwanzig\n42: zweiundvierzig")
|
||||
let input = "23: dreiundzwanzig\n42: zweiundvierzig"
|
||||
var result: Table[int32, string]
|
||||
load(input, result)
|
||||
assert result.len == 2
|
||||
|
|
@ -291,7 +291,7 @@ suite "Serialization":
|
|||
output)
|
||||
|
||||
test "Load OrderedTable[tuple[int32, int32], string]":
|
||||
let input = newStringStream("- {a: 23, b: 42}: drzw\n- {a: 13, b: 47}: drsi")
|
||||
let input = "- {a: 23, b: 42}: drzw\n- {a: 13, b: 47}: drsi"
|
||||
var result: OrderedTable[tuple[a, b: int32], string]
|
||||
load(input, result)
|
||||
var i = 0
|
||||
|
|
@ -325,7 +325,7 @@ suite "Serialization":
|
|||
: dreizehnsiebenundvierzig""", output)
|
||||
|
||||
test "Load Sequences in Sequence":
|
||||
let input = newStringStream(" - [1, 2, 3]\n - [4, 5]\n - [6]")
|
||||
let input = " - [1, 2, 3]\n - [4, 5]\n - [6]"
|
||||
var result: seq[seq[int32]]
|
||||
load(input, result)
|
||||
assert result.len == 3
|
||||
|
|
@ -340,7 +340,7 @@ suite "Serialization":
|
|||
|
||||
test "Load Enum":
|
||||
let input =
|
||||
newStringStream("!<tag:nimyaml.org,2016:system:seq(tl)>\n- !tl tlRed\n- tlGreen\n- tlYellow")
|
||||
"!<tag:nimyaml.org,2016:system:seq(tl)>\n- !tl tlRed\n- tlGreen\n- tlYellow"
|
||||
var result: seq[TrafficLight]
|
||||
load(input, result)
|
||||
assert result.len == 3
|
||||
|
|
@ -354,7 +354,7 @@ suite "Serialization":
|
|||
assertStringEqual yamlDirs & "\n- tlRed\n- tlGreen\n- tlYellow", output
|
||||
|
||||
test "Load Tuple":
|
||||
let input = newStringStream("str: value\ni: 42\nb: true")
|
||||
let input = "str: value\ni: 42\nb: true"
|
||||
var result: MyTuple
|
||||
load(input, result)
|
||||
assert result.str == "value"
|
||||
|
|
@ -385,7 +385,7 @@ suite "Serialization":
|
|||
load(input, result)
|
||||
|
||||
test "Load Multiple Documents":
|
||||
let input = newStringStream("1\n---\n2")
|
||||
let input = "1\n---\n2"
|
||||
var result: seq[int]
|
||||
loadMultiDoc(input, result)
|
||||
assert(result.len == 2)
|
||||
|
|
@ -393,14 +393,14 @@ suite "Serialization":
|
|||
assert result[1] == 2
|
||||
|
||||
test "Load Multiple Documents (Single Doc)":
|
||||
let input = newStringStream("1")
|
||||
let input = "1"
|
||||
var result: seq[int]
|
||||
loadMultiDoc(input, result)
|
||||
assert(result.len == 1)
|
||||
assert result[0] == 1
|
||||
|
||||
test "Load custom object":
|
||||
let input = newStringStream("firstnamechar: P\nsurname: Pan\nage: 12")
|
||||
let input = "firstnamechar: P\nsurname: Pan\nage: 12"
|
||||
var result: Person
|
||||
load(input, result)
|
||||
assert result.firstnamechar == 'P'
|
||||
|
|
@ -432,8 +432,8 @@ suite "Serialization":
|
|||
load(input, result)
|
||||
|
||||
test "Load sequence with explicit tags":
|
||||
let input = newStringStream(yamlDirs & "!n!system:seq(" &
|
||||
"tag:yaml.org;2002:str)\n- !!str one\n- !!str two")
|
||||
let input = yamlDirs & "!n!system:seq(" &
|
||||
"tag:yaml.org;2002:str)\n- !!str one\n- !!str two"
|
||||
var result: seq[string]
|
||||
load(input, result)
|
||||
assert result[0] == "one"
|
||||
|
|
@ -446,8 +446,8 @@ suite "Serialization":
|
|||
"tag:yaml.org;2002:str) \n- !!str one\n- !!str two", output)
|
||||
|
||||
test "Load custom object with explicit root tag":
|
||||
let input = newStringStream(
|
||||
"--- !<tag:nimyaml.org,2016:custom:Person>\nfirstnamechar: P\nsurname: Pan\nage: 12")
|
||||
let input =
|
||||
"--- !<tag:nimyaml.org,2016:custom:Person>\nfirstnamechar: P\nsurname: Pan\nage: 12"
|
||||
var result: Person
|
||||
load(input, result)
|
||||
assert result.firstnamechar == 'P'
|
||||
|
|
@ -461,9 +461,9 @@ suite "Serialization":
|
|||
"!n!custom:Person \nfirstnamechar: P\nsurname: Pan\nage: 12", output)
|
||||
|
||||
test "Load custom variant object":
|
||||
let input = newStringStream(
|
||||
let input =
|
||||
"---\n- - name: Bastet\n - kind: akCat\n - purringIntensity: 7\n" &
|
||||
"- - name: Anubis\n - kind: akDog\n - barkometer: 13")
|
||||
"- - name: Anubis\n - kind: akDog\n - barkometer: 13"
|
||||
var result: seq[Animal]
|
||||
load(input, result)
|
||||
assert result.len == 2
|
||||
|
|
@ -577,6 +577,7 @@ suite "Serialization":
|
|||
expectConstructionError(1, 16, "While constructing WithIgnoredField: Unknown field: \"zz\""):
|
||||
load(input, result)
|
||||
|
||||
when not defined(JS):
|
||||
test "Dump cyclic data structure":
|
||||
var
|
||||
a = newNode("a")
|
||||
|
|
@ -595,7 +596,7 @@ next:
|
|||
next: *a""", output
|
||||
|
||||
test "Load cyclic data structure":
|
||||
let input = newStringStream(yamlDirs & """!n!system:seq(example.net:Node)
|
||||
let input = yamlDirs & """!n!system:seq(example.net:Node)
|
||||
- &a
|
||||
value: a
|
||||
next: &b
|
||||
|
|
@ -605,7 +606,7 @@ next:
|
|||
next: *a
|
||||
- *b
|
||||
- *c
|
||||
""")
|
||||
"""
|
||||
var result: seq[ref Node]
|
||||
try: load(input, result)
|
||||
except YamlConstructionError:
|
||||
|
|
@ -640,8 +641,9 @@ next:
|
|||
assert result.c == "cde"
|
||||
assert result.d == "d"
|
||||
|
||||
when not defined(JS):
|
||||
test "Load nil values":
|
||||
let input = newStringStream("- ~\n- !!str ~")
|
||||
let input = "- ~\n- !!str ~"
|
||||
var result: seq[ref string]
|
||||
try: load(input, result)
|
||||
except YamlConstructionError:
|
||||
|
|
@ -665,7 +667,7 @@ next:
|
|||
output)
|
||||
|
||||
test "Custom constructObject":
|
||||
let input = newStringStream("- 1\n- !test:BetterInt 2")
|
||||
let input = "- 1\n- !test:BetterInt 2"
|
||||
var result: seq[BetterInt]
|
||||
load(input, result)
|
||||
assert(result.len == 2)
|
||||
|
|
|
|||
|
|
@ -195,7 +195,7 @@ proc initDocValues(c: ParserContext) {.raises: [].} =
|
|||
c.anchor = yAnchorNone
|
||||
c.ancestry.add(FastParseLevel(kind: fplDocument, indentation: -1))
|
||||
|
||||
proc advance(c: ParserContext) {.inline.} =
|
||||
proc advance(c: ParserContext) {.inline, raises: [YamlParserError].} =
|
||||
try: c.lex.next()
|
||||
except YamlLexerError:
|
||||
let e = (ref YamlLexerError)(getCurrentException())
|
||||
|
|
@ -1024,8 +1024,11 @@ parserState flowAfterObject:
|
|||
|
||||
# --- parser initialization ---
|
||||
|
||||
proc init(c: ParserContext, p: YamlParser) =
|
||||
c.basicInit(lastTokenContext)
|
||||
proc init(c: ParserContext, p: YamlParser) {.raises: [YamlParserError].} =
|
||||
# this try/except should not be necessary because basicInit cannot raise
|
||||
# anything. however, compiling to JS does not work without it.
|
||||
try: c.basicInit(lastTokenContext)
|
||||
except: discard
|
||||
c.p = p
|
||||
c.ancestry = newSeq[FastParseLevel]()
|
||||
c.initDocValues()
|
||||
|
|
|
|||
|
|
@ -225,29 +225,30 @@ proc lineWithMarker(lex: YamlLexer, pos: tuple[line, column: int],
|
|||
|
||||
# lexer states
|
||||
|
||||
{.push raises: YamlLexerError, gcSafe, locks: 0.}
|
||||
proc outsideDoc[T](lex: YamlLexer): bool
|
||||
proc yamlVersion[T](lex: YamlLexer): bool
|
||||
proc tagShorthand[T](lex: YamlLexer): bool
|
||||
proc tagUri[T](lex: YamlLexer): bool
|
||||
proc unknownDirParams[T](lex: YamlLexer): bool
|
||||
proc expectLineEnd[T](lex: YamlLexer): bool
|
||||
proc possibleDirectivesEnd[T](lex: YamlLexer): bool
|
||||
proc possibleDocumentEnd[T](lex: YamlLexer): bool
|
||||
proc afterSeqInd[T](lex: YamlLexer): bool
|
||||
proc insideDoc[T](lex: YamlLexer): bool
|
||||
proc insideFlow[T](lex: YamlLexer): bool
|
||||
proc insideLine[T](lex: YamlLexer): bool
|
||||
proc plainScalarPart[T](lex: YamlLexer): bool
|
||||
proc blockScalarHeader[T](lex: YamlLexer): bool
|
||||
proc blockScalar[T](lex: YamlLexer): bool
|
||||
proc indentationAfterBlockScalar[T](lex: YamlLexer): bool
|
||||
proc dirEndAfterBlockScalar[T](lex: YamlLexer): bool
|
||||
proc docEndAfterBlockScalar[T](lex: YamlLexer): bool
|
||||
proc tagHandle[T](lex: YamlLexer): bool
|
||||
proc anchor[T](lex: YamlLexer): bool
|
||||
proc alias[T](lex: YamlLexer): bool
|
||||
proc streamEnd[T](lex: YamlLexer): bool
|
||||
{.push gcSafe, locks: 0.}
|
||||
# `raises` cannot be pushed.
|
||||
proc outsideDoc[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc yamlVersion[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc tagShorthand[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc tagUri[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc unknownDirParams[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc expectLineEnd[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc possibleDirectivesEnd[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc possibleDocumentEnd[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc afterSeqInd[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc insideDoc[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc insideFlow[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc insideLine[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc plainScalarPart[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc blockScalarHeader[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc blockScalar[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc indentationAfterBlockScalar[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc dirEndAfterBlockScalar[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc docEndAfterBlockScalar[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc tagHandle[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc anchor[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc alias[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
proc streamEnd[T](lex: YamlLexer): bool {.raises: YamlLexerError.}
|
||||
{.pop.}
|
||||
|
||||
# implementation
|
||||
|
|
|
|||
|
|
@ -220,7 +220,12 @@ proc representObject*(value: int, tagStyle: TagStyle,
|
|||
e.parent = getCurrentException()
|
||||
raise e
|
||||
|
||||
proc constructObject*[T: uint8|uint16|uint32|uint64](
|
||||
when defined(JS):
|
||||
type DefiniteUIntTypes = uint8 | uint16 | uint32
|
||||
else:
|
||||
type DefiniteUIntTypes = uint8 | uint16 | uint32 | uint64
|
||||
|
||||
proc constructObject*[T: DefiniteUIntTypes](
|
||||
s: var YamlStream, c: ConstructionContext, result: var T)
|
||||
{.raises: [YamlConstructionError, YamlStreamError].} =
|
||||
## construct an unsigned integer value from a YAML scalar
|
||||
|
|
@ -1131,6 +1136,23 @@ proc constructChild*[T](s: var YamlStream, c: ConstructionContext,
|
|||
raise s.constructionError("Anchor on non-ref type")
|
||||
constructObject(s, c, result)
|
||||
|
||||
when defined(JS):
|
||||
# in JS, Time is a ref type. Therefore, we need this specialization so that
|
||||
# it is not handled by the general ref-type handler.
|
||||
proc constructChild*(s: var YamlStream, c: ConstructionContext,
|
||||
result: var Time) =
|
||||
let e = s.peek()
|
||||
if e.kind == yamlScalar:
|
||||
if e.scalarTag notin [yTagQuestionMark, yTagTimestamp]:
|
||||
raise s.constructionError("Wrong tag for Time")
|
||||
elif guessType(e.scalarContent) != yTypeTimestamp:
|
||||
raise s.constructionError("Invalid timestamp")
|
||||
elif e.scalarAnchor != yAnchorNone:
|
||||
raise s.constructionError("Anchor on non-ref type")
|
||||
constructObject(s, c, result)
|
||||
else:
|
||||
raise s.constructionError("Unexpected structure, expected timestamp")
|
||||
|
||||
proc constructChild*[O](s: var YamlStream, c: ConstructionContext,
|
||||
result: var ref O) =
|
||||
var e = s.peek()
|
||||
|
|
@ -1258,7 +1280,7 @@ proc load*[K](input: Stream | string, target: var K)
|
|||
let e = (ref YamlStreamError)(getCurrentException())
|
||||
if e.parent of IOError: raise (ref IOError)(e.parent)
|
||||
elif e.parent of YamlParserError: raise (ref YamlParserError)(e.parent)
|
||||
else: internalError("Unexpected exception: " & e.parent.repr)
|
||||
else: internalError("Unexpected exception: " & $e.parent.name)
|
||||
|
||||
proc loadMultiDoc*[K](input: Stream | string, target: var seq[K]) =
|
||||
if target.isNil:
|
||||
|
|
@ -1279,7 +1301,7 @@ proc loadMultiDoc*[K](input: Stream | string, target: var seq[K]) =
|
|||
let e = (ref YamlStreamError)(getCurrentException())
|
||||
if e.parent of IOError: raise (ref IOError)(e.parent)
|
||||
elif e.parent of YamlParserError: raise (ref YamlParserError)(e.parent)
|
||||
else: internalError("Unexpected exception: " & e.parent.repr)
|
||||
else: internalError("Unexpected exception: " & $e.parent.name)
|
||||
|
||||
proc setAnchor(a: var AnchorId, q: var Table[pointer, AnchorId])
|
||||
{.inline.} =
|
||||
|
|
@ -1315,7 +1337,7 @@ proc dump*[K](value: K, target: Stream, tagStyle: TagStyle = tsRootOnly,
|
|||
if options.style == psJson: asNone else: anchorStyle)
|
||||
try: present(events, target, serializationTagLibrary, options)
|
||||
except YamlStreamError:
|
||||
internalError("Unexpected exception: " & getCurrentException().repr)
|
||||
internalError("Unexpected exception: " & $getCurrentException().name)
|
||||
|
||||
proc dump*[K](value: K, tagStyle: TagStyle = tsRootOnly,
|
||||
anchorStyle: AnchorStyle = asTidy,
|
||||
|
|
@ -1327,7 +1349,7 @@ proc dump*[K](value: K, tagStyle: TagStyle = tsRootOnly,
|
|||
if options.style == psJson: asNone else: anchorStyle)
|
||||
try: result = present(events, serializationTagLibrary, options)
|
||||
except YamlStreamError:
|
||||
internalError("Unexpected exception: " & getCurrentException().repr)
|
||||
internalError("Unexpected exception: " & $getCurrentException().name)
|
||||
|
||||
proc canBeImplicit(t: typedesc): bool {.compileTime.} =
|
||||
let tDesc = getType(t)
|
||||
|
|
|
|||
Loading…
Reference in New Issue