APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1506784568 -3600 # Sat Sep 30 16:16:08 2017 +0100 # Node ID 8df05e6e201fbbd618c7127c762bf954028ceec3 # Parent 6f9111895fd5675fbdbb41da7370ff03f2cb687c Update the Lisp reader test for all Unicode code points, mule-tests.el tests/ChangeLog addition: 2017-09-30 Aidan Kehoe <kehoea(a)parhasard.net&gt; [...] * automated/mule-tests.el: [...] The Lisp reader will now handle all legitimate Unicode code points fine if unicode-internal, and Ben's code approach with old-mule now gives a different error than the Known-Bug-Expect-Error checked for. Update the code to reflect this. diff -r 6f9111895fd5 -r 8df05e6e201f tests/ChangeLog --- a/tests/ChangeLog Sat Sep 30 15:56:50 2017 +0100 +++ b/tests/ChangeLog Sat Sep 30 16:16:08 2017 +0100 ＠＠ -14,6 +14,10 ＠＠ unicode-internal merge removed that charset, relying on the just-in-time Unicode codepoint support for the corresponding characters. + The Lisp reader will now handle all legitimate Unicode code points + fine if unicode-internal, and Ben's code approach with old-mule + now gives a different error than the Known-Bug-Expect-Error + checked for. Update the code to reflect this. * automated/os-tests.el: Call #'Check-Error correctly here when testing the restrictions on the ZONE argument to #'encode-time diff -r 6f9111895fd5 -r 8df05e6e201f tests/automated/mule-tests.el --- a/tests/automated/mule-tests.el Sat Sep 30 15:56:50 2017 +0100 +++ b/tests/automated/mule-tests.el Sat Sep 30 16:16:08 2017 +0100 ＠＠ -868,18 +868,30 ＠＠ (Assert-elc-is-escape-quoted) (delete-region (point-min) (point-max)))) - (Known-Bug-Expect-Error - invalid-constant - (loop - for i from #x0 to #x10FFFF - with exceptions = #s(range-table type start-closed-end-closed - data ((#xFFFE #xFFFF) t - (#xFDD0 #xFDEF) t - (#xD800 #xDBFF) t - (#xDC00 #xDFFF) t)) - do (unless (get-range-table i exceptions) - (read (format (if (> i #xFFFF) #r"?\U%08X" #r"?\u%04X") i))) - finally return t)) + (labels + ((read-all-unicode () + (with-temp-buffer + (loop for i from #x0 to #x10FFFF + with exceptions = #s(range-table type start-closed-end-closed + data ((#xFFFE #xFFFF) t + (#xFDD0 #xFDEF) t + (#xD800 #xDBFF) t + (#xDC00 #xDFFF) t)) + with result = t + do (unless (get-range-table i exceptions) + (delete-region (point-min) (point-max)) + (format-into (current-buffer) + (if (> i #xFFFF) #r"?\U%08X" #r"?\u%04X") + i) + (goto-char (point-min)) + (setq result (and (characterp (read (current-buffer))) + result))) + finally (Assert result))))) + (when (compiled-function-p #'read-all-unicode) + (if (featurep 'unicode-internal) + (read-all-unicode) + (Known-Bug-Expect-Error syntax-error (read-all-unicode))))) + (loop for i from #x00 to #xff do (Assert -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)