From bde30ff75265d76b905c05d4f3c0ece879ba97d9 Mon Sep 17 00:00:00 2001
From: schwarze <schwarze@openbsd.org>
Date: Thu, 19 May 2022 16:15:35 +0000
Subject: [PATCH] following the fixed parsing direction of roff_expand() in
 roff.c rev. 1.260, some diagnostics now appear in a more reasonable order,
 too

---
 .../mandoc/char/unicode/invalid.out_lint      | 10 ++---
 .../usr.bin/mandoc/roff/esc/invalid.out_lint  | 42 +++++++++----------
 .../usr.bin/mandoc/roff/esc/unsupp.out_lint   |  6 +--
 3 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/regress/usr.bin/mandoc/char/unicode/invalid.out_lint b/regress/usr.bin/mandoc/char/unicode/invalid.out_lint
index baf228fa662..ce9de98860e 100644
--- a/regress/usr.bin/mandoc/char/unicode/invalid.out_lint
+++ b/regress/usr.bin/mandoc/char/unicode/invalid.out_lint
@@ -1,9 +1,9 @@
-mandoc: invalid.in:11:20: WARNING: invalid escape sequence: \[u02B]
 mandoc: invalid.in:11:13: WARNING: invalid escape sequence: \[u2B]
-mandoc: invalid.in:13:33: WARNING: invalid escape sequence: \[u000002B]
-mandoc: invalid.in:13:22: WARNING: invalid escape sequence: \[u00002B]
+mandoc: invalid.in:11:20: WARNING: invalid escape sequence: \[u02B]
 mandoc: invalid.in:13:12: WARNING: invalid escape sequence: \[u0002B]
-mandoc: invalid.in:14:35: WARNING: invalid escape sequence: \[u1000000]
-mandoc: invalid.in:14:24: WARNING: invalid escape sequence: \[u200000]
+mandoc: invalid.in:13:22: WARNING: invalid escape sequence: \[u00002B]
+mandoc: invalid.in:13:33: WARNING: invalid escape sequence: \[u000002B]
 mandoc: invalid.in:14:13: WARNING: invalid escape sequence: \[u110000]
+mandoc: invalid.in:14:24: WARNING: invalid escape sequence: \[u200000]
+mandoc: invalid.in:14:35: WARNING: invalid escape sequence: \[u1000000]
 mandoc: invalid.in:15:20: WARNING: invalid escape sequence: \[u1234g]
diff --git a/regress/usr.bin/mandoc/roff/esc/invalid.out_lint b/regress/usr.bin/mandoc/roff/esc/invalid.out_lint
index a0afa7ae27a..baef3176710 100644
--- a/regress/usr.bin/mandoc/roff/esc/invalid.out_lint
+++ b/regress/usr.bin/mandoc/roff/esc/invalid.out_lint
@@ -1,43 +1,43 @@
-mandoc: invalid.in:7:11: WARNING: invalid escape sequence: \[+]
 mandoc: invalid.in:7:8: WARNING: undefined escape, printing literally: \+
-mandoc: invalid.in:8:16: WARNING: invalid escape sequence: \[;]
+mandoc: invalid.in:7:11: WARNING: invalid escape sequence: \[+]
 mandoc: invalid.in:8:13: WARNING: undefined escape, printing literally: \;
-mandoc: invalid.in:9:16: WARNING: invalid escape sequence: \[<]
+mandoc: invalid.in:8:16: WARNING: invalid escape sequence: \[;]
 mandoc: invalid.in:9:13: WARNING: undefined escape, printing literally: \<
-mandoc: invalid.in:10:15: WARNING: invalid escape sequence: \[=]
+mandoc: invalid.in:9:16: WARNING: invalid escape sequence: \[<]
 mandoc: invalid.in:10:12: WARNING: undefined escape, printing literally: \=
-mandoc: invalid.in:11:19: WARNING: invalid escape sequence: \[>]
+mandoc: invalid.in:10:15: WARNING: invalid escape sequence: \[=]
 mandoc: invalid.in:11:16: WARNING: undefined escape, printing literally: \>
-mandoc: invalid.in:12:9: WARNING: invalid escape sequence: \[@]
+mandoc: invalid.in:11:19: WARNING: invalid escape sequence: \[>]
 mandoc: invalid.in:12:6: WARNING: undefined escape, printing literally: \@
+mandoc: invalid.in:12:9: WARNING: invalid escape sequence: \[@]
 mandoc: invalid.in:13:18: WARNING: undefined escape, printing literally: \]
-mandoc: invalid.in:14:21: WARNING: invalid escape sequence: \[}]
 mandoc: invalid.in:14:16: WARNING: invalid escape sequence: \[{]
-mandoc: invalid.in:15:12: WARNING: invalid escape sequence: \[1]
+mandoc: invalid.in:14:21: WARNING: invalid escape sequence: \[}]
 mandoc: invalid.in:15:9: WARNING: undefined escape, printing literally: \1
