From 31d84edc1ec360b22834a4b2d3ccaf72c0b006cb Mon Sep 17 00:00:00 2001
From: Gerd Heber <gheber@hdfgroup.org>
Date: Wed, 8 Jul 2015 17:14:33 -0500
Subject: [PATCH] Just discovered the D macro. It returns a dotted pair. That
 why CDR is in order. Backed out the earlier changes.

---
 package.lisp         |  1 +
 src/classes.lisp     |  2 +-
 src/delta.lisp       |  4 ++--
 test/delta-test.lisp | 10 +++++-----
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/package.lisp b/package.lisp
index 39e0f16..66ab63f 100644
--- a/package.lisp
+++ b/package.lisp
@@ -150,6 +150,7 @@
 	   CMBN-NON-ZERO-P
 	   CMBN-ZERO-P
 	   CMPR
+	   D
 	   DFFR
 	   GNRT
 	   I-SBTR
diff --git a/src/classes.lisp b/src/classes.lisp
index c2af340..5317d9c 100644
--- a/src/classes.lisp
+++ b/src/classes.lisp
@@ -399,7 +399,7 @@
   (the boolean
        (and (consp object)
 	    (eq :delt (car object))
-	    (typep (cadr object) 'dgop))))
+	    (typep (cdr object) 'dgop))))
 
 (DEFTYPE SOFT-DLOP () '(satisfies soft-dlop-p))
 
diff --git a/src/delta.lisp b/src/delta.lisp
index d8e4fd4..769a8b9 100644
--- a/src/delta.lisp
+++ b/src/delta.lisp
@@ -12,7 +12,7 @@
 
 
 (DEFUN SOFT-DELTA-CMPR (gmsm1 gmsm2)
-  (f-cmpr (cadr gmsm1) (cadr gmsm2)))
+  (f-cmpr (cdr gmsm1) (cdr gmsm2)))
 
 
 (DEFUN DELTA-FACE (indx dmns gmsm)
@@ -34,7 +34,7 @@
   (declare
    (fixnum indx dmns)
    (type soft-dlop gmsm))
-  (absm 0 (d (gmsm (delta-face indx dmns (cadr gmsm))))))
+  (absm 0 (d (gmsm (delta-face indx dmns (cdr gmsm))))))
 
 
 (DEFUN DELTA-BNDR (dmns gmsm)
diff --git a/test/delta-test.lisp b/test/delta-test.lisp
index 09965b4..284c477 100644
--- a/test/delta-test.lisp
+++ b/test/delta-test.lisp
@@ -4,7 +4,7 @@
 (in-suite :kenzo)
 
 (test soft-delta-cmpr
-      (is (equal :less (cat:soft-delta-cmpr '(d 12) '(d 23)))))
+      (is (equal :less (cat:soft-delta-cmpr (cat:d 12) (cat:d 23)))))
 
 (defun faces (i lst)
   (cat:dlop-int-ext
@@ -22,11 +22,11 @@
       (is (equal '(0 2 4) (faces 3 '(0 2 4 6))))
 
       (dotimes (i 4)
-	(print (cat:soft-delta-face i 3 `(:delt ,(cat:mask 4)))))
-      
+	(print (cat:soft-delta-face i 3 (cat:d (cat:mask 4)))))
+
       (dotimes (i 4)
-	(print (cat:soft-delta-face i 3 `(:delt
-					  ,(cat:dlop-ext-int '(0 2 4 6)))))))
+	(print (cat:soft-delta-face i 3 (cat:d
+					  (cat:dlop-ext-int '(0 2 4 6)))))))
 
 #|
 (test homology