From 8d68051f23f54f343443bc025b06f162c654e90a Mon Sep 17 00:00:00 2001
From: Evgeny Zuev <evgeny.zuev@xored.com>
Date: Thu, 21 Jun 2018 16:46:00 +0700
Subject: [PATCH] Fix `system.of` being preferred over `godot.of` in some cases
 Fix `as` fails when argument `obj` is not convertible to `T` Up version to
 0.7.14

---
 godot.nimble           | 2 +-
 godot/nim/godotnim.nim | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/godot.nimble b/godot.nimble
index 26afffa..e6c397f 100644
--- a/godot.nimble
+++ b/godot.nimble
@@ -1,4 +1,4 @@
-version = "0.7.13"
+version = "0.7.14"
 author = "Xored Software, Inc."
 description = "Godot Engine bindings"
 license = "MIT"
diff --git a/godot/nim/godotnim.nim b/godot/nim/godotnim.nim
index 0b13477..4702a42 100644
--- a/godot/nim/godotnim.nim
+++ b/godot/nim/godotnim.nim
@@ -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
   ## infix notation (``node as Button``).
   if obj.isNil: return nil
-  if obj of T:
+  if system.`of`(obj, T):
     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)
   else:
     when not defined(release):
@@ -277,10 +277,9 @@ proc `as`*[T: NimGodotObject](obj: NimGodotObject, t: typedesc[T]): T =
                   T.name & "\n" & getStackTrace())
     result = nil
 
-proc `of`*[T: NimGodotObject](obj: NimGodotObject,
-                              t: typedesc[T]): bool {.inline.} =
+proc `of`*[T1, T2: NimGodotObject](obj: T1, t: typedesc[T2]): bool {.inline.} =
   ## 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.} =
   result = newNimNode(nnkRStrLit)