Skip to content

Commit

Permalink
fix #16706 (#16717) [backport:1.4]
Browse files Browse the repository at this point in the history
  • Loading branch information
ringabout authored Jan 14, 2021
1 parent 94430a2 commit ef9027c
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 1 deletion.
4 changes: 3 additions & 1 deletion lib/system/assign.nim
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@ proc genericAssignAux(dest, src: pointer, mt: PNimType, shallow: bool) =
# var tbObj = TB(p)
# tbObj of TC # needs to be false!
#c_fprintf(stdout, "%s %s\n", pint[].name, mt.name)
chckObjAsgn(cast[ptr PNimType](src)[], mt)
let srcType = cast[ptr PNimType](src)[] # object is not initialized properly(for example std/times.DateTime)
if srcType != nil:
chckObjAsgn(srcType, mt)
pint[] = mt # cast[ptr PNimType](src)[]
of tyTuple:
genericAssignAux(dest, src, mt.node, shallow)
Expand Down
37 changes: 37 additions & 0 deletions tests/assign/tobject_assign.nim
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
import std/[options, tables, times]

type
Data* = object
shifts*: OrderedTable[int64, Shift]
balance*: float

Shift* = object
quoted*: bool
date*: DateTime
description*: string
start*: Option[DateTime]
finish*: Option[DateTime]
breakTime*: Option[Duration]
rate*: float
qty: Option[float]
id*: int64

let shift = Shift(
quoted: true,
date: parse("2000-01-01", "yyyy-MM-dd"),
description: "abcdef",
start: none(DateTime),
finish: none(DateTime),
breakTime: none(Duration),
rate: 462.11,
qty: some(10.0),
id: getTime().toUnix()
)

var shifts: OrderedTable[int64, Shift]
shifts[shift.id] = shift

discard Data(
shifts: shifts,
balance: 0.00
)

0 comments on commit ef9027c

Please sign in to comment.