aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2007-08-17 17:03:34 +0000
committerdos-reis <gdr@axiomatics.org>2007-08-17 17:03:34 +0000
commit8e3c2cd706c32cbbfea90208cd232e4d64d1edc4 (patch)
treeb04cd8267bf612ec45a19d68fdf8aa597b7ed3eb /src
parentc2c4a61936d8e2b84339e8101bb96208a211630e (diff)
downloadopen-axiom-8e3c2cd706c32cbbfea90208cd232e4d64d1edc4.tar.gz
* ggreater.lisp.pamphlet (VGREATERP): Initialize I, L1 and L2
with appropriate values. (LEXVGREATERP): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/interp/ChangeLog6
-rw-r--r--src/interp/ggreater.lisp.pamphlet60
2 files changed, 36 insertions, 30 deletions
diff --git a/src/interp/ChangeLog b/src/interp/ChangeLog
index 0ae3bda8..8a3312a9 100644
--- a/src/interp/ChangeLog
+++ b/src/interp/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-17 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
+ * ggreater.lisp.pamphlet (VGREATERP): Initialize I, L1 and L2
+ with appropriate values.
+ (LEXVGREATERP): Likewise.
+
2007-08-16 Gabriel Dos Reis <gdr@cs.tamu.edu>
* vmlisp.lisp.pamphlet: Use ANSI eval-when situation syntax for
diff --git a/src/interp/ggreater.lisp.pamphlet b/src/interp/ggreater.lisp.pamphlet
index 7e41fa81..92e6f038 100644
--- a/src/interp/ggreater.lisp.pamphlet
+++ b/src/interp/ggreater.lisp.pamphlet
@@ -122,21 +122,21 @@
(DEFUN LEXVGREATERP (VECTOR-COMPERAND-1 VECTOR-COMPERAND-2)
(declare (simple-vector vector-comperand-1 vector-comperand-2))
- (PROG (L1 L2 I T1 T2)
- (declare (fixnum i l1 l2) )
- (SETQ I -1)
- (SETQ L1 (length VECTOR-COMPERAND-1))
- (SETQ L2 (length VECTOR-COMPERAND-2))
- LP (setq i (1+ i))
- (COND
- ((EQL L1 I) (RETURN NIL))
- ((EQL L2 I) (RETURN 'T)))
- (COND
- ((EQUAL
- (SETQ T1 (svref VECTOR-COMPERAND-1 I))
- (SETQ T2 (svref VECTOR-COMPERAND-2 I)))
- (GO LP)))
- (RETURN (LEXGREATERP T1 T2)) ) )
+ (let ((I -1)
+ (L1 (length VECTOR-COMPERAND-1))
+ (L2 (length VECTOR-COMPERAND-2)))
+ (declare (fixnum I L1 L2) )
+ (PROG (T1 T2)
+ LP
+ (setq I (1+ I))
+ (COND ((EQL L1 I)
+ (RETURN NIL))
+ ((EQL L2 I)
+ (RETURN 'T)))
+ (COND ((EQUAL (SETQ T1 (svref VECTOR-COMPERAND-1 I))
+ (SETQ T2 (svref VECTOR-COMPERAND-2 I)))
+ (GO LP)))
+ (RETURN (LEXGREATERP T1 T2)) ) ))
(DEFUN GGREATERP (COMPERAND-1 COMPERAND-2)
@@ -206,21 +206,21 @@
(DEFUN VGREATERP (VECTOR-COMPERAND-1 VECTOR-COMPERAND-2)
(declare (simple-vector vector-comperand-1 vector-comperand-2))
- (PROG (L1 L2 I T1 T2)
- (declare (fixnum i l1 l2) )
- (SETQ I -1)
- (SETQ L1 (length VECTOR-COMPERAND-1))
- (SETQ L2 (length VECTOR-COMPERAND-2))
- LP (setq i (1+ i))
- (COND
- ((EQL L1 I) (RETURN NIL))
- ((EQL L2 I) (RETURN 'T)))
- (COND
- ((EQUAL
- (SETQ T1 (svref VECTOR-COMPERAND-1 I))
- (SETQ T2 (svref VECTOR-COMPERAND-2 I)))
- (GO LP)))
- (RETURN (GGREATERP T1 T2)) ) )
+ (let ((I -1)
+ (L1 (length VECTOR-COMPERAND-1))
+ (L2 (length VECTOR-COMPERAND-2)))
+ (declare (fixnum I L1 L2))
+ (PROG (T1 T2)
+ LP
+ (setq I (1+ I))
+ (COND ((EQL L1 I)
+ (RETURN NIL))
+ ((EQL L2 I)
+ (RETURN 'T)))
+ (COND ((EQUAL (SETQ T1 (svref VECTOR-COMPERAND-1 I))
+ (SETQ T2 (svref VECTOR-COMPERAND-2 I)))
+ (GO LP)))
+ (RETURN (GGREATERP T1 T2)) ) ))
(defvar SORTGREATERP #'GGREATERP "default sorting predicate")