diff --git a/README.md b/README.md index 62e28d3..891a920 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# Nim bindings for Godot Engine +# Nim bindings for Godot Engine [![Build Status](https://travis-ci.org/pragmagic/godot-nim.svg?branch=master)](https://travis-ci.org/pragmagic/godot-nim) -Nim bindings for Godot 3 based on [GDNative](https://godotengine.org/article/dlscript-here). +Nim bindings for Godot 3.0 based on [GDNative](https://godotengine.org/article/dlscript-here). Documentation: https://pragmagic.github.io/godot-nim/ @@ -13,4 +13,4 @@ Documentation: https://pragmagic.github.io/godot-nim/ This project is licensed under the MIT license. Read [LICENSE](LICENSE) file for details. -Copyright (c) 2018 Xored Software, Inc. +Copyright (c) 2018 Xored Software, Inc. \ No newline at end of file diff --git a/docs/docbuild.nim b/docs/docbuild.nim index 477c45b..bb3e21c 100644 --- a/docs/docbuild.nim +++ b/docs/docbuild.nim @@ -71,7 +71,7 @@ proc fixupHrefs(file: string) = proc getGitHash(): string = result = execProcess("git rev-parse HEAD") - if result.len > 0: + if not result.isNil and result.len > 0: result = result.replace("\L", "").replace("\r", "") proc buildDocs*(outDir, godotNimDir, godotBin: string) = @@ -104,15 +104,14 @@ proc buildDocs*(outDir, godotNimDir, godotBin: string) = createDir(godotApiFolder) genApiFiles(godotApiFolder, godotBinAbs) for file in walkDirRec(godotApiFolder, {pcFile, pcDir}, [".nim"]): - spawn execOrFail("nim doc -d:useRealtimeGc --path:godot -o:" & - quoted(outName(godotApiFolder, file)) & ' ' & quoted(file)) + spawn execOrFail("nim doc -d:useRealtimeGc --path:godot " & quoted(file)) sync() var gitHash: string withDir(godotBinAbs.parentDir()): gitHash = getGitHash() - if gitHash.len == 0: + if gitHash.isNil or gitHash.len == 0: raise newException(Exception, "Godot executable is not under Git repository") diff --git a/godot.nimble b/godot.nimble index d7ca12b..17968f8 100644 --- a/godot.nimble +++ b/godot.nimble @@ -1,4 +1,4 @@ -version = "0.8.2" +version = "0.7.12" author = "Xored Software, Inc." description = "Godot Engine bindings" license = "MIT" diff --git a/godot/core/aabb.nim b/godot/core/aabb.nim index 2d816da..2e9e7f0 100644 --- a/godot/core/aabb.nim +++ b/godot/core/aabb.nim @@ -3,7 +3,7 @@ import hashes import vector3 -import internal/godotinternaltypes, internal/godotstrings +import internal.godotinternaltypes, internal.godotstrings import godotcoretypes, gdnativeapi proc initAABB*(pos, size: Vector3): AABB {.inline.} = @@ -31,10 +31,10 @@ proc encloses*(self, other: AABB): bool {.inline.} = getGDNativeAPI().aabbEncloses(self, other) proc merge*(self, other: AABB): AABB {.inline.} = - getGDNativeAPI().aabbMerge(self, other).toAABB() + getGDNativeAPI().aabbMerge(self, other) proc intersection*(self, other: AABB): AABB {.inline.} = - getGDNativeAPI().aabbIntersection(self, other).toAABB() + getGDNativeAPI().aabbIntersection(self, other) proc intersectsPlane*(self: AABB; plane: Plane): bool {.inline.} = getGDNativeAPI().aabbIntersectsPlane(self, plane) @@ -46,10 +46,10 @@ proc contains*(self: AABB; point: Vector3): bool {.inline.} = getGDNativeAPI().aabbHasPoint(self, point) proc getSupport*(self: AABB; dir: Vector3): Vector3 {.inline.} = - getGDNativeAPI().aabbGetSupport(self, dir).toVector3() + getGDNativeAPI().aabbGetSupport(self, dir) proc getLongestAxis*(self: AABB): Vector3 {.inline.} = - getGDNativeAPI().aabbGetLongestAxis(self).toVector3() + getGDNativeAPI().aabbGetLongestAxis(self) proc getLongestAxisIndex*(self: AABB): cint {.inline.} = getGDNativeAPI().aabbGetLongestAxisIndex(self) @@ -58,7 +58,7 @@ proc getLongestAxisSize*(self: AABB): float32 {.inline.} = getGDNativeAPI().aabbGetLongestAxisSize(self) proc getShortestAxis*(self: AABB): Vector3 {.inline.} = - getGDNativeAPI().aabbGetShortestAxis(self).toVector3() + getGDNativeAPI().aabbGetShortestAxis(self) proc getShortestAxisIndex*(self: AABB): cint {.inline.} = getGDNativeAPI().aabbGetShortestAxisIndex(self) @@ -67,13 +67,13 @@ proc getShortestAxisSize*(self: AABB): float32 {.inline.} = getGDNativeAPI().aabbGetShortestAxisSize(self) proc expand*(self: AABB; toPoint: Vector3): AABB {.inline.} = - getGDNativeAPI().aabbExpand(self, toPoint).toAABB() + getGDNativeAPI().aabbExpand(self, toPoint) proc grow*(self: AABB; by: float32): AABB {.inline.} = - getGDNativeAPI().aabbGrow(self, by).toAABB() + getGDNativeAPI().aabbGrow(self, by) proc getEndpoint*(self: AABB; idx: cint): Vector3 {.inline.} = - getGDNativeAPI().aabbGetEndpoint(self, idx).toVector3() + getGDNativeAPI().aabbGetEndpoint(self, idx) proc `==`*(a, b: AABB): bool {.inline.} = getGDNativeAPI().aabbOperatorEqual(a, b) diff --git a/godot/core/arrays.nim b/godot/core/arrays.nim index fcbafb2..afe8131 100644 --- a/godot/core/arrays.nim +++ b/godot/core/arrays.nim @@ -1,7 +1,7 @@ # Copyright 2018 Xored Software, Inc. import hashes -import internal/godotinternaltypes, internal/godotarrays +import internal.godotinternaltypes, internal.godotarrays type Array* = ref object diff --git a/godot/core/colors.nim b/godot/core/colors.nim index 8e01b7a..9079dad 100644 --- a/godot/core/colors.nim +++ b/godot/core/colors.nim @@ -64,16 +64,16 @@ proc gray*(self: Color): float32 {.inline.} = getGDNativeAPI().colorGray(self) proc inverted*(self: Color): Color {.inline.} = - getGDNativeAPI().colorInverted(self).toColor() + getGDNativeAPI().colorInverted(self) proc contrasted*(self: Color): Color {.inline.} = - getGDNativeAPI().colorContrasted(self).toColor() + getGDNativeAPI().colorContrasted(self) proc lerp*(self: Color; b: Color; t: float32): Color {.inline.} = - getGDNativeAPI().colorLinearInterpolate(self, b, t).toColor() + getGDNativeAPI().colorLinearInterpolate(self, b, t) proc blend*(self: Color; over: Color): Color {.inline.} = - getGDNativeAPI().colorBlend(self, over).toColor() + getGDNativeAPI().colorBlend(self, over) proc `==`*(a, b: Color): bool {.inline.} = a.r == b.r and a.g == b.g and a.b == b.b and a.a == b.a diff --git a/godot/core/dictionaries.nim b/godot/core/dictionaries.nim index 3aea17a..99ecf6a 100644 --- a/godot/core/dictionaries.nim +++ b/godot/core/dictionaries.nim @@ -1,8 +1,8 @@ # Copyright 2018 Xored Software, Inc. import hashes -import internal/godotinternaltypes, internal/godotdictionaries, - internal/godotvariants, internal/godotstrings +import internal.godotinternaltypes, internal.godotdictionaries, + internal.godotvariants, internal.godotstrings type Dictionary* = ref object @@ -42,9 +42,6 @@ proc newVariant*(dict: Dictionary): Variant {.inline.} = new(result, variantFinalizer) initGodotVariant(result.godotVariant[], dict.godotDictionary) -proc asDictionary*(self: Variant): Dictionary {.inline.} = - newDictionary(self.godotVariant[].asGodotDictionary()) - proc contains*(self: Dictionary; key: Variant): bool {.inline.}= self.godotDictionary.contains(key.godotVariant[]) diff --git a/godot/core/godotbase.nim b/godot/core/godotbase.nim index 7b5b804..d76f544 100644 --- a/godot/core/godotbase.nim +++ b/godot/core/godotbase.nim @@ -30,17 +30,14 @@ proc stepify*(value, step: float32): float32 {.inline, noinit.} = else: value -when (NimMajor, NimMinor, NimPatch) < (0, 20, 4): - # Newer Nim has these procs in system module +proc min*(x, y: float32): float32 {.inline, noinit.} = + if x <= y: x else: y - proc min*(x, y: float32): float32 {.inline, noinit.} = - if x <= y: x else: y +proc abs*(x: float32): float32 {.inline, noinit.} = + if x < 0.0: -x else: x - proc abs*(x: float32): float32 {.inline, noinit.} = - if x < 0.0: -x else: x - - proc max*(x, y: float32): float32 {.inline, noinit.} = - if y <= x: x else: y +proc max*(x, y: float32): float32 {.inline, noinit.} = + if y <= x: x else: y {.pop.} # stackTrace: off diff --git a/godot/core/nodepaths.nim b/godot/core/nodepaths.nim index bf690d7..831c855 100644 --- a/godot/core/nodepaths.nim +++ b/godot/core/nodepaths.nim @@ -2,8 +2,8 @@ import hashes -import internal/godotinternaltypes, internal/godotnodepaths, - internal/godotstrings +import internal.godotinternaltypes, internal.godotnodepaths, + internal.godotstrings type NodePath* = ref object diff --git a/godot/core/planes.nim b/godot/core/planes.nim index 2d15c79..b9420eb 100644 --- a/godot/core/planes.nim +++ b/godot/core/planes.nim @@ -4,7 +4,7 @@ import hashes import vector3 -import internal/godotinternaltypes, internal/godotstrings +import internal.godotinternaltypes, internal.godotstrings import godotcoretypes, gdnativeapi proc initPlane*(a, b, c, d: float32): Plane {.inline.} = @@ -26,13 +26,13 @@ proc hash*(self: Plane): Hash {.inline, noinit.} = !$(self.normal.hash() !& self.d.hash()) proc normalized*(self: Plane): Plane {.inline.} = - getGDNativeAPI().planeNormalized(self).toPlane() + getGDNativeAPI().planeNormalized(self) proc center*(self: Plane): Vector3 {.inline.} = - getGDNativeAPI().planeCenter(self).toVector3() + getGDNativeAPI().planeCenter(self) proc getAnyPoint*(self: Plane): Vector3 {.inline.} = - getGDNativeAPI().planeGetAnyPoint(self).toVector3() + getGDNativeAPI().planeGetAnyPoint(self) proc isPointOver*(self: Plane; point: Vector3): bool {.inline.} = getGDNativeAPI().planeIsPointOver(self, point) @@ -45,7 +45,7 @@ proc contains*(self: Plane; point: Vector3; getGDNativeAPI().planeHasPoint(self, point, epsilon) proc project*(self: Plane; point: Vector3): Vector3 {.inline.} = - getGDNativeAPI().planeProject(self, point).toVector3() + getGDNativeAPI().planeProject(self, point) proc intersect3*(self: Plane; dest: var Vector3; b, c: Plane): bool {.inline.} = @@ -60,7 +60,7 @@ proc intersectsSegment*(self: Plane; dest: var Vector3; getGDNativeAPI().planeIntersectsSegment(self, dest, segmentBegin, segmentEnd) proc `-`*(self: Plane): Plane {.inline.} = - getGDNativeAPI().planeOperatorNeg(self).toPlane() + getGDNativeAPI().planeOperatorNeg(self) proc `==`*(a, b: Plane): bool {.inline.} = getGDNativeAPI().planeOperatorEqual(a, b) diff --git a/godot/core/poolarrays.nim b/godot/core/poolarrays.nim index 29fda96..3e7b73e 100644 --- a/godot/core/poolarrays.nim +++ b/godot/core/poolarrays.nim @@ -3,8 +3,8 @@ import hashes import godotcoretypes -import internal/godotinternaltypes, internal/godotpoolarrays, - internal/godotstrings +import internal.godotinternaltypes, internal.godotpoolarrays, + internal.godotstrings import vector2, vector3, colors template definePoolArrayBase(T, GodotT, DataT, fieldName, newProcName, @@ -29,36 +29,6 @@ template definePoolArrayBase(T, GodotT, DataT, fieldName, newProcName, new(result, poolArrayFinalizer) result.fieldName = arr - proc hash*(arr: T): Hash = - for item in arr.fieldName.items(): - result = result !& - (when type(item) is GodotString: ($item).hash() else: item.hash()) - result = !$result - -definePoolArrayBase(PoolByteArray, GodotPoolByteArray, uint8, - godotPoolByteArray, newPoolByteArray, - initGodotPoolByteArray) -definePoolArrayBase(PoolIntArray, GodotPoolIntArray, cint, - godotPoolIntArray, newPoolIntArray, - initGodotPoolIntArray) -definePoolArrayBase(PoolRealArray, GodotPoolRealArray, float32, - godotPoolRealArray, newPoolRealArray, - initGodotPoolRealArray) -definePoolArrayBase(PoolVector2Array, GodotPoolVector2Array, Vector2, - godotPoolVector2Array, newPoolVector2Array, - initGodotPoolVector2Array) -definePoolArrayBase(PoolVector3Array, GodotPoolVector3Array, Vector3, - godotPoolVector3Array, newPoolVector3Array, - initGodotPoolVector3Array) -definePoolArrayBase(PoolColorArray, GodotPoolColorArray, Color, - godotPoolColorArray, newPoolColorArray, - initGodotPoolColorArray) -definePoolArrayBase(PoolStringArray, GodotPoolStringArray, string, - godotPoolStringArray, newPoolStringArray, - initGodotPoolStringArray) - -import arrays - template definePoolArray(T, GodotT, DataT, fieldName, newProcName, initProcName; noData = false) = @@ -116,6 +86,35 @@ template definePoolArray(T, GodotT, DataT, fieldName, newProcName, initProcName; for pair in arr.fieldName.mpairs: yield (pair[0].int, pair[1]) + proc hash*(arr: T): Hash = + for item in arr.items(): + result = result !& item.hash() + result = !$result + +definePoolArrayBase(PoolByteArray, GodotPoolByteArray, uint8, + godotPoolByteArray, newPoolByteArray, + initGodotPoolByteArray) +definePoolArrayBase(PoolIntArray, GodotPoolIntArray, cint, + godotPoolIntArray, newPoolIntArray, + initGodotPoolIntArray) +definePoolArrayBase(PoolRealArray, GodotPoolRealArray, float32, + godotPoolRealArray, newPoolRealArray, + initGodotPoolRealArray) +definePoolArrayBase(PoolVector2Array, GodotPoolVector2Array, Vector2, + godotPoolVector2Array, newPoolVector2Array, + initGodotPoolVector2Array) +definePoolArrayBase(PoolVector3Array, GodotPoolVector3Array, Vector3, + godotPoolVector3Array, newPoolVector3Array, + initGodotPoolVector3Array) +definePoolArrayBase(PoolColorArray, GodotPoolColorArray, Color, + godotPoolColorArray, newPoolColorArray, + initGodotPoolColorArray) +definePoolArrayBase(PoolStringArray, GodotPoolStringArray, string, + godotPoolStringArray, newPoolStringArray, + initGodotPoolStringArray) + +import arrays + definePoolArray(PoolByteArray, GodotPoolByteArray, uint8, godotPoolByteArray, newPoolByteArray, initGodotPoolByteArray) @@ -165,3 +164,8 @@ iterator items*(arr: PoolStringArray): string = iterator pairs*(arr: PoolStringArray): tuple[key: int, val: string] = for i in 0..= (0, 19, 0): - import compiler/lineinfos - -when (NimMajor, NimMinor, NimPatch) >= (0, 19, 0): - var gic = newIdentCache() - - proc getIdent(ident: string): PIdent = - getIdent(gic, ident) +import compiler.ast, compiler.renderer, compiler.idents, compiler.astalgo proc ident(ident: string): PNode = - result = PNode(kind: nkIdent, ident: getIdent(ident)) - -proc newPNode(kind: TNodeKind): PNode = - when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - result = newNode(kind) - else: - result = PNode(kind: kind) - result.info.fileIndex = InvalidFileIdx - result.info.col = int16(-1) - result.info.line = uint16(0) + result = newNode(nkIdent) + result.ident = getIdent(ident) proc addChain(node: PNode, others: varargs[PNode]): PNode {.discardable.} = for other in others: @@ -34,37 +15,37 @@ proc addChain(node: PNode, others: varargs[PNode]): PNode {.discardable.} = proc newIdentDefs(name, typ: PNode, defaultVal: PNode = nil): PNode = - result = newPNode(nkIdentDefs) + result = newNode(nkIdentDefs) result.add(name) result.add(typ) if defaultVal.isNil: - result.add(newPNode(nkEmpty)) + result.add(newNode(nkEmpty)) else: result.add(defaultVal) -proc newProc(name: PNode, params: openArray[PNode], body = newPNode(nkEmpty), +proc newProc(name: PNode, params: openArray[PNode], body = newNode(nkEmpty), procType = nkProcDef): PNode = - result = newPNode(procType) + result = newNode(procType) result.add(name) - result.add(newPNode(nkEmpty)) - result.add(newPNode(nkEmpty)) - let formalParams = newPNode(nkFormalParams) + result.add(newNode(nkEmpty)) + result.add(newNode(nkEmpty)) + let formalParams = newNode(nkFormalParams) for param in params: formalParams.add(param) result.add(formalParams) - result.add(newPNode(nkEmpty)) - result.add(newPNode(nkEmpty)) + result.add(newNode(nkEmpty)) + result.add(newNode(nkEmpty)) result.add(body) proc newIfStmt(condition, body: PNode): PNode = - result = newPNode(nkIfStmt) - let branch = newPNode(nkElifBranch) + result = newNode(nkIfStmt) + let branch = newNode(nkElifBranch) result.add(branch) branch.add(condition) branch.add(body) proc newCall(theProc: PNode, args: varargs[PNode]): PNode = - result = newPNode(nkCall) + result = newNode(nkCall) result.add(theProc) for arg in args: result.add(arg) @@ -73,66 +54,66 @@ proc newCall(theProc: string, args: varargs[PNode]): PNode = newCall(ident(theProc), args) proc newStrLit(s: string): PNode = - result = newPNode(nkStrLit) + result = newNode(nkStrLit) result.strVal = s proc newRStrLit(s: string): PNode = - result = newPNode(nkRStrLit) + result = newNode(nkRStrLit) result.strVal = s proc newCStringLit(s: string): PNode = - newPNode(nkCallStrLit).addChain(ident("cstring"), newRStrLit(s)) + newNode(nkCallStrLit).addChain(ident("cstring"), newRStrLit(s)) proc newIntLit(val: BiggestInt): PNode = - result = newPNode(nkIntLit) + result = newNode(nkIntLit) result.intVal = val proc newInt64Lit(val: BiggestInt): PNode = - result = newPNode(nkInt64Lit) + result = newNode(nkInt64Lit) result.intVal = val proc newFloatLit(val: BiggestFloat): PNode = - result = newPNode(nkFloatLit) + result = newNode(nkFloatLit) result.floatVal = val proc newFloat64Lit(val: BiggestFloat): PNode = - result = newPNode(nkFloat64Lit) + result = newNode(nkFloat64Lit) result.floatVal = val proc newNilLit(): PNode = - result = newPNode(nkNilLit) + result = newNode(nkNilLit) proc newDotExpr(left, right: PNode): PNode = - result = newPNode(nkDotExpr) + result = newNode(nkDotExpr) result.add(left) result.add(right) proc newCommand(left, right: PNode): PNode = - result = newPNode(nkCommand) + result = newNode(nkCommand) result.add(left) result.add(right) proc infix(left, op, right: PNode): PNode = - result = newPNode(nkInfix) + result = newNode(nkInfix) result.add(op) result.add(left) result.add(right) proc postfix(left: PNode, op: string): PNode = - result = newPNode(nkPostfix) + result = newNode(nkPostfix) result.add(ident(op)) result.add(left) proc prefix(op: string, right: PNode): PNode = - result = newPNode(nkPrefix) + result = newNode(nkPrefix) result.add(ident(op)) result.add(right) proc newBracketExpr(first, bracket: PNode): PNode = - newPNode(nkBracketExpr).addChain(first, bracket) + newNode(nkBracketExpr).addChain(first, bracket) proc newEmptyNode(): PNode = - newPNode(nkEmpty) + newNode(nkEmpty) type GodotType = ref object name: string @@ -158,19 +139,19 @@ proc findCommonRoot(typeRegistry: Table[string, GodotType], var idx = 0 while true: - var curType = none(string) + var curType: string var allEqual = true for chain in chains: if idx >= chain.len: allEqual = false break - if curType.isNone: - curType = some(chain[idx]) - elif curType.get != chain[idx]: + if curType.isNil: + curType = chain[idx] + elif curType != chain[idx]: allEqual = false break if allEqual: - result = curType.get + result = curType else: break inc idx @@ -225,42 +206,42 @@ proc toNimStyle(name: string): string = proc newRefTypeNode(typeSection: PNode, typ, base, doc: string, isExported = true) = - let typeDef = newPNode(nkTypeDef) + let typeDef = newNode(nkTypeDef) typeSection.add(typeDef) if isExported: typeDef.add(postfix(ident(typ), "*")) else: typeDef.add(ident(typ)) - typeDef.add(newPNode(nkEmpty)) # generic - let objTy = newPNode(nkObjectTy) - let refTy = newPNode(nkRefTy) + typeDef.add(newNode(nkEmpty)) # generic + let objTy = newNode(nkObjectTy) + let refTy = newNode(nkRefTy) refTy.add(objTy) typeDef.add(refTy) - objTy.add(newPNode(nkEmpty)) - let inherit = newPNode(nkOfInherit) + objTy.add(newNode(nkEmpty)) + let inherit = newNode(nkOfInherit) inherit.add(ident(base)) objTy.add(inherit) - if doc.len > 0: - let recList = newPNode(nkRecList) - let docNode = newPNode(nkCommentStmt) + if not doc.isNil: + let recList = newNode(nkRecList) + let docNode = newNode(nkCommentStmt) docNode.comment = doc recList.add(docNode) objTy.add(recList) else: - objTy.add(newPNode(nkEmpty)) + objTy.add(newNode(nkEmpty)) proc makeConstSection(constObj: JsonNode): PNode = if constObj.len == 0: - return newPNode(nkEmpty) + return newNode(nkEmpty) - result = newPNode(nkConstSection) + result = newNode(nkConstSection) for field, val in constObj: - let def = newPNode(nkConstDef) + let def = newNode(nkConstDef) def.add(postfix(ident(field), "*")) - def.add(newPNode(nkEmpty)) # infer type + def.add(newNode(nkEmpty)) # infer type var valNode: PNode if val.kind == JInt: valNode = newInt64Lit(val.num) @@ -270,7 +251,7 @@ proc makeConstSection(constObj: JsonNode): PNode = elif val.kind == JBool: valNode = ident($val.bval) elif val.kind == JString: - valNode = newPNode(nkStrLit) + valNode = newNode(nkStrLit) valNode.strVal = val.str else: raise newException(ValueError, "Unexpected constant kind: " & $val.kind) @@ -294,47 +275,40 @@ type godotName: string typ: GodotType args: seq[MethodArg] - returnType: Option[string] + returnType: string isVirtual: bool isBase: bool isDiscardable: bool -const standardTypes = toHashSet( +const standardTypes = toSet( ["bool", "cint", "int", "uint8", "int8", "uint16", "int16", "uint32", "int32", - "uint64", "Error", + "uint64", "int64", "float32", "cfloat", "float64", "GodotString", "Vector2", "Rect2", "Vector3", "Transform2D", "Plane", "Quat", "AABB", "Basis", "Transform", "Color", "RID", "NodePath", "Dictionary", "Variant", "Array", "PoolByteArray", "PoolIntArray", "PoolRealArray", "PoolStringArray", "PoolVector2Array", "PoolVector3Array", "PoolColorArray"]) -const variantPrimitives = [ - "bool", "cint", "int", "uint8", "int8", "uint16", "int16", "uint32", "int32", - "uint64", "Error", - "int64", "float32", "cfloat", "float64", "GodotString", "Vector2", "Rect2", - "Vector3", "Transform2D", "Plane", "Quat", "AABB", "Basis", "Transform", - "Color", "RID"] - -const smallIntTypes = toHashSet(["uint8", "int8", "uint16", "int16", "uint32", - "int32", "cint", "int", "Error"]) -const int64Types = toHashSet(["uint64", "int64"]) +const smallIntTypes = toSet(["uint8", "int8", "uint16", "int16", "uint32", + "int32", "cint", "int", "Error"]) +const int64Types = toSet(["uint64", "int64"]) const intTypes = union(smallIntTypes, int64Types) -const float64Types = toHashSet(["float64", "cdouble"]) -const float32Types = toHashSet(["float32", "cfloat"]) +const float64Types = toSet(["float64", "cdouble"]) +const float32Types = toSet(["float32", "cfloat"]) const floatTypes = union(float64Types, float32Types) -const arrayTypes = toHashSet(["Array", "PoolByteArray", +const arrayTypes = toSet(["Array", "PoolByteArray", "PoolIntArray", "PoolRealArray", "PoolStringArray", "PoolVector2Array", "PoolVector3Array", "PoolColorArray"]) const wrapperTypes = union(arrayTypes, - toHashSet(["NodePath", "Dictionary", "Variant"])) + toSet(["NodePath", "Dictionary", "Variant"])) proc getInternalPtr(varName: PNode, typ: string): PNode = - assert(typ in wrapperTypes or typ == "Object") + assert(typ in wrapperTypes) result = newDotExpr(varName, ident("godot" & typ)) proc newNilCheck(ident, toAssign: PNode): PNode = newIfStmt(newCall("isNil", ident), - newPNode(nkAsgn).addChain(ident).addChain( + newNode(nkAsgn).addChain(ident).addChain( toAssign ) ) @@ -407,8 +381,6 @@ proc makeDefaultValue(arg: MethodArg): PNode = result = newCall("newVariant") else: failed = true - elif arg.typ == "Dictionary": - result = newCall("newDictionary") else: failed = true @@ -425,12 +397,12 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], meth: MethodInfo, withImplementation: bool) = var body: PNode if not withImplementation: - body = newPNode(nkEmpty) + body = newNode(nkEmpty) elif meth.godotName == "_init" and meth.typ.godotName == "Object": # It's not real (calling it crashes) and will be removed later, # but we use init() convention in Nim, so it needs to work. - body = newPNode(nkStmtList).addChain( - newPNode(nkDiscardStmt).addChain(newPNode(nkEmpty))) + body = newNode(nkStmtList).addChain( + newNode(nkDiscardStmt).addChain(newNode(nkEmpty))) else: let methGodotName = if meth.godotName.startsWith('_'): "underscore" & meth.godotName[1..^1] @@ -441,12 +413,12 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], if methodBindName[0].isUpperAscii(): methodBindName[0] = methodBindName[0].toLowerAscii() if methodBindName notin methodBindRegistry: - let methodBindDecl = newPNode(nkVarSection).addChain( + let methodBindDecl = newNode(nkVarSection).addChain( newIdentDefs( - newPNode(nkPragmaExpr).addChain( + newNode(nkPragmaExpr).addChain( ident(methodBindName)).addChain( - newPNode(nkPragma).addChain(ident("threadvar"))), - newPNode(nkPtrTy).addChain(ident("GodotMethodBind")) + newNode(nkPragma).addChain(ident("threadvar"))), + newNode(nkPtrTy).addChain(ident("GodotMethodBind")) )) tree.add(methodBindDecl) methodBindRegistry.incl(methodBindName) @@ -455,8 +427,8 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], newCall("getMethod", newCStringLit(meth.typ.godotName), newCStringLit(meth.godotName)) ) - let vars = newPNode(nkVarSection) - var varargsName = none(string) + let vars = newNode(nkVarSection) + var varargsName: string var isVarargs: bool var staticArgsLen: int var argLenNode = newIntLit(0) @@ -464,114 +436,78 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], if meth.args.len > 0: for idx, arg in meth.args: if arg.kind == ArgKind.VarArgs: - varargsName = some(arg.name) + varargsName = arg.name isVarargs = true vars.add(newIdentDefs(ident("callError"), ident("VariantCallError"))) elif arg.kind == ArgKind.Bound: let argName = boundArgName(idx) vars.add(newIdentDefs( - ident(argName), newPNode(nkEmpty), arg.makeDefaultValue())) + ident(argName), newNode(nkEmpty), arg.makeDefaultValue())) - let argsAlloc = newPNode(nkCast).addChain( - newPNode(nkPtrTy).addChain( - newPNode(nkBracketExpr).addChain( + let argsAlloc = newNode(nkCast).addChain( + newNode(nkPtrTy).addChain( + newNode(nkBracketExpr).addChain( ident("array"), ident("MAX_ARG_COUNT"), - if isVarargs: newPNode(nkPtrTy).addChain(ident("GodotVariant")) + if isVarargs: newNode(nkPtrTy).addChain(ident("GodotVariant")) else: ident("pointer")))) - staticArgsLen = if varargsName.isNone: meth.args.len + staticArgsLen = if varargsName.isNil: meth.args.len else: meth.args.len - 1 - if varargsName.isSome: + if not varargsName.isNil: argLenNode = newCall("cint", infix(newIntLit(staticArgsLen), ident("+"), - newDotExpr(ident(varargsName.get), ident("len")))) + newDotExpr(ident(varargsName), ident("len")))) argsAlloc.add(newCall("godotAlloc", newCall("cint", infix( - newCall("sizeof", newPNode(nkPtrTy).addChain(ident("GodotVariant"))), ident("*"), - newPNode(nkPar).addChain(argLenNode)))) + newCall("sizeof", ident("Variant")), ident("*"), + newNode(nkPar).addChain(argLenNode)))) ) else: argLenNode = newCall("cint", newIntLit(staticArgsLen)) vars.add(newIdentDefs( ident("argsStatic"), - newPNode(nkBracketExpr).addChain( + newNode(nkBracketExpr).addChain( ident("array"), newIntLit(staticArgsLen), ident("pointer")), - newPNode(nkEmpty))) + newNode(nkEmpty))) argsAlloc.add(newCommand(ident("addr"), ident("argsStatic"))) - vars.add(newIdentDefs(argsName, newPNode(nkEmpty), argsAlloc)) + vars.add(newIdentDefs(argsName, newNode(nkEmpty), argsAlloc)) - let argConversions = newPNode(nkStmtList) - let destructors = newPNode(nkStmtList) + let argConversions = newNode(nkStmtList) for idx, arg in meth.args: var argName = if arg.kind == ArgKind.Bound: ident(boundArgName(idx)) else: ident(arg.name) if arg.kind == ArgKind.VarArgs: - argName = newPNode(nkBracketExpr).addChain( - ident(varargsName.get), + argName = newNode(nkBracketExpr).addChain( + ident(varargsName), infix(ident("idx"), ident("-"), newIntLit(staticArgsLen))) let argIdx = if arg.kind == ArgKind.VarArgs: ident("idx") else: newIntLit(idx) let isStandardType = arg.typ in standardTypes let isWrappedType = arg.typ in wrapperTypes - let convArg = - if varargsName.isSome: - let isAlreadyVariant = arg.typ == "Variant" - let variantIdent = if isAlreadyVariant: getInternalPtr(argName, "Variant") - else: ident("variant" & $idx) - if not isAlreadyVariant: - argConversions.add(newPNode(nkVarSection).addChain( - newIdentDefs(variantIdent, ident("GodotVariant"), newEmptyNode()) - )) - destructors.add( - newCall("deinit", variantIdent) - ) - if arg.typ in variantPrimitives: - argConversions.add( - newCall("initGodotVariant", variantIdent, argName) - ) - elif arg.typ in wrapperTypes or arg.typ == "Object": - argConversions.add( - newCall("initGodotVariant", variantIdent, getInternalPtr(argName, arg.typ)) - ) - elif arg.typ == "string": - let stringIdent = ident("variantString" & $idx) - argConversions.addChain( - newPNode(nkVarSection).addChain( - newIdentDefs(stringIdent, ident("GodotString"), newCall("toGodotString", argName)) - ) - ).addChain( - newCall("initGodotVariant", variantIdent, stringIdent) - ) - destructors.add(newCall("deinit", stringIdent)) - else: - raise newException(ValueError, - "Non-standard type $# for varargs params of method $# of type $#" % - [arg.typ, meth.godotName, meth.typ.godotName]) - - if isAlreadyVariant: variantIdent - else: newCall("addr", variantIdent) - elif isWrappedType: getInternalPtr(argName, arg.typ) - elif isStandardType: newCall("unsafeAddr", argName) - elif arg.typ == "string": newCall("unsafeAddr", - ident("argToPassToGodot" & $idx)) - else: ident("argToPassToGodot" & $idx) # object + let convArg = if not varargsName.isNil: + getInternalPtr(newCall("toVariant", argName), "Variant") + elif isWrappedType: getInternalPtr(argName, arg.typ) + elif isStandardType: newCall("unsafeAddr", argName) + elif arg.typ == "string": newCall("unsafeAddr", + ident("argToPassToGodot" & $idx)) + else: ident("argToPassToGodot" & $idx) # object if not isStandardType and arg.kind == ArgKind.VarArgs: raise newException(ValueError, "Non-standard type $# for varargs params of method $# of type $#" % [arg.typ, meth.godotName, meth.typ.godotName]) - if not isStandardType and varargsName.isNone: + if not isStandardType and varargsName.isNil: if arg.typ == "string": - argConversions.add(newPNode(nkVarSection).addChain( + argConversions.add(newNode(nkVarSection).addChain( newIdentDefs(ident("argToPassToGodot" & $idx), newEmptyNode(), newCall("toGodotString", argName)))) else: let objVal = newIfStmt( prefix("not", newDotExpr(argName, ident"isNil")), newDotExpr(argName, ident("godotObject")) - ).addChain(newPNode(nkElse).addChain(newNilLit())) - argConversions.add(newPNode(nkLetSection).addChain( + ).addChain(newNode(nkElse).addChain(newNilLit())) + argConversions.add(newNode(nkLetSection).addChain( newIdentDefs(ident("argToPassToGodot" & $idx), newEmptyNode(), objVal))) - let argAsgn = newPNode(nkAsgn).addChain( - newPNode(nkBracketExpr).addChain( - newPNode(nkBracketExpr).addChain(argsName), argIdx), + let argAsgn = newNode(nkAsgn).addChain( + newNode(nkBracketExpr).addChain( + newNode(nkBracketExpr).addChain(argsName), argIdx), convArg ) if arg.kind != ArgKind.VarArgs: @@ -579,14 +515,14 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], argAsgn ) else: - argConversions.add(newPNode(nkVarSection).addChain( - newIdentDefs(ident("idx"), newPNode(nkEmpty), + argConversions.add(newNode(nkVarSection).addChain( + newIdentDefs(ident("idx"), newNode(nkEmpty), newIntLit(staticArgsLen)))) - let argLoop = newPNode(nkWhileStmt) + let argLoop = newNode(nkWhileStmt) argConversions.add(argLoop) argLoop.add(infix(ident("idx"), ident("<"), argLenNode) ) - argLoop.add(newPNode(nkStmtList).addChain( + argLoop.add(newNode(nkStmtList).addChain( argAsgn, newCommand(ident("inc"), ident("idx")))) @@ -595,26 +531,26 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], newDotExpr(ident(methodBindName), ident(if isVarargs: "call" else: "ptrCall")), newDotExpr(ident("self"), ident("godotObject")), - if meth.args.len > 0: argsName else: newPNode(nkNilLit), + if meth.args.len > 0: argsName else: newNode(nkNilLit), argLenNode, if not isVarargs: ident(retName) else: ident("callError") ) if not isVarargs: theCall.sons.delete(3) let freeCall = newCall("godotFree", argsName) - body = newPNode(nkStmtList) + body = newNode(nkStmtList) if meth.typ.isSingleton: let varName = singletonName(meth.typ.name) body.add(newNilCheck(varName, newCall( newBracketExpr(ident("getSingleton"), ident(meth.typ.name))))) - body.add(newPNode(nkLetSection).addChain(newIdentDefs( - ident("self"), newPNode(nkEmpty), varName + body.add(newNode(nkLetSection).addChain(newIdentDefs( + ident("self"), newNode(nkEmpty), varName ))) body.add(nilCheck) body.add(vars) body.add(argConversions) if not isVarargs: - let retPtrDecl = newPNode(nkVarSection).addChain( + let retPtrDecl = newNode(nkVarSection).addChain( newIdentDefs(ident(retName), ident("pointer"), newEmptyNode()) ) body.add(retPtrDecl) @@ -624,109 +560,105 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], var isStringRet: bool var isWrapperRet: bool let retValIdent = if not isVarargs: ident("ptrCallVal") else: ident(retName) - if meth.returnType.isSome and not isVarargs: - let returnType = meth.returnType.get + if not meth.returnType.isNil and not isVarargs: var addrToAssign = newCall("addr", retValIdent) - if returnType in smallIntTypes: + if meth.returnType in smallIntTypes: isConversionRet = true - body.add(newPNode(nkVarSection).addChain(newIdentDefs( + body.add(newNode(nkVarSection).addChain(newIdentDefs( retValIdent, ident("int64"), ))) - elif returnType in float32Types: + elif meth.returnType in float32Types: isConversionRet = true - body.add(newPNode(nkVarSection).addChain(newIdentDefs( + body.add(newNode(nkVarSection).addChain(newIdentDefs( retValIdent, ident("float64"), ))) - elif returnType in wrapperTypes: + elif meth.returnType in wrapperTypes: isWrapperRet = true - body.add(newPNode(nkVarSection).addChain(newIdentDefs( - retValIdent, ident("Godot" & returnType), + body.add(newNode(nkVarSection).addChain(newIdentDefs( + retValIdent, ident("Godot" & meth.returnType), ))) - if returnType != "NodePath": - body.add(newCall("initGodot" & returnType, retValIdent)) - elif returnType in standardTypes: + elif meth.returnType in standardTypes: addrToAssign = newCall("addr", ident("result")) - elif returnType == "string": + elif meth.returnType == "string": isStringRet = true - body.add(newPNode(nkVarSection).addChain(newIdentDefs( + body.add(newNode(nkVarSection).addChain(newIdentDefs( retValIdent, ident("GodotString"), ))) - elif returnType != "void": + elif meth.returnType != "void": isObjRet = true - body.add(newPNode(nkVarSection).addChain(newIdentDefs( - retValIdent, newPNode(nkPtrTy).addChain(ident("GodotObject")), + body.add(newNode(nkVarSection).addChain(newIdentDefs( + retValIdent, newNode(nkPtrTy).addChain(ident("GodotObject")), ))) - body.add(newPNode(nkAsgn).addChain(ident(retName), addrToAssign)) + body.add(newNode(nkAsgn).addChain(ident(retName), addrToAssign)) if not isVarargs: body.add(theCall) else: - if meth.returnType.isSome: + if not meth.returnType.isNil: isVariantRet = true - let callStmt = newPNode(nkLetSection).addChain( + let callStmt = newNode(nkLetSection).addChain( newIdentDefs( - newPNode(nkPragmaExpr).addChain( - ident(retName), newPNode(nkPragma).addChain(ident("used"))), - newPNode(nkEmpty), theCall)) + newNode(nkPragmaExpr).addChain( + ident(retName), newNode(nkPragma).addChain(ident("used"))), + newNode(nkEmpty), theCall)) body.add(callStmt) - if varargsName.isNone: + if varargsName.isNil: for idx, arg in meth.args: if arg.typ == "string": body.add(newCall("deinit", ident("argToPassToGodot" & $idx))) - if varargsName.isSome: - if meth.args.len > 0: - body.add(freeCall) - body.add(destructors) + if meth.args.len > 0 and not varargsName.isNil: + body.add(freeCall) + if not varargsName.isNil: let errCheck = newIfStmt( infix(newDotExpr(ident("callError"), ident("error")), ident("!="), newDotExpr(ident("VariantCallErrorType"), ident("OK"))), - newPNode(nkRaiseStmt).addChain( + newNode(nkRaiseStmt).addChain( newCall("newCallError", ident("callError"))) ) body.add(errCheck) if isVariantRet: - let convErrDef = newPNode(nkLetSection).addChain( - newIdentDefs(ident("convErr"), newPNode(nkEmpty), + let convErrDef = newNode(nkLetSection).addChain( + newIdentDefs(ident("convErr"), newNode(nkEmpty), newCall("fromVariant", ident("result"), newCall("newVariant", retValIdent)))) let convCheck = newIfStmt( infix(ident("convErr"), ident("!="), newDotExpr(ident("ConversionResult"), ident("OK"))), - newPNode(nkRaiseStmt).addChain( + newNode(nkRaiseStmt).addChain( newCall("newConversionError", ident("convErr"))) ) body.add(convErrDef) body.add(convCheck) if isStringRet: - body.add(newPNode(nkAsgn).addChain( + body.add(newNode(nkAsgn).addChain( ident("result"), prefix("$", retValIdent))) body.add(newCall("deinit", retValIdent)) elif isConversionRet: - body.add(newPNode(nkAsgn).addChain( + body.add(newNode(nkAsgn).addChain( ident("result"), - newCall(meth.returnType.get, retValIdent))) + newCall(meth.returnType, retValIdent))) elif isWrapperRet: - body.add(newPNode(nkAsgn).addChain( + body.add(newNode(nkAsgn).addChain( ident("result"), - newCall("new" & meth.returnType.get, retValIdent))) + newCall("new" & meth.returnType, retValIdent))) elif isObjRet: - body.add(newPNode(nkAsgn).addChain(ident("result"), + body.add(newNode(nkAsgn).addChain(ident("result"), newCall(newBracketExpr(ident("asNimGodotObject"), newCall("type", ident("result"))), retValIdent, ident("false"), ident("true")))) elif isStringRet: - body.add(newPNode(nkAsgn).addChain(ident("result"), + body.add(newNode(nkAsgn).addChain(ident("result"), newCall("$", retValIdent))) let procType = if meth.isVirtual: nkMethodDef else: nkProcDef var params = newSeqOfCap[PNode](meth.args.len + 2) - if meth.returnType.isSome: - params.add(ident(meth.returnType.get)) + if not meth.returnType.isNil: + params.add(ident(meth.returnType)) else: - params.add(newPNode(nkEmpty)) + params.add(newNode(nkEmpty)) if not meth.typ.isSingleton: params.add(newIdentDefs(ident("self"), ident(toNimType(meth.typ.name)))) @@ -737,7 +669,7 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], params.add(newIdentDefs(ident(arg.name), ident(arg.typ), defaultValue)) of ArgKind.VarArgs: params.add(newIdentDefs(ident(arg.name), - newPNode(nkBracketExpr).addChain(ident("varargs"), ident(arg.typ)))) + newNode(nkBracketExpr).addChain(ident("varargs"), ident(arg.typ)))) of ArgKind.Bound: discard @@ -745,14 +677,14 @@ proc doGenerateMethod(tree: PNode, methodBindRegistry: var HashSet[string], else: meth.name, params, body, procType) if not withImplementation: - let pragma = newPNode(nkPragma) + let pragma = newNode(nkPragma) pragma.add(ident("gcsafe")) - pragma.add(newPNode(nkExprColonExpr).addChain(ident("locks"), + pragma.add(newNode(nkExprColonExpr).addChain(ident("locks"), newIntLit(0))) if meth.isVirtual and meth.isBase and meth.typ.name != "PhysicsBody": # Nim doesn't like `base` on PhysicsBody methods - wtf pragma.add(ident("base")) - if meth.isDiscardable and meth.returnType.isSome: + if meth.isDiscardable and not meth.returnType.isNil: pragma.add(ident("discardable")) procDecl.sons[4] = pragma tree.add(procDecl) @@ -797,9 +729,9 @@ proc getMethodInfo(methodObj: JsonNode, types: Table[string, GodotType], nimName = nimName & "Impl" let returnType = if methodObj["return_type"].str != "void": - some(toNimType(types, methodObj["return_type"].str)) - else: none(string) - const discardableMethods = toHashSet(["emit_signal"]) + toNimType(types, methodObj["return_type"].str) + else: nil + const discardableMethods = toSet(["emit_signal"]) result = MethodInfo( name: ident(nimName), typ: typ, @@ -828,17 +760,17 @@ proc makeProperty(types: Table[string, GodotType], tree: PNode, return let getterNameStr = toNimStyle(propertyObj["name"].str) let getterName = ident(getterNameStr) - let setterName = newPNode(nkAccQuoted).addChain(ident(getterNameStr & "=")) + let setterName = newNode(nkAccQuoted).addChain(ident(getterNameStr & "=")) let getter = findMethod(obj, propertyObj["getter"].str) let nimType = if getter.isNil: toNimType(types, propertyObj["type"].str) - else: getMethodInfo(getter, types, typ).returnType.get("void") + else: getMethodInfo(getter, types, typ).returnType let getterInfo = MethodInfo( name: getterName, typ: typ, godotName: propertyObj["getter"].str, - args: newSeq[MethodArg](), - returnType: some(nimType) + args: @[], + returnType: nimType ) let setterInfo = MethodInfo( name: setterName, @@ -847,12 +779,10 @@ proc makeProperty(types: Table[string, GodotType], tree: PNode, args: @[MethodArg(name: "val", typ: nimType)] ) if "index" in propertyObj and propertyObj["index"] != newJInt(-1): - getterInfo.args = - @[MethodArg(defaultVal: newJString($propertyObj["index"]), - typ: "int", kind: ArgKind.Bound)] & getterInfo.args - setterInfo.args = - @[MethodArg(defaultVal: newJString($propertyObj["index"]), - typ: "int", kind: ArgKind.Bound)] & setterInfo.args + getterInfo.args = @[MethodArg(defaultVal: newJString($propertyObj["index"]), + typ: "int", kind: ArgKind.Bound)] & getterInfo.args + setterInfo.args = @[MethodArg(defaultVal: newJString($propertyObj["index"]), + typ: "int", kind: ArgKind.Bound)] & setterInfo.args generateMethod(tree, methodBindRegistry, getterInfo, withImplementation) generateMethod(tree, methodBindRegistry, setterInfo, withImplementation) @@ -909,15 +839,15 @@ proc typeNameToModuleName(name: string): string = proc newRegisterClassNode(typ: GodotType): PNode = newCall("registerClass", ident(typ.name), - newStrLit(typ.godotName), + newCStringLit(typ.godotName), ident("true") # isNative ) proc genSingletonDecl(typ: string): PNode = - result = newPNode(nkVarSection) + result = newNode(nkVarSection) let name = singletonName(typ) - let threadvar = newPNode(nkPragma).addChain(ident("threadvar")) - result.add(newIdentDefs(newPNode(nkPragmaExpr).addChain(name, threadvar), + let threadvar = newNode(nkPragma).addChain(ident("threadvar")) + result.add(newIdentDefs(newNode(nkPragmaExpr).addChain(name, threadvar), ident(typ))) proc shouldExport(typ: GodotType, types: Table[string, GodotType]): bool = @@ -934,9 +864,9 @@ proc sortByDerivedCount(types: Table[string, GodotType]): seq[GodotType] = proc genTypeFile(types: Table[string, GodotType], targetDir: string) = let sortedTypes = sortByDerivedCount(types) - let godotApiTypesTree = newPNode(nkStmtList) - godotApiTypesTree.add(newPNode(nkImportStmt).addChain(ident("godot"))) - let typeSection = newPNode(nkTypeSection) + let godotApiTypesTree = newNode(nkStmtList) + godotApiTypesTree.add(newNode(nkImportStmt).addChain(ident("godot"))) + let typeSection = newNode(nkTypeSection) godotApiTypesTree.add(typeSection) for typ in sortedTypes: @@ -947,7 +877,7 @@ proc genTypeFile(types: Table[string, GodotType], targetDir: string) = if not typ.shouldExport(types): continue let regNode = newCall("registerClass", ident(typ.name), - newStrLit(typ.godotName), + newCStringLit(typ.godotName), ident("true") # isNative ) godotApiTypesTree.add(regNode) @@ -958,10 +888,10 @@ proc genSingletonWithDerived(tree: PNode, typ: GodotType, types: Table[string, GodotType]) = let sortedTypes = sortByDerivedCount(types) - var parents = initHashSet[string]() + var parents = initSet[string]() parents.incl(typ.name) - let typeDecl = newPNode(nkTypeSection) + let typeDecl = newNode(nkTypeSection) tree.add(typeDecl) proc genDecl(typ: GodotType) = newRefTypeNode(typeDecl, typ.name, typ.baseName, typ.doc, @@ -990,7 +920,7 @@ proc genApi*(targetDir: string, apiJsonFile: string) = let className = godotClassName.replace("_", "") var baseClassName = obj["base_class"].str baseClassName = toNimType(baseClassName.replace("_", "")) - if baseClassName.len == 0: + if baseClassName.isNil or baseClassName.len == 0: baseClassName = "NimGodotObject" var doc = "" for attr in classAttributes: @@ -1011,17 +941,17 @@ proc genApi*(targetDir: string, apiJsonFile: string) = for typ in types.values(): let moduleName = typeNameToModuleName(typ.name) echo "Generating ", moduleName, ".nim..." - let tree = newPNode(nkStmtList) - let importStmt = newPNode(nkImportStmt) + let tree = newNode(nkStmtList) + let importStmt = newNode(nkImportStmt) importStmt.add(ident("godot")) importStmt.add(ident("godottypes")) importStmt.add(ident("godotinternal")) tree.add(importStmt) - let exportStmt = newPNode(nkExportStmt) + let exportStmt = newNode(nkExportStmt) exportStmt.add(ident("godottypes")) tree.add(exportStmt) - var methodBindRegsitry = initHashSet[string]() + var methodBindRegsitry = initSet[string]() let obj = typ.jsonNode if typ.baseName != "NimGodotObject": let baseModule = typeNameToModuleName(typ.baseName) @@ -1082,6 +1012,7 @@ when isMainModule: import os const usage = """Tool for wrapping Godot API into Nim + godotapigen [godot binary path] [target directory]""" proc main() = @@ -1112,4 +1043,4 @@ when isMainModule: genApi(targetDir, jsonFile) - main() \ No newline at end of file + main() diff --git a/godot/godotinternal.nim b/godot/godotinternal.nim index 207d76f..0314624 100644 --- a/godot/godotinternal.nim +++ b/godot/godotinternal.nim @@ -1,8 +1,8 @@ # Copyright 2018 Xored Software, Inc. -import internal/godotinternaltypes, internal/godotarrays, - internal/godotnodepaths, internal/godotpoolarrays, internal/godotstrings, - internal/godotvariants, internal/godotdictionaries +import internal.godotinternaltypes, internal.godotarrays, + internal.godotnodepaths, internal.godotpoolarrays, internal.godotstrings, + internal.godotvariants, internal.godotdictionaries import gdnativeapi export godotinternaltypes, godotarrays, godotnodepaths, godotpoolarrays, @@ -93,11 +93,6 @@ proc getClassName*(o: ptr GodotObject): string = # There are physics type not known by ClassDB result = result[0..result.len-3] -proc getClassNameRaw*(o: ptr GodotObject): GodotString = - if getClassMethodBind.isNil: - getClassMethodBind = getMethod(cstring"Object", cstring"get_class") - getClassMethodBind.ptrCall(o, nil, addr result) - proc getGodotSingleton*(name: cstring): ptr GodotObject {.inline.} = getGDNativeAPI().globalGetSingleton(name) diff --git a/godot/internal/backwardcompat.inc.nim b/godot/internal/backwardcompat.inc.nim deleted file mode 100644 index 9d31844..0000000 --- a/godot/internal/backwardcompat.inc.nim +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright 2019 Xored Software, Inc. - -when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - import macros, sets - - proc strVal(n: NimNode): string {.used.} = - case n.kind - of nnkIdent: - $n.ident - of nnkSym: - $n.symbol - else: - macros.strVal(n) - - proc toHashSet[A](keys: openArray[A]): HashSet[A] {.inline, used.} = - toSet(keys) - - proc initHashSet[A](): HashSet[A] {.inline, used.} = - initSet[A]() diff --git a/godot/internal/godotarrays.nim b/godot/internal/godotarrays.nim index c7e451d..c0736b5 100644 --- a/godot/internal/godotarrays.nim +++ b/godot/internal/godotarrays.nim @@ -1,6 +1,6 @@ # Copyright (c) 2018 Xored Software, Inc. -import godotinternaltypes, gdnativeapi, core/godotcoretypes +import godotinternaltypes, gdnativeapi, core.godotcoretypes proc len*(self: GodotArray): cint {.inline.} = getGDNativeAPI().arraySize(self) diff --git a/godot/internal/godotinternaltypes.nim b/godot/internal/godotinternaltypes.nim index a2910c9..192b6cd 100644 --- a/godot/internal/godotinternaltypes.nim +++ b/godot/internal/godotinternaltypes.nim @@ -66,8 +66,6 @@ type GodotString* {.byref.} = object data: array[sizeof(int), byte] - cwchar_t* {.importc: "wchar_t", nodecl.} = object - GodotCharString* {.byref.} = object data: array[sizeof(int), byte] @@ -116,8 +114,7 @@ type expected*: VariantType GodotVariant* {.byref.} = object - data: array[2, int64] - data2: int + data: array[4 + sizeof(int) div 4, float32] type GodotMethodBind* = object @@ -308,6 +305,3 @@ type GodotClassConstructor* = proc (): ptr GodotObject {. noconv, gcsafe, locks: 0, raises: [], tags: [].} - -template offset*[T](p: ptr T, offset: int): ptr T = - cast[ptr T](cast[ByteAddress](p) +% (offset * sizeof(T))) \ No newline at end of file diff --git a/godot/internal/godotpoolarrays.nim b/godot/internal/godotpoolarrays.nim index 119848f..fb80ad0 100644 --- a/godot/internal/godotpoolarrays.nim +++ b/godot/internal/godotpoolarrays.nim @@ -1,7 +1,10 @@ # Copyright (c) 2018 Xored Software, Inc. import godotinternaltypes, gdnativeapi -import core/godotcoretypes +import core.godotcoretypes + +proc offset[T](p: ptr T, offset: int): ptr T {.inline.} = + cast[ptr T](cast[ByteAddress](p) +% (offset * sizeof(T))) template genPoolArrayAPI(ArrayT, initIdent, DataT, newProc, newCopyProc, newWithArrayProc, appendProc, @@ -45,15 +48,7 @@ template genPoolArrayAPI(ArrayT, initIdent, DataT, getGDNativeAPI().setProc(self, idx, data) proc `[]`*(self: ArrayT; idx: cint): DataT {.inline.} = - let data = getGDNativeAPI().getProc(self, idx) - when DataT is Color: - data.toColor() - elif DataT is Vector2: - data.toVector2() - elif DataT is Vector3: - data.toVector3() - else: - data + getGDNativeAPI().getProc(self, idx) proc len*(self: ArrayT): cint {.inline.} = getGDNativeAPI().sizeProc(self) diff --git a/godot/internal/godotstrings.nim b/godot/internal/godotstrings.nim index e67acfd..17443cb 100644 --- a/godot/internal/godotstrings.nim +++ b/godot/internal/godotstrings.nim @@ -22,12 +22,6 @@ proc `&`*(self, b: GodotString): GodotString {.inline.} = proc deinit*(self: var GodotString) {.inline.} = getGDNativeAPI().stringDestroy(self) -proc len*(self: GodotString): cint {.inline.} = - getGDNativeAPI().stringLength(self) - -proc dataPtr*(self: GodotString): ptr cwchar_t {.inline.} = - getGDNativeAPI().stringWideStr(self) - proc `$`*(self: GodotString): string = ## Converts the ``GodotString`` into Nim string var charStr = getGDNativeAPI().stringUtf8(self) @@ -38,11 +32,8 @@ proc `$`*(self: GodotString): string = proc toGodotString*(s: string): GodotString {.inline.} = ## Converts the Nim string into ``GodotString`` - when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - if s.isNil: - initGodotString(result) - else: - initGodotString(result, cstring(s), cint(s.len + 1)) + if s.isNil: + initGodotString(result) else: initGodotString(result, cstring(s), cint(s.len + 1)) diff --git a/godot/internal/godotvariants.nim b/godot/internal/godotvariants.nim index 0a0980f..3f961ca 100644 --- a/godot/internal/godotvariants.nim +++ b/godot/internal/godotvariants.nim @@ -1,6 +1,6 @@ # Copyright 2018 Xored Software, Inc. -import core/godotcoretypes, godotinternaltypes, gdnativeapi +import core.godotcoretypes, godotinternaltypes, gdnativeapi proc getType*(p: GodotVariant): VariantType {.inline.} = getGDNativeAPI().variantGetType(p) @@ -121,34 +121,34 @@ proc asGodotString*(self: GodotVariant): GodotString {.inline.} = getGDNativeAPI().variantAsString(self) proc asVector2*(self: GodotVariant): Vector2 {.inline.} = - getGDNativeAPI().variantAsVector2(self).toVector2() + getGDNativeAPI().variantAsVector2(self) proc asRect2*(self: GodotVariant): Rect2 {.inline.} = - getGDNativeAPI().variantAsRect2(self).toRect2() + getGDNativeAPI().variantAsRect2(self) proc asVector3*(self: GodotVariant): Vector3 {.inline.} = - getGDNativeAPI().variantAsVector3(self).toVector3() + getGDNativeAPI().variantAsVector3(self) proc asTransform2D*(self: GodotVariant): Transform2D {.inline.} = - getGDNativeAPI().variantAsTransform2D(self).toTransform2D() + getGDNativeAPI().variantAsTransform2D(self) proc asPlane*(self: GodotVariant): Plane {.inline.} = - getGDNativeAPI().variantAsPlane(self).toPlane() + getGDNativeAPI().variantAsPlane(self) proc asQuat*(self: GodotVariant): Quat {.inline.} = - getGDNativeAPI().variantAsQuat(self).toQuat() + getGDNativeAPI().variantAsQuat(self) proc asAABB*(self: GodotVariant): AABB {.inline.} = - getGDNativeAPI().variantAsAABB(self).toAABB() + getGDNativeAPI().variantAsAABB(self) proc asBasis*(self: GodotVariant): Basis {.inline.} = - getGDNativeAPI().variantAsBasis(self).toBasis() + getGDNativeAPI().variantAsBasis(self) proc asTransform*(self: GodotVariant): Transform {.inline.} = - getGDNativeAPI().variantAsTransform(self).toTransform() + getGDNativeAPI().variantAsTransform(self) proc asColor*(self: GodotVariant): Color {.inline.} = - getGDNativeAPI().variantAsColor(self).toColor() + getGDNativeAPI().variantAsColor(self) proc asNodePath*(self: GodotVariant): GodotNodePath {.inline.} = getGDNativeAPI().variantAsNodePath(self) diff --git a/godot/nim/godotmacros.nim b/godot/nim/godotmacros.nim index 6b81f7e..384aa2b 100644 --- a/godot/nim/godotmacros.nim +++ b/godot/nim/godotmacros.nim @@ -1,8 +1,8 @@ # Copyright 2018 Xored Software, Inc. -import macros, tables, typetraits, strutils, sets, sequtils, options, algorithm -import godotinternal, internal/godotvariants -import godotnim, core/variants +import macros, tables, typetraits +import godotinternal, internal.godotvariants +import godotnim, core.variants type VarDecl = ref object @@ -10,8 +10,8 @@ type typ: NimNode defaultValue: NimNode isNoGodot: bool - hint: Option[string] - hintStr: Option[string] + hint: string + hintStr: string usage: NimNode isExported: bool @@ -32,8 +32,6 @@ type ParseError = object of Exception -include "internal/backwardcompat.inc.nim" - proc godotToNim[T](val: Variant): (T, ConversionResult) = mixin fromVariant result[1] = fromVariant(result[0], val) @@ -53,15 +51,15 @@ template parseError(node: NimNode, msg: string) = proc extractNames(definition: NimNode): tuple[name, parentName: string] = if definition.kind == nnkIdent: - result.name = definition.strVal + result.name = $(definition.ident) else: if not (definition.kind == nnkInfix and - definition[0].strVal == "of"): + definition[0].ident == toNimIdent("of")): parseError(definition, "invalid type definition") - result.name = definition[1].strVal + result.name = $(definition[1].ident) case definition[2].kind: of nnkIdent: - result.parentName = definition[2].strVal + result.parentName = $definition[2].ident else: parseError(definition[2], "parent type expected") @@ -74,13 +72,13 @@ proc newCStringLit(s: string): NimNode {.compileTime.} = newNimNode(nnkCallStrLit).add(ident("cstring"), newRStrLit(s)) iterator pragmas(node: NimNode): - tuple[key: string, value: NimNode, index: int] = + tuple[key: NimIdent, value: NimNode, index: int] = assert node.kind in {nnkPragma, nnkEmpty} for index in countdown(node.len - 1, 0): if node[index].kind == nnkExprColonExpr: - yield (node[index][0].strVal, node[index][1], index) + yield (node[index][0].ident, node[index][1], index) elif node[index].kind == nnkIdent: - yield (node[index].strVal, nil, index) + yield (node[index].ident, nil, index) proc removePragmaNode(statement: NimNode, pname: string): NimNode {.compileTime.} = @@ -93,8 +91,9 @@ proc removePragmaNode(statement: NimNode, result = nil var pragmas = if RoutineNodes.contains(statement.kind): statement.pragma() else: statement[1] + let pnameIdent = toNimIdent(pname) for ident, val, i in pragmas(pragmas): - if ident.eqIdent(pname): + if ident == pnameIdent: pragmas.del(i) return val @@ -105,18 +104,19 @@ proc removePragma(statement: NimNode, pname: string): bool = return false var pragmas = if RoutineNodes.contains(statement.kind): statement.pragma() else: statement[1] + let pnameIdent = toNimIdent(pname) for ident, val, i in pragmas(pragmas): - if ident.eqIdent(pname): + if ident == pnameIdent: pragmas.del(i) return true proc removeStrPragma(statement: NimNode, - pname: string): Option[string] {.compileTime.} = + pname: string): string {.compileTime.} = ## Removes the pragma from the node and returns value of the pragma ## Works for routine nodes or nnkPragmaExpr let node = removePragmaNode(statement, pname) - result = if node.isNil: none(string) - else: some($node) + result = if node.isNil: nil + else: $node proc isExported(node: NimNode): bool {.compileTime.} = if node.kind == nnkPragmaExpr: @@ -172,15 +172,10 @@ proc parseMethod(meth: NimNode): MethodDecl = proc parseVarSection(decl: NimNode): seq[VarDecl] = assert(decl.kind == nnkVarSection) - for i in 0..`_ or by using ## `load `_ or any other way ## that you can find in `Godot API `_. - let typeDef = parseType(ast) + let typeDef = parseType(definition, callsite()) result = genType(typeDef) + +{.push warning[Deprecated]: on.} diff --git a/godot/nim/godotnim.nim b/godot/nim/godotnim.nim index 7f3ed96..0b13477 100644 --- a/godot/nim/godotnim.nim +++ b/godot/nim/godotnim.nim @@ -1,14 +1,14 @@ # Copyright 2018 Xored Software, Inc. -import tables, typetraits, macros, unicode, strutils, sets, options +import tables, typetraits, macros import gdnativeapi -import core/godotcoretypes, core/godotbase -import core/vector2, core/rect2, - core/vector3, core/transform2d, - core/planes, core/quats, core/aabb, - core/basis, core/transforms, core/colors, - core/nodepaths, core/rids, core/dictionaries, - core/arrays, core/poolarrays, core/variants +import core.godotcoretypes, core.godotbase +import core.vector2, core.rect2, + core.vector3, core.transform2d, + core.planes, core.quats, core.aabb, + core.basis, core.transforms, core.colors, + core.nodepaths, core.rids, core.dictionaries, + core.arrays, core.poolarrays, core.variants import godotinternal ## This module defines ``NimGodotObject`` and ``toVariant``/``fromVariant`` @@ -31,7 +31,7 @@ type ## The base type all Godot types inherit from. ## Manages lifecycle of the wrapped ``GodotObject``. godotObject: ptr GodotObject - linkedObjectPtr: pointer + linkedObject: NimGodotObject ## Wrapper around native object that is the container of the Nim "script" ## This is needed for `of` checks and `as` conversions to work as ## expected. For example, Nim type may inherit from ``Spatial``, but the @@ -39,8 +39,6 @@ type ## ``Particles`` is valid, but Nim type system is not aware of that. ## This works in both directions - for linked native object this ## reference points to Nim object. - ## This is stored as a raw pointer to avoid reference cycles and therefore - ## improve GC performance. isRef*: bool isFinalized: bool isNative: bool @@ -91,71 +89,21 @@ type ## values. ## See documentation of ``GodotPropertyHint`` for description of formats. - FNV1Hash = uint32 - -include "internal/backwardcompat.inc.nim" - proc isFinalized*(obj: NimGodotObject): bool {.inline.} = obj.isFinalized -var classRegistry {.threadvar.}: TableRef[FNV1Hash, ObjectInfo] -var classRegistryStatic* {.compileTime.}: TableRef[FNV1Hash, ObjectInfo] +var classRegistry {.threadvar.}: TableRef[cstring, ObjectInfo] +var classRegistryStatic* {.compileTime.}: TableRef[cstring, ObjectInfo] ## Compile-time variable used for implementation of several procedures ## and macros static: - classRegistryStatic = newTable[FNV1Hash, ObjectInfo]() + classRegistryStatic = newTable[cstring, ObjectInfo]() +static: + import sets, strutils var nativeClasses {.compileTime.} = newSeq[string]() var refClasses* {.compileTime.} = newSeq[string]() -template initFNV1Hash(hash: var FNV1Hash) = - hash = 0x811c9dc5'u32 - -template appendFNV1Hash(hash: var FNV1Hash, val: uint8) = - block: - let u64hash = hash.uint64 - hash = (( - u64hash + - (u64hash shl 1'u64) + - (u64hash shl 4'u64) + - (u64hash shl 7'u64) + - (u64hash shl 8'u64) + - (u64hash shl 24'u64)) and 0xFFFFFFFF'u32).uint32 xor val - -{.push stackTrace:off.} -proc lsb(c: ptr cwchar_t): char {.noinit, inline.} = - {.emit: [result, " = (char)(", c[]," & 0xFF);"]} -{.pop.} - -proc fnv1Hash(godotClassName: GodotString): FNV1Hash = - var charsCount = godotClassName.len - let charsPtr = godotClassName.dataPtr - if charsCount > 2 and - charsPtr.offset(charsCount - 2).lsb == 'S' and - charsPtr.offset(charsCount - 1).lsb == 'W': - charsCount -= 2 - - initFNV1Hash(result) - for i in 0..= charsCount: - break - let firstByte = uint8(rune.uint64 and 0xFF'u64) - appendFNV1Hash(result, firstByte) - # We don't really need to calculate hash of other bytes, - # since we only use hashes of ASCII strings - inc i - proc getClassName*(o: NimGodotObject): string = o.godotObject.getClassName() @@ -187,15 +135,12 @@ proc deinit*(obj: NimGodotObject) = obj.godotObject.deinit() obj.godotObject = nil -proc linkedObject(obj: NimGodotObject): NimGodotObject {.inline.} = - cast[NimGodotObject](obj.linkedObjectPtr) - proc nimGodotObjectFinalizer*[T: NimGodotObject](obj: T) = if obj.godotObject.isNil or obj.isNative: return # important to set it before so that ``unreference`` is aware obj.isFinalized = true - if (obj.isRef or not obj.linkedObject.isNil and obj.linkedObject.isRef) and - obj.godotObject.unreference(): + if obj.isRef and obj.godotObject.unreference() or + not obj.linkedObject.isNil: obj.deinit() macro baseNativeType(T: typedesc): cstring = @@ -209,7 +154,7 @@ macro baseNativeType(T: typedesc): cstring = if typeName == "NimGodotObject": break t = getType(t[1][1]) - if baseT.len == 0: + if baseT.isNil: result = newNilLit() else: let rStr = newNimNode(nnkRStrLit) @@ -234,12 +179,12 @@ macro isResource(T: typedesc): bool = result = if inherits(getType(T), "Resource"): ident("true") else: ident("false") -template registerClass*(T: typedesc; godotClassName: string or cstring, +template registerClass*(T: typedesc; godotClassName: cstring, native: bool) = ## Registers the specified Godot type. ## Used by ``gdobj`` macro and `godotapigen `_. if classRegistry.isNil: - classRegistry = newTable[FNV1Hash, ObjectInfo]() + classRegistry = newTable[cstring, ObjectInfo]() let constructor = proc(): NimGodotObject = var t: T new(t, nimGodotObjectFinalizer[T]) @@ -253,22 +198,14 @@ template registerClass*(T: typedesc; godotClassName: string or cstring, isNative: native, isRef: isRef ) - classRegistry[fnv1Hash($godotClassName)] = objInfo + classRegistry[godotClassName] = objInfo static: let objInfoStatic = ObjectInfo( baseNativeClass: base, isNative: native, isRef: isRef, ) - let nameHash = fnv1Hash($godotClassName) - if not classRegistryStatic.contains(nameHash): - classRegistryStatic[nameHash] = objInfoStatic - elif not endsWith($godotClassName, "SW"): - # For simplicity we assume that all class names must have - # different hashes - # If this exception is ever raised, I guess, we should - # implement a proper collision resolving - raise newException(Exception, "Hash collision " & $godotClassName) + classRegistryStatic[godotClassName] = objInfoStatic when isRef: static: refClasses.add(T.name) @@ -277,10 +214,10 @@ template registerClass*(T: typedesc; godotClassName: string or cstring, nativeClasses.add(T.name) proc newNimGodotObject[T: NimGodotObject]( - godotObject: ptr GodotObject, godotClassName: GodotString, noRef: bool): T = + godotObject: ptr GodotObject, godotClassName: cstring, noRef: bool): T = assert(not classRegistry.isNil) assert(not godotObject.isNil) - let objInfo = classRegistry.getOrDefault(fnv1Hash(godotClassName)) + let objInfo = classRegistry.getOrDefault(godotClassName) if objInfo.constructor.isNil: printError("Nim constructor not found for class " & $godotClassName) else: @@ -303,11 +240,9 @@ proc asNimGodotObject*[T: NimGodotObject]( # Could be data from other bindings result = nil if result.isNil: - var classNameStr = godotObject.getClassNameRaw() result = newNimGodotObject[T]( - godotObject, classNameStr, + godotObject, cstring(godotObject.getClassName()), forceNativeObject or noRef) - deinit(classNameStr) proc newVariant*(obj: NimGodotObject): Variant {.inline.} = newVariant(obj.godotObject) @@ -332,35 +267,45 @@ 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 system.`of`(obj, T): + if obj of T: result = T(obj) - elif not obj.linkedObject.isNil and system.`of`(obj.linkedObject, T): + elif not obj.linkedObject.isNil and obj.linkedObject of T: result = T(obj.linkedObject) else: + when not defined(release): + printError("Failed to cast object to " & + T.name & "\n" & getStackTrace()) result = nil -proc `of`*[T1, T2: NimGodotObject](obj: T1, t: typedesc[T2]): bool {.inline.} = +proc `of`*[T: NimGodotObject](obj: NimGodotObject, + t: typedesc[T]): bool {.inline.} = ## Godot-specific inheritance check. - not obj.isNil and (system.`of`(obj, T2) or system.`of`(obj.linkedObject, T2)) + not obj.isNil and (system.`of`(obj, T) or system.`of`(obj.linkedObject, T)) proc newRStrLit(s: string): NimNode {.compileTime.} = result = newNimNode(nnkRStrLit) result.strVal = s -macro toGodotName(T: typedesc): untyped = +static: + import strutils + +macro toGodotName(T: typedesc): string = + var godotName: string if T is GodotString or T is string: - newStrLitNode"String" + godotName = "String" elif T is SomeFloat: - newStrLitNode"float" + godotName = "float" elif T is SomeUnsignedInt or T is SomeSignedInt: - newStrLitNode"int" - else: - let nameStr = ((T.getType()[1][1].strVal).split(':')[0]) - case nameStr: - of "File", "Directory", "Thread", "Mutex", "Semaphore": - newStrLitNode("_" & nameStr) - else: - newStrLitNode(nameStr) + godotName = "int" + if godotName.isNil or godotName.len == 0: + let nameStr = (($T.getType()[1][1].symbol).split(':')[0]) + godotName = case nameStr: + of "File", "Directory", "Thread", "Mutex", "Semaphore": + "_" & nameStr + else: + nameStr + + result = newLit(godotName) macro asCString(s: static[string]): cstring = result = newNimNode(nnkCallStrLit).add( @@ -419,18 +364,17 @@ proc newOwnObj[T: NimGodotObject](name: cstring): T = proc gdnew*[T: NimGodotObject](): T = ## Instantiates new object of type ``T``. - const godotName = toGodotName(T) - const cGodotName = asCString(godotName) - const objInfo = classRegistryStatic[fnv1Hash(godotName)] + const godotName = asCString(toGodotName(T)) + const objInfo = classRegistryStatic[godotName] when objInfo.isNative: - let godotObject = getClassConstructor(cGodotName)() + let godotObject = getClassConstructor(godotName)() new(result, nimGodotObjectFinalizer[T]) result.godotObject = godotObject when objInfo.isRef: godotObject.initRef() result.isRef = true else: - result = newOwnObj[T](cGodotName) + result = newOwnObj[T](godotName) proc newCallError*(err: VariantCallError): ref CallError = ## Instantiates ``CallError`` from Godot ``err``. @@ -470,17 +414,14 @@ proc setGodotObject*(nimObj: NimGodotObject, obj: ptr GodotObject) {.inline.} = proc setNativeObject*(nimObj: NimGodotObject, nativeObj: NimGodotObject) {.inline.} = ## Used from Godot constructor produced by ``gdobj`` macro. Do not call. - GC_ref(nativeObj) - nimObj.linkedObjectPtr = cast[pointer](nativeObj) - nativeObj.linkedObjectPtr = cast[pointer](nimObj) + nimObj.linkedObject = nativeObj + nativeObj.linkedObject = nimObj nativeObj.isNative = true proc removeGodotObject*(nimObj: NimGodotObject) {.inline.} = ## Used from Godot destructor produced by ``gdobj`` macro. Do not call. - GC_unref(nimObj.linkedObject) nimObj.godotObject = nil nimObj.linkedObject.godotObject = nil - nimObj.linkedObjectPtr = nil proc `==`*(self, other: NimGodotObject): bool {.inline.} = ## Compares objects by referential equality. @@ -612,11 +553,7 @@ proc fromVariant*[T: SomeSignedInt or SomeUnsignedInt]( else: uint64) intVal = when T is SomeSignedInt: val.asInt() else: val.asUint() - const highT = when T is SomeSignedInt: high(T).int64 - else: high(T).uint64 - const lowT = when T is SomeSignedInt: low(T).int64 - else: low(T).uint64 - if intVal > highT or intVal < lowT: + if intVal > high(T) or intVal < low(T): result = ConversionResult.RangeError else: self = T(intVal) @@ -720,10 +657,7 @@ proc fromVariant*(s: var string, val: Variant): ConversionResult = if val.getType() == VariantType.String: s = val.asString() elif val.getType() == VariantType.Nil: - when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - s = nil - else: - s = "" + s = nil else: result = ConversionResult.TypeError @@ -797,31 +731,10 @@ proc fromVariant*[T: array](s: var T, val: Variant): ConversionResult = else: result = ConversionResult.TypeError -proc godotTypeInfo*[T](OptT: typedesc[Option[T]]): GodotTypeInfo = - when compiles(godotTypeInfo(T)): - result.variantType = godotTypeInfo(T) - else: - result.variantType = VariantType.Nil - -proc toVariant*[T](option: Option[T]): Variant = - if option.isSome(): - result = toVariant(option.unsafeGet()) - else: - result = newVariant() - -proc fromVariant*[T](option: var Option[T], val: Variant): ConversionResult = - if val.getType() == VariantType.Nil: - option = none(T) - else: - var v: T - result = fromVariant(v, val) - if result == ConversionResult.OK: - option = some(result) - -proc godotTypeInfo*(T: typedesc[Table|TableRef|OrderedTable|OrderedTableRef]): GodotTypeInfo {.inline.} = +proc godotTypeInfo*(T: typedesc[Table|TableRef]): GodotTypeInfo {.inline.} = result.variantType = VariantType.Dictionary -proc toVariant*[T: Table or TableRef or OrderedTable or OrderedTableRef](t: T): Variant = +proc toVariant*[T: Table or TableRef](t: T): Variant = when t is ref: if t.isNil: return newVariant() @@ -831,7 +744,7 @@ proc toVariant*[T: Table or TableRef or OrderedTable or OrderedTableRef](t: T): dict[toVariant(k)] = toVariant(v) result = newVariant(dict) -proc fromVariant*[T: Table or TableRef or OrderedTable or OrderedTableRef](t: var T, +proc fromVariant*[T: Table or TableRef](t: var T, val: Variant): ConversionResult = if val.getType() == VariantType.Nil: when t is ref: @@ -841,12 +754,8 @@ proc fromVariant*[T: Table or TableRef or OrderedTable or OrderedTableRef](t: va mixin fromVariant when t is Table: t = initTable[type(t.keys()), type(t.values())]() - elif t is TableRef: - t = newTable[type(t.keys()), type(t.values())]() - elif t is OrderedTable: - t = initOrderedTable[type(t.keys()), type(t.values())]() else: - t = newOrderedTable[type(t.keys()), type(t.values())]() + t = newTable[type(t.keys()), type(t.values())]() for k, v in dict: var nimKey: type(t.keys()) var nimVal: type(t.values()) @@ -864,11 +773,10 @@ proc fromVariant*[T: Table or TableRef or OrderedTable or OrderedTableRef](t: va else: result = ConversionResult.TypeError -when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - {.emit: """/*TYPESECTION*/ - N_LIB_EXPORT N_CDECL(void, NimMain)(void); - N_NOINLINE(void, setStackBottom)(void* thestackbottom); - """.} +{.emit: """/*TYPESECTION*/ +N_LIB_EXPORT N_CDECL(void, NimMain)(void); +N_NOINLINE(void, setStackBottom)(void* thestackbottom); +""".} var nativeLibHandle: pointer proc getNativeLibHandle*(): pointer = @@ -881,16 +789,10 @@ proc godot_nativescript_init(handle: pointer) {. nativeLibHandle = handle var stackBottom {.volatile.}: pointer - stackBottom = addr(stackBottom) {.emit: """ NimMain(); + setStackBottom((void*)(&`stackBottom`)); """.} - when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - {.emit: """ - setStackBottom((void*)(&`stackBottom`)); - """.} - else: - nimGC_setStackBottom(stackBottom) GC_fullCollect() GC_disable() @@ -901,8 +803,7 @@ proc godot_gdnative_init(options: ptr GDNativeInitOptions) {. proc godot_gdnative_terminate(options: ptr GDNativeTerminateOptions) {. cdecl, exportc, dynlib.} = - if not options[].inEditor or not compileOption("threads"): - deallocHeap(runFinalizers = not options[].inEditor, allowGcAfterwards = false) + deallocHeap(runFinalizers = not options[].inEditor, allowGcAfterwards = false) const nimGcStepLengthUs {.intdefine.} = 2000 @@ -926,13 +827,9 @@ proc registerFrameCallback*(cb: proc () {.closure.}) = proc godot_nativescript_frame() {.cdecl, exportc, dynlib.} = var stackBottom {.volatile.}: pointer - stackBottom = addr(stackBottom) - when (NimMajor, NimMinor, NimPatch) < (0, 19, 0): - {.emit: """ - setStackBottom((void*)(&`stackBottom`)); - """.} - else: - nimGC_setStackBottom(stackBottom) + {.emit: """ + setStackBottom((void*)(&`stackBottom`)); + """.} for cb in idleCallbacks: cb() GC_step(nimGcStepLengthUs, true, 0) diff --git a/godot/nim/nim.cfg b/godot/nim/nim.cfg index add9a4d..f1fb6a7 100644 --- a/godot/nim/nim.cfg +++ b/godot/nim/nim.cfg @@ -1,2 +1 @@ ---path:"$projectdir/../" --d:useRealtimeGc \ No newline at end of file +--path:"$projectdir/../" \ No newline at end of file