diff options
| author | dos-reis <gdr@axiomatics.org> | 2010-12-19 16:04:55 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2010-12-19 16:04:55 +0000 |
| commit | 0baf7a71d80fc15fdab5caa551b7e00800dccbef (patch) | |
| tree | 859d6581ba133d0123a27d7e82f0c64b5aea46bc /src/interp/union.lisp | |
| parent | ba495f17f8e3a8b780f038fd6f2d5877ccc2476e (diff) | |
| download | open-axiom-0baf7a71d80fc15fdab5caa551b7e00800dccbef.tar.gz | |
* interp/vmlisp.lisp (VECP): Remove.
(REFVECP): Likewise.
(CVECP): Likewise.
(QMEMQ): Likewise.
* interp/bootlex.lisp (TRANSLABEL1): Adjust.
* interp/br-search.boot: Likewise.
* interp/br-util.boot: Likewise.
* interp/c-doc.boot: Likewise.
* interp/category.boot: Likewise.
* interp/database.boot: Likewise.
* interp/debug.lisp: Likewise.
* interp/format.boot: Likewise.
* interp/functor.boot: Likewise.
* interp/g-cndata.boot: Likewise.
* interp/g-util.boot: Likewise.
* interp/ggreater.lisp: Likewise.
* interp/guess.boot: Likewise.
* interp/i-coerfn.boot: Likewise.
* interp/i-map.boot: Likewise.
* interp/i-output.boot: Likewise.
* interp/i-resolv.boot: Likewise.
* interp/i-spec2.boot: Likewise.
* interp/i-syscmd.boot: Likewise.
* interp/interop.boot: Likewise.
* interp/i-util.boot: Likewise.
* interp/union.lisp: Likewise.
* interp/trace.boot: Likewise.
* interp/pspad2.boot: Likewise.
* interp/pathname.boot: Likewise.
* interp/nrunopt.boot: Likewise.
* interp/nrunfast.boot: Likewise.
* interp/nruncomp.boot: Likewise.
* interp/newfort.boot: Likewise.
* interp/msgdb.boot: Likewise.
* interp/msg.boot: Likewise.
* interp/match.boot: Likewise.
* interp/word.boot: Likewise.
Diffstat (limited to 'src/interp/union.lisp')
| -rw-r--r-- | src/interp/union.lisp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/interp/union.lisp b/src/interp/union.lisp index 6698e36d..311ffff0 100644 --- a/src/interp/union.lisp +++ b/src/interp/union.lisp @@ -1,6 +1,6 @@ ;; Copyright (c) 1991-2002, The Numerical ALgorithms Group Ltd. ;; All rights reserved. -;; Copyright (C) 2007, Gabriel Dos Reis. +;; Copyright (C) 2007-2010, Gabriel Dos Reis. ;; All rights reserved. ;; ;; Redistribution and use in source and binary forms, with or without @@ -67,10 +67,10 @@ LP (COND ( (NOT (PAIRP LIST-OF-ITEMS-1)) (RETURN (QCDR H)) ) - ( (QMEMQ + ( (MEMQ (SETQ I (QCAR (RESETQ LIST-OF-ITEMS-1 (QCDR LIST-OF-ITEMS-1)))) (QCDR H)) ) - ( (QMEMQ I LIST-OF-ITEMS-2) + ( (MEMQ I LIST-OF-ITEMS-2) (QRPLACD V (SETQ V (CONS I NIL))) ) ) (GO LP) ) ) @@ -114,7 +114,7 @@ ( 'T (RETURN (QCDR H)) ) ) ) ( (NOT - (QMEMQ + (MEMQ (SETQ I (QCAR (RESETQ LIST-OF-ITEMS-1 (QCDR LIST-OF-ITEMS-1)))) (QCDR H))) (QRPLACD V (SETQ V (CONS I NIL))) ) ) @@ -151,9 +151,9 @@ LP1 (COND ( (NOT (PAIRP LIST-OF-ITEMS-1)) (RETURN (QCDR H)) ) - ( (QMEMQ + ( (MEMQ (SETQ I (QCAR (RESETQ LIST-OF-ITEMS-1 (QCDR LIST-OF-ITEMS-1)))) (QCDR H)) ) - ( (NOT (QMEMQ I LIST-OF-ITEMS-2)) + ( (NOT (MEMQ I LIST-OF-ITEMS-2)) (QRPLACD V (SETQ V (CONS I NIL))) ) ) (GO LP1) ) ) |