aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authordos-reis <gdr@axiomatics.org>2010-02-09 17:38:08 +0000
committerdos-reis <gdr@axiomatics.org>2010-02-09 17:38:08 +0000
commit3540f95d7860250c3b48e44bc850ec0fb07d20ad (patch)
treef66e6766727dd216a80a4be4819da3edfaf58236 /src
parentd43aed3feda5c95f861ace2b76e9b693e9247f89 (diff)
downloadopen-axiom-3540f95d7860250c3b48e44bc850ec0fb07d20ad.tar.gz
* interp/vmlisp.lisp (NEQ): Remove.
* interp/clam.boot (lassocShift): Don't use it. (lassocShiftWithFunction): Likewise. (lassocShiftQ): Likewise.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog7
-rw-r--r--src/interp/clam.boot10
-rw-r--r--src/interp/vmlisp.lisp2
3 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 4e9721f3..61f2c020 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,12 @@
2010-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
+ * interp/vmlisp.lisp (NEQ): Remove.
+ * interp/clam.boot (lassocShift): Don't use it.
+ (lassocShiftWithFunction): Likewise.
+ (lassocShiftQ): Likewise.
+
+2010-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
+
* algebra/list.spad.pamphlet (IndexedList): Don't use NEQ.
2010-02-09 Gabriel Dos Reis <gdr@cs.tamu.edu>
diff --git a/src/interp/clam.boot b/src/interp/clam.boot
index 14f59535..56347798 100644
--- a/src/interp/clam.boot
+++ b/src/interp/clam.boot
@@ -1,6 +1,6 @@
-- Copyright (c) 1991-2002, The Numerical Algorithms Group Ltd.
-- All rights reserved.
--- Copyright (C) 2007-2009, Gabriel Dos Reis.
+-- Copyright (C) 2007-2010, Gabriel Dos Reis.
-- All rights reserved.
--
-- Redistribution and use in source and binary forms, with or without
@@ -626,7 +626,7 @@ lassocShift(x,l) ==
EQUAL(x,first QCAR y) => return (result := QCAR y)
y:= QCDR y
result =>
- if NEQ(y,l) then
+ if not EQ(y,l) then
QRPLACA(y,first l)
QRPLACA(l,result)
QCDR result
@@ -638,7 +638,7 @@ lassocShiftWithFunction(x,l,fn) ==
FUNCALL(fn,x,first QCAR y) => return (result := QCAR y)
y:= QCDR y
result =>
- if NEQ(y,l) then
+ if not EQ(y,l) then
QRPLACA(y,first l)
QRPLACA(l,result)
QCDR result
@@ -650,7 +650,7 @@ lassocShiftQ(x,l) ==
EQ(x,first first y) => return (result := first y)
y:= rest y
result =>
- if NEQ(y,l) then
+ if not EQ(y,l) then
RPLACA(y,first l)
RPLACA(l,result)
rest result
@@ -662,7 +662,7 @@ lassocShiftQ(x,l) ==
-- EQ(x,rest first y) => return (result := first y)
-- y:= rest y
-- result =>
--- if NEQ(y,l) then
+-- if not EQ(y,l) then
-- RPLACA(y,first l)
-- RPLACA(l,result)
-- first result
diff --git a/src/interp/vmlisp.lisp b/src/interp/vmlisp.lisp
index 8e327b97..ae8b1df3 100644
--- a/src/interp/vmlisp.lisp
+++ b/src/interp/vmlisp.lisp
@@ -227,8 +227,6 @@
(defmacro ne (a b) `(not (equal ,a ,b)))
-(defmacro neq (a b) `(not (eq ,a ,b)))
-
(defmacro nreverse0 (x)
(if (atom x)
`(if (atom ,x) ,x (nreverse ,x))