Do macro requirements properly

harto · Apr 4, 2013 · 7ec8fa7 · 7ec8fa7
1 parent 8ed792e
commit 7ec8fa7
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 51 deletions.
diff --git a/common/src/cljx/enoki/asset.cljx b/common/src/cljx/enoki/asset.cljx
@@ -2,12 +2,12 @@
 
 ^:clj (ns enoki.asset
         (:require [enoki.asset-impl :as impl]
-                  [enoki.macro-requirements])
+                  [enoki.error])
         (:use [enoki.error-macros :only [signal-error]]))
 
 ^:cljs (ns enoki.asset
          (:require [enoki.asset-impl :as impl]
-                   [enoki.macro-requirements])
+                   [enoki.error])
          (:use-macros [enoki.error-macros :only [signal-error]]))
 
 ;; ## Loading

diff --git a/common/src/cljx/enoki/engine.cljx b/common/src/cljx/enoki/engine.cljx
@@ -4,16 +4,16 @@
         (:require [enoki.event :as e]
                   [enoki.graphics :as g]
                   [enoki.keyboard :as kbd]
-                  [enoki.logging-macros :as log]
-                  [enoki.macro-requirements])
+                  [enoki.logging]
+                  [enoki.logging-macros :as log])
         (:use [enoki.core :only [now]]))
 
 ^:cljs (ns enoki.engine
          (:require [goog.Timer :as timer]
                    [enoki.event :as e]
                    [enoki.graphics :as g]
                    [enoki.keyboard :as kbd]
-                   [enoki.macro-requirements])
+                   [enoki.logging])
          (:require-macros [enoki.logging-macros :as log])
          (:use [enoki.core :only [now]]))
 

diff --git a/common/src/cljx/enoki/error.cljx b/common/src/cljx/enoki/error.cljx
@@ -1,4 +1,5 @@
-(ns enoki.error)
+(ns enoki.error
+  (:require [enoki.logging]))
 
 ^:clj (defn error
         ([message]

diff --git a/common/src/cljx/enoki/macro_requirements.cljx b/common/src/cljx/enoki/macro_requirements.cljx
diff --git a/example/common/src/cljx/game/component.cljx b/example/common/src/cljx/game/component.cljx
@@ -1,11 +1,9 @@
 ;; Game-specific components
 
 ^:clj (ns game.component
-        (:require [enoki.macro-requirements])
         (:use [enoki.component-macros :only [defcomponent]]))
 
 ^:cljs (ns game.component
-         (:require [enoki.macro-requirements])
          (:use-macros [enoki.component-macros :only [defcomponent]]))
 
 (defcomponent position [x y]

diff --git a/example/common/src/cljx/game/main.cljx b/example/common/src/cljx/game/main.cljx
@@ -5,8 +5,8 @@
                   [enoki.entity :as entity]
                   [enoki.event :as event]
                   [enoki.graphics :as gfx]
+                  [enoki.logging]
                   [enoki.logging-macros :as log]
-                  [enoki.macro-requirements]
                   [game.component :as comp])
         (:use [enoki.core :only [now]]))
 
@@ -17,7 +17,7 @@
                    [enoki.entity :as entity]
                    [enoki.event :as event]
                    [enoki.graphics :as gfx]
-                   [enoki.macro-requirements]
+                   [enoki.logging]
                    [game.component :as comp])
          (:require-macros [enoki.logging-macros :as log])
          (:use [enoki.core :only [now]])

diff --git a/swing/src/enoki/graphics/java2d.clj b/swing/src/enoki/graphics/java2d.clj
@@ -5,9 +5,10 @@
 
 (ns enoki.graphics.java2d
   (:require [seesaw.core :as seesaw]
+            [enoki.error]
             [enoki.event :as event]
-            [enoki.logging-macros :as log]
-            [enoki.macro-requirements])
+            [enoki.logging]
+            [enoki.logging-macros :as log])
   (:use [enoki.error-macros :only [signal-error]]
         [enoki.graphics])
   (:import [java.awt Canvas Color Dimension Image]))

diff --git a/swing/src/enoki/swing.clj b/swing/src/enoki/swing.clj
@@ -3,8 +3,8 @@
             [seesaw.core :as seesaw]
             [enoki.graphics.java2d :as gfx]
             [enoki.keyboard :as kbd]
-            [enoki.logging-macros :as log]
-            [enoki.macro-requirements])
+            [enoki.logging]
+            [enoki.logging-macros :as log])
   (:import [java.awt.event KeyEvent]))
 
 (def ^:private key-names

diff --git a/web/src/cljs/enoki/graphics/canvas.cljs b/web/src/cljs/enoki/graphics/canvas.cljs
@@ -1,7 +1,7 @@
 ;; An HTML5 `<canvas>`-based graphics implementation.
 
 (ns enoki.graphics.canvas
-  (:require [enoki.macro-requirements])
+  (:require [enoki.error])
   (:use [enoki.graphics :only [Context Display display-width display-height]])
   (:use-macros [enoki.error-macros :only [signal-error]]))
 

diff --git a/web/src/cljs/enoki/web.cljs b/web/src/cljs/enoki/web.cljs
@@ -2,8 +2,7 @@
   (:require [clojure.browser.repl :as repl]
             [enoki.graphics.canvas :as gfx]
             [enoki.keyboard :as kbd]
-            [enoki.logging :as logging]
-            [enoki.macro-requirements])
+            [enoki.logging :as logging])
   (:require-macros [enoki.logging-macros :as log]))
 
 (def key-names