From 10bd7d8fa04f1382ff3074e30acf6ba507c9586c Mon Sep 17 00:00:00 2001 From: Clyybber Date: Thu, 19 Dec 2019 20:36:59 +0100 Subject: system.reset is no longer magic (#12937) It has now means setting x to default for new and old runtime alike --- lib/system.nim | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/lib/system.nim b/lib/system.nim index 583161f85..559f5fb89 100644 --- a/lib/system.nim +++ b/lib/system.nim @@ -264,17 +264,6 @@ when not defined(gcDestructors): ## **Note**: The `finalizer` refers to the type `T`, not to the object! ## This means that for each object of type `T` the finalizer will be called! -when defined(nimV2): - proc reset*[T](obj: var T) {.magic: "Destroy", noSideEffect.} - ## Old runtime target: Resets an object `obj` to its initial (binary zero) value. - ## - ## New runtime target: An alias for `=destroy`. -else: - proc reset*[T](obj: var T) {.magic: "Reset", noSideEffect.} - ## Old runtime target: Resets an object `obj` to its initial (binary zero) value. - ## - ## New runtime target: An alias for `=destroy`. - proc wasMoved*[T](obj: var T) {.magic: "WasMoved", noSideEffect.} = ## Resets an object `obj` to its initial (binary zero) value to signify ## it was "moved" and to signify its destructor should do nothing and @@ -1825,6 +1814,15 @@ when defined(nimHasDefault): proc default*(T: typedesc): T {.magic: "Default", noSideEffect.} ## returns the default value of the type ``T``. + proc reset*[T](obj: var T) {.noSideEffect.} = + ## Resets an object `obj` to its default value. + obj = default(typeof(obj)) +else: + when defined(nimV2): + proc reset*[T](obj: var T) {.magic: "Destroy", noSideEffect.} + else: + proc reset*[T](obj: var T) {.magic: "Reset", noSideEffect.} + proc setLen*[T](s: var seq[T], newlen: Natural) {. magic: "SetLengthSeq", noSideEffect.} ## Sets the length of seq `s` to `newlen`. ``T`` may be any sequence type. -- cgit 1.4.1-2-gfad0