add thi.ng/xerror dependency (in lieu of thi.ng.common.error ns), update

all refs
thi-ng · Oct 2, 2015 · 976bb4e · 976bb4e
1 parent 15cf3d1
commit 976bb4e
Show file tree

Hide file tree

Showing 29 changed files with 40 additions and 26 deletions.
diff --git a/geom-core/src/index.org b/geom-core/src/index.org
@@ -78,7 +78,7 @@ target/geom-core-<<conf-version()>>.js
 
     :dependencies [<<dep-clj>>
                    <<dep-cljs>>
-                   <<dep-common>>
+                   <<dep-xerror>>
                    <<dep-math>>
                    <<dep-dstruct>>]
 

diff --git a/geom-core/src/matrix.org b/geom-core/src/matrix.org
@@ -1038,7 +1038,7 @@ https://github.com/stefanmirea/view-frustum-culling/blob/master/lab_camera.hpp#L
      [thi.ng.geom.core.utils :as gu]
      [thi.ng.geom.core.vector :as v :refer [vec2 vec3 V3 V3X]]
      [thi.ng.math.core :as m :refer [*eps* PI TWO_PI]]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      #?@(:clj
          [[thi.ng.math.macros :as mm]
           [thi.ng.geom.core.macros.matrix :as gmc]]))

diff --git a/geom-core/src/quaternion.org b/geom-core/src/quaternion.org
@@ -758,7 +758,7 @@ of the code.
      [thi.ng.geom.core :as g]
      [thi.ng.geom.core.vector :as v :refer [vec2 vec3 V3X V3Y V3Z]]
      [thi.ng.geom.core.matrix :as mat]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [*eps* PI TWO_PI]]
      #?(:clj [thi.ng.math.macros :as mm]))
     #?(:clj

diff --git a/geom-core/src/vector.org b/geom-core/src/vector.org
@@ -2163,7 +2163,7 @@
     (:require
      [thi.ng.geom.core :as g]
      [thi.ng.math.core :as m :refer [*eps* PI TWO_PI INF- INF+]]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      #?@(:clj
          [[thi.ng.geom.core.macros.vector :as vm :refer [defswizzle]]
           [thi.ng.math.macros :as mm]
@@ -2187,7 +2187,7 @@
     (:require
      [clojure.walk :refer :all]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]))
+     [thi.ng.xerror.core :as err]))
 
   <<swizzle-macros>>
 

diff --git a/geom-meshops/src/index.org b/geom-meshops/src/index.org
@@ -62,7 +62,8 @@ target/geom-meshops-<<conf-version()>>.js
     :dependencies [<<dep-clj>>
                    <<dep-cljs>>
                    [thi.ng/geom-core "<<conf-version()>>"]
-                   [thi.ng/geom-types "<<conf-version()>>"]]
+                   [thi.ng/geom-types "<<conf-version()>>"]
+                   <<dep-xerror>>]
 
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>

diff --git a/geom-meshops/src/subdivision.org b/geom-meshops/src/subdivision.org
@@ -246,7 +246,7 @@ you're not sure your mesh contains only triangles, pass it through
      [thi.ng.geom.gmesh :as gm]
      [thi.ng.geom.triangle :as t]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [clojure.core.reducers :as r]))
 
   <<helpers>>

diff --git a/geom-physics/src/index.org b/geom-physics/src/index.org
@@ -57,7 +57,8 @@ target/geom-physics-<<conf-version()>>.js
     :dependencies [<<dep-clj>>
                    <<dep-cljs>>
                    [thi.ng/geom-core "<<conf-version()>>"]
-                   [thi.ng/geom-types "<<conf-version()>>"]]
+                   [thi.ng/geom-types "<<conf-version()>>"]
+                   <<dep-xerror>>]
 
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>

diff --git a/geom-physics/test/core.org b/geom-physics/test/core.org
@@ -24,7 +24,7 @@
      [thi.ng.geom.core :as g]
      [thi.ng.geom.core.vector :refer [vec2 vec3]]
      [thi.ng.geom.physics.core :as ph]
-     [thi.ng.common.math.core :as m]
+     [thi.ng.math.core :as m]
      #?(:clj
         [clojure.test :refer :all]
         :cljs

diff --git a/geom-svg/src/index.org b/geom-svg/src/index.org
@@ -72,6 +72,7 @@ target/geom-svg-<<conf-version()>>.js
                    [thi.ng/geom-meshops "<<conf-version()>>"]
                    <<dep-strf>>
                    <<dep-color>>
