Changeset 3866


Ignore:
Timestamp:
09/18/03 18:07:00 (19 years ago)
Author:
piso
Message:

MERGE: handle :key nil case correctly (as in MERGE-LIST.9).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/j/src/org/armedbear/lisp/sort.lisp

    r2245 r3866  
    22;;;
    33;;; Copyright (C) 2003 Peter Graves
    4 ;;; $Id: sort.lisp,v 1.3 2003-06-10 15:38:43 piso Exp $
     4;;; $Id: sort.lisp,v 1.4 2003-09-18 18:07:00 piso Exp $
    55;;;
    66;;; This program is free software; you can redistribute it and/or
     
    125125
    126126(defun merge (result-type sequence1 sequence2 predicate
    127                           &key (key #'identity)
     127                          &key key
    128128                          &aux (l1 (length sequence1)) (l2 (length sequence2)))
     129  (unless key (setq key #'identity))
    129130  (do ((newseq (make-sequence result-type (+ l1 l2)))
    130131       (j 0 (1+ j))
Note: See TracChangeset for help on using the changeset viewer.