jyapayne/godot-nim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix system.of being preferred over godot.of in some cases

Browse source 
Fix `as` fails when argument `obj` is not convertible to `T`
Up version to 0.7.14
This commit is contained in:
Evgeny Zuev 2018-06-21 16:46:00 +07:00 • committed by Ruslan Mustakov
commit 8d68051f23
2 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
godot.nimble
View file

@ -1,4 +1,4 @@
version = "0.7.13" version = "0.7.14"
author = "Xored Software, Inc." author = "Xored Software, Inc."
description = "Godot Engine bindings" description = "Godot Engine bindings"
license = "MIT" license = "MIT"

9
godot/nim/godotnim.nim
View file

@ -267,9 +267,9 @@ proc `as`*[T: NimGodotObject](obj: NimGodotObject, t: typedesc[T]): T =
## This can be used either in dot notation (``node.as(Button)``) or ## This can be used either in dot notation (``node.as(Button)``) or
## infix notation (``node as Button``). ## infix notation (``node as Button``).
if obj.isNil: return nil if obj.isNil: return nil
if obj of T: if system.`of`(obj, T):
result = T(obj) result = T(obj)
elif not obj.linkedObject.isNil and obj.linkedObject of T: elif not obj.linkedObject.isNil and system.`of`(obj.linkedObject, T):
result = T(obj.linkedObject) result = T(obj.linkedObject)
else: else:
when not defined(release): when not defined(release):
@ -277,10 +277,9 @@ proc `as`*[T: NimGodotObject](obj: NimGodotObject, t: typedesc[T]): T =
T.name & "\n" & getStackTrace()) T.name & "\n" & getStackTrace())
result = nil result = nil
proc `of`*[T: NimGodotObject](obj: NimGodotObject, proc `of`*[T1, T2: NimGodotObject](obj: T1, t: typedesc[T2]): bool {.inline.} =
t: typedesc[T]): bool {.inline.} =
## Godot-specific inheritance check. ## Godot-specific inheritance check.
not obj.isNil and (system.`of`(obj, T) or system.`of`(obj.linkedObject, T)) not obj.isNil and (system.`of`(obj, T2) or system.`of`(obj.linkedObject, T2))
proc newRStrLit(s: string): NimNode {.compileTime.} = proc newRStrLit(s: string): NimNode {.compileTime.} =
result = newNimNode(nnkRStrLit) result = newNimNode(nnkRStrLit)