/[gcl]/gcl/ansi-tests/merge.lsp
ViewVC logotype

Diff of /gcl/ansi-tests/merge.lsp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.12 by pfdietz, Thu Sep 23 13:28:54 2004 UTC revision 1.13 by pfdietz, Sun Sep 26 16:12:11 2004 UTC
# Line 197  Line 197 
197    t    t
198    #(2 5 8 9 11))    #(2 5 8 9 11))
199    
200    (deftest merge-vector.18
201      (merge '(vector) (list 1 3 10) (list 2 4 6) #'<)
202      #(1 2 3 4 6 10))
203    
204    (deftest merge-vector.19
205      (merge '(vector *) (list 1 3 10) (list 2 4 6) #'<)
206      #(1 2 3 4 6 10))
207    
208    (deftest merge-vector.20
209      (merge '(vector t) (list 1 3 10) (list 2 4 6) #'<)
210      #(1 2 3 4 6 10))
211    
212    (deftest merge-vector.21
213      (merge '(vector * 6) (list 1 3 10) (list 2 4 6) #'<)
214      #(1 2 3 4 6 10))
215    
216    (deftest merge-vector.22
217      (merge '(simple-vector) (list 2 4 6) (list 1 3 5) #'<)
218      #(1 2 3 4 5 6))
219    
220    (deftest merge-vector.23
221      (merge '(simple-vector *) (list 2 4 6) (list 1 3 5) #'<)
222      #(1 2 3 4 5 6))
223    
224    (deftest merge-vector.24
225      (merge '(simple-vector 6) (list 2 4 6) (list 1 3 5) #'<)
226      #(1 2 3 4 5 6))
227    
228  ;;; Tests on strings  ;;; Tests on strings
229    
230  (deftest merge-string.1  (deftest merge-string.1
# Line 349  Line 377 
377     (assert (string= (merge '(vector character) s (copy-seq "bdf") #'char<) "abcdef")))     (assert (string= (merge '(vector character) s (copy-seq "bdf") #'char<) "abcdef")))
378    nil)    nil)
379    
380    (deftest merge-string.24
381      (merge '(string) (copy-seq "ace") (copy-seq "bdf") #'char<)
382      "abcdef")
383    
384    (deftest merge-string.25
385      (merge '(string *) (copy-seq "ace") (copy-seq "bdf") #'char<)
386      "abcdef")
387    
388    (deftest merge-string.26
389      (merge '(string 6) (copy-seq "ace") (copy-seq "bdf") #'char<)
390      "abcdef")
391    
392    (deftest merge-string.27
393      (merge '(simple-string) (copy-seq "ace") (copy-seq "bdf") #'char<)
394      "abcdef")
395    
396    (deftest merge-string.28
397      (merge '(simple-string *) (copy-seq "ace") (copy-seq "bdf") #'char<)
398      "abcdef")
399    
400    (deftest merge-string.29
401      (merge '(simple-string 6) (copy-seq "ace") (copy-seq "bdf") #'char<)
402      "abcdef")
403    
404    (deftest merge-string.30
405      (merge '(base-string) (copy-seq "ace") (copy-seq "bdf") #'char<)
406      "abcdef")
407    
408    (deftest merge-string.31
409      (merge '(base-string *) (copy-seq "ace") (copy-seq "bdf") #'char<)
410      "abcdef")
411    
412    (deftest merge-string.32
413      (merge '(base-string 6) (copy-seq "ace") (copy-seq "bdf") #'char<)
414      "abcdef")
415    
416    (deftest merge-string.33
417      (merge '(simple-base-string) (copy-seq "ace") (copy-seq "bdf") #'char<)
418      "abcdef")
419    
420    (deftest merge-string.34
421      (merge '(simple-base-string *) (copy-seq "ace") (copy-seq "bdf") #'char<)
422      "abcdef")
423    
424    (deftest merge-string.35
425      (merge '(simple-base-string 6) (copy-seq "ace") (copy-seq "bdf") #'char<)
426      "abcdef")
427    
428    
429  ;;; Tests for bit vectors  ;;; Tests for bit vectors
430    
431  (deftest merge-bit-vector.1  (deftest merge-bit-vector.1

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26