-mandoc: invalid.in:16:8: WARNING: invalid escape sequence: \[G]
+mandoc: invalid.in:15:12: WARNING: invalid escape sequence: \[1]
 mandoc: invalid.in:16:5: WARNING: undefined escape, printing literally: \G
-mandoc: invalid.in:17:8: WARNING: invalid escape sequence: \[I]
+mandoc: invalid.in:16:8: WARNING: invalid escape sequence: \[G]
 mandoc: invalid.in:17:5: WARNING: undefined escape, printing literally: \I
-mandoc: invalid.in:18:8: WARNING: invalid escape sequence: \[i]
+mandoc: invalid.in:17:8: WARNING: invalid escape sequence: \[I]
 mandoc: invalid.in:18:5: WARNING: undefined escape, printing literally: \i
-mandoc: invalid.in:19:8: WARNING: invalid escape sequence: \[J]
+mandoc: invalid.in:18:8: WARNING: invalid escape sequence: \[i]
 mandoc: invalid.in:19:5: WARNING: undefined escape, printing literally: \J
-mandoc: invalid.in:20:8: WARNING: invalid escape sequence: \[j]
+mandoc: invalid.in:19:8: WARNING: invalid escape sequence: \[J]
 mandoc: invalid.in:20:5: WARNING: undefined escape, printing literally: \j
-mandoc: invalid.in:21:8: WARNING: invalid escape sequence: \[K]
+mandoc: invalid.in:20:8: WARNING: invalid escape sequence: \[j]
 mandoc: invalid.in:21:5: WARNING: undefined escape, printing literally: \K
-mandoc: invalid.in:22:8: WARNING: invalid escape sequence: \[P]
+mandoc: invalid.in:21:8: WARNING: invalid escape sequence: \[K]
 mandoc: invalid.in:22:5: WARNING: undefined escape, printing literally: \P
-mandoc: invalid.in:23:8: WARNING: invalid escape sequence: \[Q]
+mandoc: invalid.in:22:8: WARNING: invalid escape sequence: \[P]
 mandoc: invalid.in:23:5: WARNING: undefined escape, printing literally: \Q
-mandoc: invalid.in:24:8: WARNING: invalid escape sequence: \[q]
+mandoc: invalid.in:23:8: WARNING: invalid escape sequence: \[Q]
 mandoc: invalid.in:24:5: WARNING: undefined escape, printing literally: \q
-mandoc: invalid.in:25:8: WARNING: invalid escape sequence: \[T]
+mandoc: invalid.in:24:8: WARNING: invalid escape sequence: \[q]
 mandoc: invalid.in:25:5: WARNING: undefined escape, printing literally: \T
-mandoc: invalid.in:26:8: WARNING: invalid escape sequence: \[U]
+mandoc: invalid.in:25:8: WARNING: invalid escape sequence: \[T]
 mandoc: invalid.in:26:5: WARNING: undefined escape, printing literally: \U
-mandoc: invalid.in:27:8: WARNING: invalid escape sequence: \[W]
+mandoc: invalid.in:26:8: WARNING: invalid escape sequence: \[U]
 mandoc: invalid.in:27:5: WARNING: undefined escape, printing literally: \W
-mandoc: invalid.in:28:8: WARNING: invalid escape sequence: \[y]
+mandoc: invalid.in:27:8: WARNING: invalid escape sequence: \[W]
 mandoc: invalid.in:28:5: WARNING: undefined escape, printing literally: \y
+mandoc: invalid.in:28:8: WARNING: invalid escape sequence: \[y]
diff --git a/regress/usr.bin/mandoc/roff/esc/unsupp.out_lint b/regress/usr.bin/mandoc/roff/esc/unsupp.out_lint
index d3cc4bf1077..fae97c816fa 100644
--- a/regress/usr.bin/mandoc/roff/esc/unsupp.out_lint
+++ b/regress/usr.bin/mandoc/roff/esc/unsupp.out_lint
@@ -1,5 +1,5 @@
-mandoc: unsupp.in:7:23: WARNING: invalid escape sequence: \[!]
 mandoc: unsupp.in:7:20: UNSUPP: unsupported escape sequence: \!
-mandoc: unsupp.in:8:24: WARNING: invalid escape sequence: \[?]
-mandoc: unsupp.in:8:21: UNSUPP: unsupported escape sequence: \?
+mandoc: unsupp.in:7:23: WARNING: invalid escape sequence: \[!]
 mandoc: unsupp.in:8:17: UNSUPP: unsupported escape sequence: \?
+mandoc: unsupp.in:8:21: UNSUPP: unsupported escape sequence: \?
+mandoc: unsupp.in:8:24: WARNING: invalid escape sequence: \[?]
-- 
2.20.1