mirror of
https://github.com/nim-lang/Nim.git
synced 2025-12-29 01:14:41 +00:00
fixes json.nim regression
This commit is contained in:
@@ -390,18 +390,10 @@ proc `[]=`*(obj: JsonNode, key: string, val: JsonNode) {.inline.} =
|
||||
assert(obj.kind == JObject)
|
||||
obj.fields[key] = val
|
||||
|
||||
proc `%`*[T: tuple|object](o: T): JsonNode =
|
||||
proc `%`*[T: object](o: T): JsonNode =
|
||||
## Construct JsonNode from tuples and objects.
|
||||
##
|
||||
## If passed an anonymous tuple, creates `JArray JsonNode`,
|
||||
## otherwise (named tuples and objects) `JObject JsonNode`.
|
||||
const isNamed = T is object or isNamedTuple(T)
|
||||
when isNamed:
|
||||
result = newJObject()
|
||||
for k, v in o.fieldPairs: result[k] = %v
|
||||
else:
|
||||
result = newJArray()
|
||||
for a in o.fields: result.add(%a)
|
||||
result = newJObject()
|
||||
for k, v in o.fieldPairs: result[k] = %v
|
||||
|
||||
proc `%`*(o: ref object): JsonNode =
|
||||
## Generic constructor for JSON data. Creates a new `JObject JsonNode`
|
||||
@@ -1718,7 +1710,6 @@ when isMainModule:
|
||||
|
||||
# Test loading of file.
|
||||
when not defined(js):
|
||||
echo("99% of tests finished. Going to try loading file.")
|
||||
var parsed = parseFile("tests/testdata/jsontest.json")
|
||||
|
||||
try:
|
||||
@@ -1752,6 +1743,8 @@ when isMainModule:
|
||||
doAssert($ %*[] == "[]")
|
||||
doAssert($ %*{} == "{}")
|
||||
|
||||
doAssert(not compiles(%{"error": "No messages"}))
|
||||
|
||||
# bug #9111
|
||||
block:
|
||||
type
|
||||
|
||||
@@ -517,10 +517,6 @@ when true:
|
||||
doAssert v.name == "smith"
|
||||
doAssert MyRef(w).name == "smith"
|
||||
|
||||
block test_tuple:
|
||||
doAssert $(%* (a1: 10, a2: "foo")) == """{"a1":10,"a2":"foo"}"""
|
||||
doAssert $(%* (10, "foo")) == """[10,"foo"]"""
|
||||
|
||||
# TODO: when the issue with the limeted vm registers is solved, the
|
||||
# exact same test as above should be evaluated at compile time as
|
||||
# well, to ensure that the vm functionality won't diverge from the
|
||||
|
||||
Reference in New Issue
Block a user