Move define-enumeration into util module.

2 files changed, 42 insertions, 16 deletions

diff --git a/2d/wrappers/freeimage.scm b/2d/wrappers/freeimage.scm
index ab037d4..3192dbb 100644
--- a/2d/wrappers/freeimage.scm
+++ b/2d/wrappers/freeimage.scm
@@ -22,7 +22,8 @@
 ;;; Code:
 
 (define-module (2d wrappers freeimage)
-  #:use-module (system foreign))
+  #:use-module (system foreign)
+  #:use-module (2d wrappers util))
 
 (define libfreeimage (dynamic-link "libfreeimage"))
 
@@ -30,21 +31,6 @@
   (define name
     (pointer->procedure ret (dynamic-func string-name libfreeimage) args)))
 
-;; Borrowed from guile-figl
-(define-syntax-rule (define-enumeration enumerator (name value) ...)
-  (define-syntax enumerator
-    (lambda (x)
-      (syntax-case x ()
-        ((_)
-         #''(name ...))
-        ((_ enum) (number? (syntax->datum #'enum))
-         #'enum)
-        ((_ enum)
-         (or (assq-ref '((name . value) ...)
-                       (syntax->datum #'enum))
-             (syntax-violation 'enumerator "invalid enumerated value"
-                               #'enum)))))))
-
 (define (number->boolean n)
   (not (zero? n)))
 
diff --git a/2d/wrappers/util.scm b/2d/wrappers/util.scm
new file mode 100644
index 0000000..267cbf5
--- /dev/null
+++ b/2d/wrappers/util.scm
@@ -0,0 +1,40 @@
+;;; guile-2d
+;;; Copyright (C) 2013 David Thompson <dthompson2@worcester.edu>
+;;;
+;;; Guile-2d is free software: you can redistribute it and/or modify it
+;;; under the terms of the GNU Lesser General Public License as
+;;; published by the Free Software Foundation, either version 3 of the
+;;; License, or (at your option) any later version.
+;;;
+;;; Guile-2d is distributed in the hope that it will be useful, but
+;;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;;; Lesser General Public License for more details.
+;;;
+;;; You should have received a copy of the GNU Lesser General Public
+;;; License along with this program.  If not, see
+;;; <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+;; Wrapper helper procedures.
+;;
+;;; Code:
+
+(define-module (2d wrappers util)
+  #:export (define-enumeration))
+
+;; Borrowed from guile-figl
+(define-syntax-rule (define-enumeration enumerator (name value) ...)
+  (define-syntax enumerator
+    (lambda (x)
+      (syntax-case x ()
+        ((_)
+         #''(name ...))
+        ((_ enum) (number? (syntax->datum #'enum))
+         #'enum)
+        ((_ enum)
+         (or (assq-ref '((name . value) ...)
+                       (syntax->datum #'enum))
+             (syntax-violation 'enumerator "invalid enumerated value"
+                               #'enum)))))))