More file and directory layout refactoring.

darcs-hash:9efff3ff2e22c9d8a85f8fcc7fa4487937ddd62f

1 files changed, 22 insertions, 22 deletions

diff --git a/Lisp/constant-data.lisp b/Lisp/constant-data.lisp
index 3d424f5..eebe3e9 100644
--- a/Lisp/constant-data.lisp
+++ b/Lisp/constant-data.lisp
@@ -1,28 +1,6 @@
 (in-package #:mulk.objective-cl)
 
 
-;;;; (@* "Constant accessors")
-(defun lisp-value->type-name (value)
-  (car (rassoc-if #'(lambda (type)
-                      (typep value type))
-                  *objcl-type-map*)))
-
-(defun type-name->lisp-type (type-name)
-  (cdr (assoc type-name *objcl-type-map*)))
-
-(defun type-name->slot-name (type-name)
-  (cdr (assoc type-name *objcl-data-map*)))
-
-(defun type-name->type-id (type-name)
-  (string (cdr (assoc type-name *objcl-api-type-names*))))
-
-(defun type-id->type-name (type-id)
-  (car (rassoc (char type-id 0) *objcl-api-type-names*)))
-
-(defun type-name->c-type (type-name)
-  (cdr (assoc type-name *objcl-c-type-map*)))
-
-
 ;;;; (@* "The constant data")
 ;;; Copied from objc-api.h
 ;;; Probably ought to be generated by C code at initialisation time.
@@ -121,3 +99,25 @@
     (bool     . :boolean)
     (ptr      . :pointer)
     (charptr  . :pointer)))
+
+
+;;;; (@* "Constant accessors")
+(defun lisp-value->type-name (value)
+  (car (rassoc-if #'(lambda (type)
+                      (typep value type))
+                  *objcl-type-map*)))
+
+(defun type-name->lisp-type (type-name)
+  (cdr (assoc type-name *objcl-type-map*)))
+
+(defun type-name->slot-name (type-name)
+  (cdr (assoc type-name *objcl-data-map*)))
+
+(defun type-name->type-id (type-name)
+  (string (cdr (assoc type-name *objcl-api-type-names*))))
+
+(defun type-id->type-name (type-id)
+  (car (rassoc (char type-id 0) *objcl-api-type-names*)))
+
+(defun type-name->c-type (type-name)
+  (cdr (assoc type-name *objcl-c-type-map*)))