+                   <<dep-xerror>>
                    <<dep-hiccup>>]
 
     :profiles     {:dev {:dependencies [<<dep-criterium>>]

diff --git a/geom-types/src/aabb.org b/geom-types/src/aabb.org
@@ -415,7 +415,7 @@ of the original with inner sorting over XYZ.
      [thi.ng.geom.types]
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [*eps*]]
      #?(:clj [thi.ng.math.macros :as mm])))
 

diff --git a/geom-types/src/basicmesh.org b/geom-types/src/basicmesh.org
@@ -230,7 +230,7 @@
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
      [thi.ng.math.core :as m :refer [*eps*]]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [clojure.core.reducers :as r]))
 
   (declare basic-mesh)

diff --git a/geom-types/src/circle.org b/geom-types/src/circle.org
@@ -284,7 +284,7 @@ results, the =transform= implementation returns a [[file:polygon.org][polygon]].
      [thi.ng.geom.basicmesh :as bm]
      [thi.ng.geom.types :as types]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [PI TWO_PI *eps*]])
     #?(:clj
        (:import

diff --git a/geom-types/src/cuboid.org b/geom-types/src/cuboid.org
@@ -354,7 +354,7 @@ from the first vertex of the original with inner sorting over XYZ.
      [thi.ng.geom.types]
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [*eps*]]
      #?(:clj [thi.ng.math.macros :as mm]))
     #?(:clj

diff --git a/geom-types/src/index.org b/geom-types/src/index.org
@@ -120,7 +120,8 @@ target/geom-types-<<conf-version()>>.js
 
     :dependencies [<<dep-clj>>
                    <<dep-cljs>>
-                   [thi.ng/geom-core "<<conf-version()>>"]]
+                   [thi.ng/geom-core "<<conf-version()>>"]
+                   <<dep-xerror>>]
 
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>

diff --git a/geom-types/src/path.org b/geom-types/src/path.org
@@ -225,7 +225,7 @@
      [thi.ng.geom.core.vector :as v :refer [vec2]]
      [thi.ng.geom.core.utils :as gu]
      [thi.ng.geom.bezier :as b]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      #?(:clj [clojure.xml :as xml]))
     #?(:clj (:import [thi.ng.geom.types Line2 Path2])))
 

diff --git a/geom-types/src/plane.org b/geom-types/src/plane.org
@@ -203,7 +203,7 @@
      [thi.ng.geom.basicmesh :as bm]
      [thi.ng.geom.types :as types]
      [thi.ng.geom.types.utils :as tu]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [*eps* INF+]]
      #?(:clj [thi.ng.math.macros :as mm])))
 

diff --git a/geom-types/src/quad.org b/geom-types/src/quad.org
@@ -367,7 +367,7 @@ function returns a lazyseq of triangles of the subdivided quad.
      [thi.ng.geom.types :as types]
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [*eps*]])
     #?(:clj
        (:import

diff --git a/geom-types/src/rect.org b/geom-types/src/rect.org
@@ -430,7 +430,7 @@ of triangles of the subdivided rects.
      [thi.ng.geom.types :as types]
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [*eps*]]
      #?(:clj [thi.ng.math.macros :as mm]))
     #?(:clj

diff --git a/geom-types/src/sphere.org b/geom-types/src/sphere.org
@@ -258,7 +258,7 @@ If there's no intersection, the function returns =nil=.
      [thi.ng.geom.core.intersect :as isec]
      [thi.ng.geom.basicmesh :as bm]
      [thi.ng.geom.types :as types]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [TWO_PI PI *eps*]]
      #?(:clj [thi.ng.math.macros :as mm]))
     #?(:clj

diff --git a/geom-types/src/tetrahedron.org b/geom-types/src/tetrahedron.org
@@ -238,7 +238,7 @@
      [thi.ng.geom.types]
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      [thi.ng.math.core :as m :refer [PI HALF_PI THIRD SQRT3 *eps*]]
      #?(:clj [thi.ng.math.macros :as mm])))
 

diff --git a/geom-types/src/triangle.org b/geom-types/src/triangle.org
@@ -505,7 +505,7 @@ https://web.archive.org/web/20090320013931/http://amp.ece.cmu.edu/Publication/Ch
      [thi.ng.geom.types.utils :as tu]
      [thi.ng.dstruct.core :as d]
      [thi.ng.math.core :as m :refer [PI HALF_PI THIRD SQRT3 *eps*]]
