diff --git a/ansi-tests/format-brace.lsp b/ansi-tests/format-brace.lsp index 12a444c59732236b150ef78f77784e3a91c7d766..213d5a54af200b81010bf1ca12c315393d0434e9 100644 --- a/ansi-tests/format-brace.lsp +++ b/ansi-tests/format-brace.lsp @@ -56,27 +56,8 @@ (format nil "~#{~A~}" '(1 2 3 4 5 6 7) nil nil nil) "1234") -;;; Tests of ~^ inside ~{ ... ~} - -(deftest format.{.10 - (format nil "~{X ~A~^ Y ~A~^ ~}" '(1 2 3 4 5)) - "X 1 Y 2 X 3 Y 4 X 5") - -(deftest format.{.11 - (format nil "~{X ~A~^ Y ~A~^ ~}" '(1 2 3 4)) - "X 1 Y 2 X 3 Y 4") - -(deftest format.{.12 - (format nil "~1{~A~^~A~}" '(1)) - "1") - -(deftest format.{.13 - (format nil "~0{~A~^~A~}" '(1)) - "") - -(deftest format.{.14 - (format nil "~1{~A~^~A~}" '(1 2 3)) - "12") +;;; (missing tests involved ~^ and have been moved to format-circumflex.lsp +;;; and renamed.) (deftest format.{.15 (format nil "~0{~}" "~A" '(1 2 3)) @@ -230,9 +211,6 @@ (format nil "~v:{ABC~:}" nil '(nil)) "ABC") -;;; ~^ in ~:{ ... ~:} - - ;;; Tests of ~@{ ... ~} diff --git a/ansi-tests/format-circumflex.lsp b/ansi-tests/format-circumflex.lsp new file mode 100644 index 0000000000000000000000000000000000000000..ec257ebcfd561f6d432c865068d2dcadab90291e --- /dev/null +++ b/ansi-tests/format-circumflex.lsp @@ -0,0 +1,78 @@ +;-*- Mode: Lisp -*- +;;;; Author: Paul Dietz +;;;; Created: Thu Nov 11 20:17:51 2004 +;;;; Contains: Tests of the ~^ format directive (inside other format constructs) + +(in-package :cl-test) +(compile-and-load "printer-aux.lsp") + +;;; Tests of ~^ inside ~{ ... ~} + +(deftest format.^.{.1 + (format nil "~{X ~A~^ Y ~A~^ ~}" '(1 2 3 4 5)) + "X 1 Y 2 X 3 Y 4 X 5") + +(deftest format.^.{.2 + (format nil "~{X ~A~^ Y ~A~^ ~}" '(1 2 3 4)) + "X 1 Y 2 X 3 Y 4") + +(deftest format.^.{.3 + (format nil "~1{~A~^~A~}" '(1)) + "1") + +(deftest format.^.{.4 + (format nil "~0{~A~^~A~}" '(1)) + "") + +(deftest format.^.{.5 + (format nil "~1{~A~^~A~}" '(1 2 3)) + "12") + +(deftest format.^.{.6 + (format nil "~{~A~A~0^~A~}" '(1 2 3 4 5 6)) + "12") + +(deftest format.^.{.7 + (format nil "~{~A~A~v^~A~}" '(1 2 3 4 5 6 0 7 8 9 10 11 12)) + "12456") + +(deftest format.^.{.8 + (format nil "~{~#,3^~A~}" '(1 2 3 4 5 6 7 8 9 10)) + "1234567") + +(deftest format.^.{.9 + (format nil "~{~2,#^~A~}~A" '(1 2 3 4 5 6 7 8 9 10) 0) + "123456780") + +(deftest format.^.{.10 + (format nil "~{~#,#^~A~}" '(1 2 3 4 5 6 7 8 9 10)) + "") + +(deftest format.^.{.11 + (format nil "~{~#,#,#^~A~}" '(1 2 3 4 5 6 7 8 9 10)) + "") + +(deftest format.^.{.12 + (format nil "~{~#,1,2^~A~}" '(1 2 3 4 5 6 7 8 9 10)) + "123456789") + +(deftest format.^.{.13 + (format nil "~{~#,#,v^~A~}" '(1 2 3 4 5 6 7 8 9 10)) + "246") + +(deftest format.^.{.14 + (format nil "~{~#,#,v^~A~}" '(1 2 3 4 5 6 7 8 9 10 11)) + "246") + +(deftest format.^.{.15 + (format nil "~{~#,#,v^~A~}" '(1 2 3 4 5 6 7 8 9 10 11 12)) + "246") + +(deftest format.^.{.16 + (format nil "~{~#,#,v^~A~}" '(1 2 3 4 5 6 7 8 9 10 11 12 13)) + "246") + +(deftest format.^.{.17 + (format nil "~{~#,#,v^~A~}" '(1 2 3 4 5 6 7 8 9 10 11 12 13 14)) + "2468") + diff --git a/ansi-tests/load-format.lsp b/ansi-tests/load-format.lsp index 4177cd4e5ca3afaf7b926f6ecd50792c165e5765..ee0ff92640a86fb6b4b1d61f7672137c468002e8 100644 --- a/ansi-tests/load-format.lsp +++ b/ansi-tests/load-format.lsp @@ -47,3 +47,7 @@ ;;; 22.3.8 (load "format-paren.lsp") (load "format-p.lsp") + +;;; 22.3.9 +(load "format-circumflex.lsp") +