2001-03-01 22:00:00 ShengHuo ZHU <zsh@cs.rochester.edu>

	From Katsumi Yamaoka <yamaoka@jpl.org>.

	* dgnushack.el (coerce, merge, subseq): defmacro.

2001-03-01 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>

	* lpath.el (nndraft-request-group): Move it here from nndraft.el.
	A fake defalias in nndraft.el results a not-activated bug in
	uncompiled versions.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index c95f212..b3fb3ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2001-03-01 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+       From Katsumi Yamaoka <yamaoka@jpl.org>.
+       
+       * dgnushack.el (coerce, merge, subseq): defmacro.
+       
+2001-03-01 22:00:00  ShengHuo ZHU  <zsh@cs.rochester.edu>
+
+       * lpath.el (nndraft-request-group): Move it here from nndraft.el.
+       A fake defalias in nndraft.el results a not-activated bug in
+       uncompiled versions.
+
 2001-02-26 11:27:27  Paul Jarc  <prj@po.cwru.edu>
        Committed by ShengHuo ZHU  <zsh@cs.rochester.edu>
 

diff --git a/lisp/dgnushack.el b/lisp/dgnushack.el
index bc59422..27860ec 100644 (file)
--- a/lisp/dgnushack.el
+++ b/lisp/dgnushack.el
@@ -70,6 +70,93 @@
           (while (consp (cdr x))
             (pop x))
           x))))
+
+  (define-compiler-macro coerce (&whole form x type)
+    (if (and (fboundp 'coerce)
+            (subrp (symbol-function 'coerce)))
+       form
+      `(let ((x ,x)
+            (type ,type))
+        (cond ((eq type 'list) (if (listp x) x (append x nil)))
+              ((eq type 'vector) (if (vectorp x) x (vconcat x)))
+              ((eq type 'string) (if (stringp x) x (concat x)))
+              ((eq type 'array) (if (arrayp x) x (vconcat x)))
+              ((and (eq type 'character) (stringp x) (= (length x) 1))
+               (aref x 0))
+              ((and (eq type 'character) (symbolp x)
+                    (= (length (symbol-name x)) 1))
+               (aref (symbol-name x) 0))
+              ((eq type 'float) (float x))
+              ((typep x type) x)
+              (t (error "Can't coerce %s to type %s" x type))))))
+
+  (define-compiler-macro merge (&whole form type seq1 seq2 pred &rest keys)
+    (if (and (fboundp 'merge)
+            (subrp (symbol-function 'merge)))
+       form
+      `(let ((type ,type)
+            (seq1 ,seq1)
+            (seq2 ,seq2)
+            (pred ,pred))
+        (or (listp seq1) (setq seq1 (append seq1 nil)))
+        (or (listp seq2) (setq seq2 (append seq2 nil)))
+        (let ((res nil))
+          (while (and seq1 seq2)
+            (if (funcall pred (car seq2) (car seq1))
+                (push (pop seq2) res)
+              (push (pop seq1) res)))
+          (coerce (nconc (nreverse res) seq1 seq2) type)))))
+
+  (define-compiler-macro subseq (&whole form seq start &optional end)
+    (if (and (fboundp 'subseq)
+            (subrp (symbol-function 'subseq)))
+       form
+      (if end
+         `(let ((seq ,seq)
+                (start ,start)
+                (end ,end))
+            (if (stringp seq)
+                (substring seq start end)
+              (let (len)
+                (if (< end 0)
+                    (setq end (+ end (setq len (length seq)))))
+                (if (< start 0)
+                    (setq start (+ start (or len (setq len (length seq))))))
+                (cond ((listp seq)
+                       (if (> start 0)
+                           (setq seq (nthcdr start seq)))
+                       (let ((res nil))
+                         (while (>= (setq end (1- end)) start)
+                           (push (pop seq) res))
+                         (nreverse res)))
+                      (t
+                       (let ((res (make-vector (max (- end start) 0) nil))
+                             (i 0))
+                         (while (< start end)
+                           (aset res i (aref seq start))
+                           (setq i (1+ i)
+                                 start (1+ start)))
+                         res))))))
+       `(let ((seq ,seq)
+              (start ,start))
+          (if (stringp seq)
+              (substring seq start)
+            (let (len)
+              (if (< start 0)
+                  (setq start (+ start (or len (setq len (length seq))))))
+              (cond ((listp seq)
+                     (if (> start 0)
+                         (setq seq (nthcdr start seq)))
+                     (copy-sequence seq))
+                    (t
+                     (let* ((end (or len (length seq)))
+                            (res (make-vector (max (- end start) 0) nil))
+                            (i 0))
+                       (while (< start end)
+                         (aset res i (aref seq start))
+                         (setq i (1+ i)
+                               start (1+ start)))
+                       res)))))))))
   )
 
 ;; If we are building w3 in a different directory than the source

diff --git a/lisp/lpath.el b/lisp/lpath.el
index 867de91..aa47b9f 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -103,4 +103,7 @@
 (defun nnkiboze-score-file (a)
 )
 
+;; This is just to shut up the byte-compiler.
+(defalias 'nndraft-request-group 'ignore)
+
 (provide 'lpath)

diff --git a/lisp/nndraft.el b/lisp/nndraft.el
index c76d84c..861a122 100644 (file)
--- a/lisp/nndraft.el
+++ b/lisp/nndraft.el
@@ -33,9 +33,7 @@
 (require 'nnoo)
 (require 'mm-util)
 (eval-when-compile
-  (require 'cl)
-  ;; This is just to shut up the byte-compiler.
-  (defalias 'nndraft-request-group 'ignore))
+  (require 'cl))
 
 (nnoo-declare nndraft
   nnmh)