-     [thi.ng.common.error :as err]
+     [thi.ng.xerror.core :as err]
      #?(:clj [thi.ng.math.macros :as mm]))
     #?(:clj
        (:import

diff --git a/geom-viz/src/index.org b/geom-viz/src/index.org
@@ -88,6 +88,7 @@ target/geom-viz-<<conf-version()>>.js
                    [thi.ng/geom-svg "<<conf-version()>>"]
                    <<dep-ndarray>>
                    <<dep-strf>>
+                   <<dep-xerror>>
                    <<dep-color>>]
 
     :profiles     {:dev {:dependencies [<<dep-criterium>>]

diff --git a/geom-voxel/src/index.org b/geom-voxel/src/index.org
@@ -59,7 +59,8 @@ target/geom-voxel-<<conf-version()>>.js
                    <<dep-cljs>>
                    [thi.ng/geom-core "<<conf-version()>>"]
                    [thi.ng/geom-types "<<conf-version()>>"]
-                   [thi.ng/geom-meshops "<<conf-version()>>"]]
+                   [thi.ng/geom-meshops "<<conf-version()>>"]
+                   <<dep-xerror>>]
 
     :profiles     {:dev {:dependencies [<<dep-criterium>>]
                          :plugins      [<<dep-cljsbuild>>

diff --git a/geom-webgl/src/buffers.org b/geom-webgl/src/buffers.org
@@ -208,7 +208,7 @@
      [thi.ng.typedarrays.core :as arrays]
      [thi.ng.geom.webgl.core :as gl]
      [thi.ng.geom.webgl.shaders :as sh]
-     [thi.ng.common.error :as err]))
+     [thi.ng.xerror.core :as err]))
 
   (declare check-fbo)
 

diff --git a/geom-webgl/src/core.org b/geom-webgl/src/core.org
@@ -827,7 +827,7 @@ using the protocol.
      [thi.ng.geom.types]
      [thi.ng.geom.gmesh :as gm]
      [thi.ng.geom.rect :as r]
-     [thi.ng.common.error :as err]))
+     [thi.ng.xerror.core :as err]))
 
   (declare into-buffer-vec3)
 

diff --git a/geom-webgl/src/index.org b/geom-webgl/src/index.org
@@ -80,6 +80,7 @@ target/geom-webgl-<<conf-version()>>.js
                    <<dep-arrays>>
                    <<dep-color>>
                    <<dep-shadergraph>>
+                   <<dep-xerror>>
                    <<dep-cljs-log>>]
 
     :profiles {:dev {:dependencies [<<dep-criterium>>]

diff --git a/geom-webgl/src/shaders.org b/geom-webgl/src/shaders.org
@@ -351,7 +351,7 @@ Currently the following options are supported:
     [thi.ng.geom.webgl.utils :as glu]
     [thi.ng.typedarrays.core :as arrays]
     [thi.ng.color.core :as col]
-    [thi.ng.common.error :as err]
+    [thi.ng.xerror.core :as err]
     [clojure.string :as str]))
 
   <<uniforms>>

diff --git a/geom-webgl/src/utils.org b/geom-webgl/src/utils.org
@@ -38,7 +38,7 @@
 (ns thi.ng.geom.webgl.utils
   (:require
     [thi.ng.typedarrays.core :as arrays]
-    [thi.ng.common.error :as err])
+    [thi.ng.xerror.core :as err])
   (:require-macros
     [thi.ng.math.macros :as mm]))
 

diff --git a/src/config.org b/src/config.org
@@ -80,12 +80,19 @@ target/test-classes
 #+BEGIN_SRC clojure
 [thi.ng/typedarrays "0.1.2"]
 #+END_SRC
+
 **** [[https://github.com/thi-ng/ndarray/][thi.ng/ndarray]]
 #+NAME: dep-ndarray
 #+BEGIN_SRC clojure
 [thi.ng/ndarray "0.3.0"]
 #+END_SRC
 
+**** [[https://github.com/thi-ng/xerror/][thi.ng/xerror]]
+#+NAME: dep-xerror
+#+BEGIN_SRC clojure
+[thi.ng/xerror "0.1.0"]
+#+END_SRC
+
 *** Development
 **** [[https://github.com/emezeske/lein-cljsbuild][Cljsbuild]]
 #+NAME: dep-cljsbuild