Put internal types in their modules

godot/internal/godotarrays.nim

@@ -1,7 +1,11 @@
 # Copyright (c) 2017 Xored Software, Inc.
 
+type
+  GodotArray* {.byref.} = object
+    p: pointer
+
 import hashes
-import godotinternaltypes, godotpoolarrays, godotvariants, godotstrings
+import godotobjects, godotpoolarrays, godotvariants, godotstrings
 
 proc initGodotArray*(dest: var GodotArray) {.
     importc: "godot_array_new".}

godot/internal/godotdictionaries.nim

@@ -4,7 +4,7 @@ type
   GodotDictionary* {.byref.} = object
     p: pointer
 
-import godotinternaltypes, godotarrays, godotvariants, godotstrings
+import godotarrays, godotvariants, godotstrings
 
 proc initGodotDictionary*(dest: var GodotDictionary; src: GodotDictionary) {.
     importc: "godot_dictionary_new_copy".}

godot/internal/godotinternaltypes.nim

@@ -1,8 +0,0 @@
-# Copyright 2017 Xored Software, Inc.
-
-type
-  GodotObject* = object
-  GodotArray* {.byref.} = object
-    p: pointer
-  GodotVariant* {.byref.} = object
-    data: array[24, byte]

godot/internal/godotobjects.nim

@@ -0,0 +1,4 @@
+# Copyright 2017 Xored Software, Inc.
+
+type
+  GodotObject* = object

godot/internal/godotpoolarrays.nim

@@ -1,10 +1,5 @@
 # Copyright (c) 2017 Xored Software, Inc.
 
-
-import godotinternaltypes, godotstrings
-import core.godotbase, core.colors,
-       core.vector2, core.vector3
-
 type
   GodotPoolByteArray* {.byref.} = object
     p: pointer
@@ -21,6 +16,9 @@ type
   GodotPoolColorArray* {.byref.} = object
     p: pointer
 
+import godotstrings, godotarrays
+import core / [godotbase, colors, vector2, vector3]
+
 # byte
 
 proc initGodotPoolByteArray*(dest: var GodotPoolByteArray) {.

godot/internal/godotvariants.nim

@@ -45,8 +45,11 @@ type
     argument*: cint
     expected*: VariantType
 
-import godotinternaltypes, godotpoolarrays, godotstrings, godotnodepaths,
-       godotdictionaries
+  GodotVariant* {.byref.} = object
+    data: array[24, byte]
+
+import godotobjects, godotarrays, godotpoolarrays,
+       godotstrings, godotnodepaths, godotdictionaries
 
 import core.vector2, core.rect2,
        core.vector3, core.transform2d, core.planes,