status-im/NimYAML
2
0
Fork 0
mirror of https://github.com/status-im/NimYAML.git synced 2025-01-27 11:34:56 +00:00
Code Issues Projects Releases Wiki Activity

Fixed issue: integer numbers could not be parsed as float

Browse Source
This commit is contained in:
Andrea Ferretti 2016-07-08 11:35:31 +02:00
parent dcdb04b79d
commit e33af48217
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
private/serialization.nim
View File

@ -13,7 +13,7 @@ proc newSerializationContext*(s: AnchorStyle): SerializationContext =
result.refs = initTable[pointer, AnchorId]() result.refs = initTable[pointer, AnchorId]()
result.style = s result.style = s
result.nextAnchorId = 0.AnchorId result.nextAnchorId = 0.AnchorId
template presentTag*(t: typedesc, ts: TagStyle): TagId = template presentTag*(t: typedesc, ts: TagStyle): TagId =
## Get the TagId that represents the given type in the given style ## Get the TagId that represents the given type in the given style
if ts == tsNone: yTagQuestionMark else: yamlTag(t) if ts == tsNone: yTagQuestionMark else: yamlTag(t)
@ -38,7 +38,7 @@ template constructScalarItem*(s: var YamlStream, i: expr,
## the scalar as ``YamlStreamEvent`` in the content. Exceptions raised in ## the scalar as ``YamlStreamEvent`` in the content. Exceptions raised in
## the content will be automatically catched and wrapped in ## the content will be automatically catched and wrapped in
## ``YamlConstructionError``, which will then be raised. ## ``YamlConstructionError``, which will then be raised.
let i = s.next() let i = s.next()
if i.kind != yamlScalar: if i.kind != yamlScalar:
raise newException(YamlConstructionError, "Expected scalar") raise newException(YamlConstructionError, "Expected scalar")
try: content try: content
@ -92,7 +92,7 @@ proc representObject*(value: int, tagStyle: TagStyle,
{.raises: [], inline.}= {.raises: [], inline.}=
## represent an integer of architecture-defined length by casting it to int32. ## represent an integer of architecture-defined length by casting it to int32.
## on 64-bit systems, this may cause a type conversion error. ## on 64-bit systems, this may cause a type conversion error.
# currently, sizeof(int) is at least sizeof(int32). # currently, sizeof(int) is at least sizeof(int32).
representObject(int32(value), tagStyle, c, tag) representObject(int32(value), tagStyle, c, tag)
@ -142,6 +142,8 @@ proc constructObject*[T: float|float32|float64](
case hint case hint
of yTypeFloat: of yTypeFloat:
discard parseBiggestFloat(item.scalarContent, result) discard parseBiggestFloat(item.scalarContent, result)
of yTypeInteger:
discard parseBiggestFloat(item.scalarContent, result)
of yTypeFloatInf: of yTypeFloatInf:
if item.scalarContent[0] == '-': result = NegInf if item.scalarContent[0] == '-': result = NegInf
else: result = Inf else: result = Inf
@ -175,7 +177,7 @@ proc constructObject*(s: var YamlStream, c: ConstructionContext,
else: else:
raise newException(YamlConstructionError, raise newException(YamlConstructionError,
"Cannot construct to bool: " & item.scalarContent) "Cannot construct to bool: " & item.scalarContent)
proc representObject*(value: bool, ts: TagStyle, c: SerializationContext, proc representObject*(value: bool, ts: TagStyle, c: SerializationContext,
tag: TagId): RawYamlStream {.raises: [].} = tag: TagId): RawYamlStream {.raises: [].} =
## represents a bool value as a YAML scalar ## represents a bool value as a YAML scalar
@ -283,7 +285,7 @@ proc representObject*[I, T](value: array[I, T], ts: TagStyle,
if finished(events): break if finished(events): break
yield event yield event
yield endSeqEvent() yield endSeqEvent()
proc yamlTag*[K, V](T: typedesc[Table[K, V]]): TagId {.inline, raises: [].} = proc yamlTag*[K, V](T: typedesc[Table[K, V]]): TagId {.inline, raises: [].} =
try: try:
let uri = "!nim:tables:Table(" & safeTagUri(yamlTag(K)) & "," & let uri = "!nim:tables:Table(" & safeTagUri(yamlTag(K)) & "," &
@ -462,7 +464,7 @@ proc constructObject*[O: object|tuple](
startKind = when isVariantObject(O): yamlStartSeq else: yamlStartMap startKind = when isVariantObject(O): yamlStartSeq else: yamlStartMap
endKind = when isVariantObject(O): yamlEndSeq else: yamlEndMap endKind = when isVariantObject(O): yamlEndSeq else: yamlEndMap
if e.kind != startKind: if e.kind != startKind:
raise newException(YamlConstructionError, "While constructing " & raise newException(YamlConstructionError, "While constructing " &
typetraits.name(O) & ": Expected map start, got " & $e.kind) typetraits.name(O) & ": Expected map start, got " & $e.kind)
when isVariantObject(O): reset(result) # make discriminants writeable when isVariantObject(O): reset(result) # make discriminants writeable
while s.peek.kind != endKind: while s.peek.kind != endKind:
@ -578,7 +580,7 @@ macro constructImplicitVariantObject(s, c, r, possibleTagIds: expr,
)) ))
ifStmt.add(newNimNode(nnkElse).add(newNimNode(nnkTryStmt).add( ifStmt.add(newNimNode(nnkElse).add(newNimNode(nnkTryStmt).add(
newStmtList(raiseStmt), newNimNode(nnkExceptBranch).add( newStmtList(raiseStmt), newNimNode(nnkExceptBranch).add(
newIdentNode("KeyError"), newStmtList(newCall("assert", newLit(false))) newIdentNode("KeyError"), newStmtList(newCall("assert", newLit(false)))
)))) ))))
result = newStmtList(newCall("reset", r), ifStmt) result = newStmtList(newCall("reset", r), ifStmt)
@ -677,7 +679,7 @@ proc constructChild*[T](s: var YamlStream, c: ConstructionContext,
elif item.seqAnchor != yAnchorNone: elif item.seqAnchor != yAnchorNone:
raise newException(YamlConstructionError, "Anchor on non-ref type") raise newException(YamlConstructionError, "Anchor on non-ref type")
constructObject(s, c, result) constructObject(s, c, result)
proc constructChild*[O](s: var YamlStream, c: ConstructionContext, proc constructChild*[O](s: var YamlStream, c: ConstructionContext,
result: var ref O) = result: var ref O) =
var e = s.peek() var e = s.peek()
@ -699,7 +701,7 @@ proc constructChild*[O](s: var YamlStream, c: ConstructionContext,
assert(not c.refs.hasKey(anchor)) assert(not c.refs.hasKey(anchor))
c.refs[anchor] = cast[pointer](result) c.refs[anchor] = cast[pointer](result)
anchor = yAnchorNone anchor = yAnchorNone
case e.kind case e.kind
of yamlScalar: removeAnchor(e.scalarAnchor) of yamlScalar: removeAnchor(e.scalarAnchor)
of yamlStartMap: removeAnchor(e.mapAnchor) of yamlStartMap: removeAnchor(e.mapAnchor)
@ -759,7 +761,7 @@ proc representChild*[O](value: ref O, ts: TagStyle, c: SerializationContext):
var child = representChild(value[], childTagStyle, c) var child = representChild(value[], childTagStyle, c)
var first = child() var first = child()
assert(not finished(child)) assert(not finished(child))
case first.kind case first.kind
of yamlStartMap: of yamlStartMap:
first.mapAnchor = a first.mapAnchor = a
if ts == tsNone: first.mapTag = yTagQuestionMark if ts == tsNone: first.mapTag = yTagQuestionMark
@ -800,7 +802,7 @@ proc construct*[T](s: var YamlStream, target: var T) =
try: try:
var e = s.next() var e = s.next()
assert(e.kind == yamlStartDoc) assert(e.kind == yamlStartDoc)
constructChild(s, context, target) constructChild(s, context, target)
e = s.next() e = s.next()
assert(e.kind == yamlEndDoc) assert(e.kind == yamlEndDoc)
@ -838,7 +840,7 @@ proc setAnchor(a: var AnchorId, q: var Table[pointer, AnchorId])
if a != yAnchorNone: if a != yAnchorNone:
try: a = q[cast[pointer](a)] try: a = q[cast[pointer](a)]
except KeyError: assert false, "Can never happen" except KeyError: assert false, "Can never happen"
proc represent*[T](value: T, ts: TagStyle = tsRootOnly, proc represent*[T](value: T, ts: TagStyle = tsRootOnly,
a: AnchorStyle = asTidy): YamlStream = a: AnchorStyle = asTidy): YamlStream =
var var