Mother-package

borodust · Dec 9, 2016 · 533b469 · 533b469
1 parent aa7346a
commit 533b469
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 11 deletions.
diff --git a/cl-bodge.asd b/cl-bodge.asd
@@ -283,4 +283,5 @@
   :license "MIT"
   :depends-on (cl-bodge/engine cl-bodge/utils cl-bodge/events cl-bodge/host
                                cl-bodge/graphics cl-bodge/audio cl-bodge/physics
-                               cl-bodge/resources cl-bodge/assets cl-bodge/scenegraph))
+                               cl-bodge/resources cl-bodge/assets cl-bodge/scenegraph)
+  :components ((:file "packages")))
diff --git a/engine/packages.lisp b/engine/packages.lisp
@@ -101,8 +101,7 @@
 
   (defpackage :cl-bodge.engine
     (:nicknames :ge.ng)
-    (:use :cl-bodge.utils :cl-bodge.concurrency :cl-bodge.memory :cl-bodge.math
-          :cl :bordeaux-threads :cl-muth)
+    (:use :cl-bodge.utils :cl :bordeaux-threads :cl-muth)
     (:export system
              enable
              disable

diff --git a/packages.lisp b/packages.lisp
@@ -0,0 +1,18 @@
+(in-package :cl-bodge.asdf)
+
+
+
+(ge.util:reexporting (:cl-bodge.animation
+                      :cl-bodge.assets
+                      :cl-bodge.audio
+                      :cl-bodge.audio.resources
+                      :cl-bodge.engine
+                      :cl-bodge.event
+                      :cl-bodge.graphics
+                      :cl-bodge.graphics.resources
+                      :cl-bodge.host
+                      :cl-bodge.physics
+                      :cl-bodge.resources
+                      :cl-bodge.scene) :cl-bodge
+  (defpackage :cl-bodge
+    (:nicknames :ge)))
diff --git a/utils/utils.lisp b/utils/utils.lisp
@@ -213,11 +213,20 @@
 (defmacro reexporting ((&rest from-packages) into-package &body body)
   (with-gensyms (p sym fn)
     `(eval-when (:compile-toplevel :load-toplevel :execute)
-       (flet ((for-each-exported-symbol (,fn)
-                (dolist (,p ',from-packages)
-                  (loop for ,sym being the external-symbol in ,p do
-                       (funcall ,fn ,sym ,into-package)))))
-       (when (find-package ,into-package)
-         (for-each-exported-symbol #'unexport))
-       ,@body
-       (for-each-exported-symbol #'export)))))
+       (labels ((accessiblep (,sym)
+                  (find-symbol (symbol-name ,sym) ,into-package))
+                (unexport-if-accessible (,sym)
+                  (when (accessiblep ,sym)
+                    (unexport ,sym ,into-package)))
+                (import-export (,sym)
+                  (unless (accessiblep ,sym)
+                    (import ,sym ,into-package))
+                  (export ,sym ,into-package))
+                (for-each-exported-symbol (,fn)
+                  (dolist (,p ',from-packages)
+                    (loop for ,sym being the external-symbol in ,p do
+                         (funcall ,fn ,sym)))))
+         (when (find-package ,into-package)
+           (for-each-exported-symbol #'unexport-if-accessible))
+         ,@body
+         (for-each-exported-symbol #'import-export)))))