summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschwarze <schwarze@openbsd.org>2015-12-01 01:07:36 +0000
committerschwarze <schwarze@openbsd.org>2015-12-01 01:07:36 +0000
commitca91063a9c61eeedac94904ab55d1cb63e5e179a (patch)
tree29528f7ccea0954996c3ff56ec530c4689fc6304
parenttypo in comment (diff)
downloadwireguard-openbsd-ca91063a9c61eeedac94904ab55d1cb63e5e179a.tar.xz
wireguard-openbsd-ca91063a9c61eeedac94904ab55d1cb63e5e179a.zip
Cope with the changed order of warning and error messages caused by the
seperation of parsing and validation modules. I originally intended to mop this up when the parser reorg is complete, but since the work stalled a bit, i should not leave this lying around broken for weeks. Reminded by daniel@.
-rw-r--r--regress/usr.bin/mandoc/man/TP/double.out_lint4
-rw-r--r--regress/usr.bin/mandoc/man/UR/args.out_lint4
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_lint14
-rw-r--r--regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/late.out_lint4
-rw-r--r--regress/usr.bin/mandoc/mdoc/Dt/missing.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/Fo/noarg.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/St/badargs.out_lint2
-rw-r--r--regress/usr.bin/mandoc/mdoc/blank/line.out_lint16
-rw-r--r--regress/usr.bin/mandoc/roff/ft/badargs.out_lint2
15 files changed, 31 insertions, 31 deletions
diff --git a/regress/usr.bin/mandoc/man/TP/double.out_lint b/regress/usr.bin/mandoc/man/TP/double.out_lint
index 9040bc5224a..0ec1aa87dcc 100644
--- a/regress/usr.bin/mandoc/man/TP/double.out_lint
+++ b/regress/usr.bin/mandoc/man/TP/double.out_lint
@@ -1,5 +1,5 @@
-mandoc: double.in:20:2: WARNING: skipping paragraph macro: PP empty
mandoc: double.in:21:2: WARNING: line scope broken: TP breaks TP
mandoc: double.in:30:2: WARNING: line scope broken: PP breaks B
-mandoc: double.in:31:2: WARNING: skipping paragraph macro: PP empty
mandoc: double.in:32:2: WARNING: line scope broken: TP breaks TP
+mandoc: double.in:20:2: WARNING: skipping paragraph macro: PP empty
+mandoc: double.in:31:2: WARNING: skipping paragraph macro: PP empty
diff --git a/regress/usr.bin/mandoc/man/UR/args.out_lint b/regress/usr.bin/mandoc/man/UR/args.out_lint
index 63b94f1a28c..3e7ef528fe0 100644
--- a/regress/usr.bin/mandoc/man/UR/args.out_lint
+++ b/regress/usr.bin/mandoc/man/UR/args.out_lint
@@ -1,5 +1,5 @@
-mandoc: args.in:12:2: WARNING: empty block: UR
-mandoc: args.in:16:2: WARNING: missing resource identifier, using "": UR
mandoc: args.in:21:11: ERROR: skipping excess arguments: UR ... second
mandoc: args.in:26:11: ERROR: skipping excess arguments: UR ... second
+mandoc: args.in:12:2: WARNING: empty block: UR
+mandoc: args.in:16:2: WARNING: missing resource identifier, using "": UR
mandoc: args.in:26:2: WARNING: empty block: UR
diff --git a/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint
index eb96330ee03..cdca9c0259f 100644
--- a/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bf/badargs.out_lint
@@ -1,3 +1,3 @@
+mandoc: badargs.in:17:2: ERROR: skipping all arguments: Ef tail argument
mandoc: badargs.in:11:2: WARNING: missing font type, using \fR: Bf
mandoc: badargs.in:15:5: WARNING: unknown font type, using \fR: Bf badarg
-mandoc: badargs.in:17:2: ERROR: skipping all arguments: Ef tail argument
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
index df7541a4828..ac9ee13b6d3 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/badargs.out_lint
@@ -1,3 +1,4 @@
+mandoc: badargs.in:78:2: ERROR: skipping all arguments: El tail argument
mandoc: badargs.in:9:13: WARNING: empty argument, using 0n: Bl -offset
mandoc: badargs.in:14:13: WARNING: empty argument, using 0n: Bl -width
mandoc: badargs.in:18:11: WARNING: empty argument, using 0n: Bl -width
@@ -15,4 +16,3 @@ mandoc: badargs.in:70:20: ERROR: skipping excess arguments: Bl ... -bogus
mandoc: badargs.in:75:42: WARNING: duplicate argument: Bl -compact
mandoc: badargs.in:75:51: WARNING: duplicate argument: Bl -offset 2n
mandoc: badargs.in:75:62: WARNING: duplicate argument: Bl -width 6n
-mandoc: badargs.in:78:2: ERROR: skipping all arguments: El tail argument
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_lint
index 9badbf23afe..8e06273bf3d 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bareIt.out_lint
@@ -1,3 +1,3 @@
mandoc: bareIt.in:9:2: ERROR: skipping item outside list: It argument
-mandoc: bareIt.in:9:2: WARNING: skipping paragraph macro: br before Bl
mandoc: bareIt.in:14:2: ERROR: skipping item outside list: It argument
+mandoc: bareIt.in:9:2: WARNING: skipping paragraph macro: br before Bl
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint
index 141e1bd8a2b..19cb4ebb11e 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/bareTa.out_lint
@@ -1,5 +1,5 @@
mandoc: bareTa.in:9:2: ERROR: skipping column outside column list: Ta
mandoc: bareTa.in:13:2: ERROR: skipping column outside column list: Ta
mandoc: bareTa.in:18:5: ERROR: skipping column outside column list: Ta
-mandoc: bareTa.in:18:2: ERROR: skipping all arguments: It ignored arguments
mandoc: bareTa.in:25:2: ERROR: skipping item outside list: It ignored arguments
+mandoc: bareTa.in:18:2: ERROR: skipping all arguments: It ignored arguments
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_lint
index 09048309764..16a0db6e6c8 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/breakingIt.out_lint
@@ -1,16 +1,16 @@
mandoc: breakingIt.in:13:2: ERROR: inserting missing end of block: It breaks Ao
-mandoc: breakingIt.in:10:1: WARNING: moving content out of list: text
-mandoc: breakingIt.in:11:2: WARNING: moving content out of list: Ao
mandoc: breakingIt.in:20:2: ERROR: inserting missing end of block: It breaks Ao
-mandoc: breakingIt.in:17:1: WARNING: moving content out of list: text
-mandoc: breakingIt.in:18:2: WARNING: moving content out of list: Ao
mandoc: breakingIt.in:28:2: ERROR: inserting missing end of block: It breaks Ao
mandoc: breakingIt.in:36:2: ERROR: inserting missing end of block: It breaks Ao
mandoc: breakingIt.in:44:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:51:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:59:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:67:2: ERROR: inserting missing end of block: It breaks Bd
+mandoc: breakingIt.in:10:1: WARNING: moving content out of list: text
+mandoc: breakingIt.in:11:2: WARNING: moving content out of list: Ao
+mandoc: breakingIt.in:17:1: WARNING: moving content out of list: text
+mandoc: breakingIt.in:18:2: WARNING: moving content out of list: Ao
mandoc: breakingIt.in:41:1: WARNING: moving content out of list: text
mandoc: breakingIt.in:42:2: WARNING: moving content out of list: Bd
-mandoc: breakingIt.in:51:2: ERROR: inserting missing end of block: It breaks Bd
mandoc: breakingIt.in:48:1: WARNING: moving content out of list: text
mandoc: breakingIt.in:49:2: WARNING: moving content out of list: Bd
-mandoc: breakingIt.in:59:2: ERROR: inserting missing end of block: It breaks Bd
-mandoc: breakingIt.in:67:2: ERROR: inserting missing end of block: It breaks Bd
diff --git a/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint b/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint
index c14bd0b46be..0c7b0253afb 100644
--- a/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Bl/notype.out_lint
@@ -1,4 +1,4 @@
-mandoc: notype.in:9:2: WARNING: list type is not the first argument: Bl -offset
mandoc: notype.in:12:2: ERROR: skipping all arguments: El tail argument
+mandoc: notype.in:9:2: WARNING: list type is not the first argument: Bl -offset
mandoc: notype.in:15:2: ERROR: missing list type, using -item: Bl
mandoc: notype.in:21:2: ERROR: missing list type, using -item: Bl
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
index 7248651c360..b355bed0d54 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/dupe.out_lint
@@ -1,2 +1,2 @@
mandoc: dupe.in:4:2: WARNING: duplicate prologue macro: Dt
-mandoc: dupe.in:10:2: WARNING: skipping late title macro: Dt DT-LAST 3 last_arch
+mandoc: dupe.in:10:2: WARNING: skipping late title macro: Dt
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/late.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/late.out_lint
index 53951cccc3f..4228c6ae5fb 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/late.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/late.out_lint
@@ -1,2 +1,2 @@
-mandoc: late.in:3:2: WARNING: missing manual title, using UNTITLED: Sh NAME
-mandoc: late.in:8:2: WARNING: skipping late title macro: Dt DT-LATE 1
+mandoc: late.in:8:2: WARNING: skipping late title macro: Dt
+mandoc: late.in: WARNING: missing manual title, using UNTITLED: EOF
diff --git a/regress/usr.bin/mandoc/mdoc/Dt/missing.out_lint b/regress/usr.bin/mandoc/mdoc/Dt/missing.out_lint
index a175e4cafc4..283a60d5773 100644
--- a/regress/usr.bin/mandoc/mdoc/Dt/missing.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Dt/missing.out_lint
@@ -1 +1 @@
-mandoc: missing.in:3:2: WARNING: missing manual title, using UNTITLED: Sh NAME
+mandoc: missing.in: WARNING: missing manual title, using UNTITLED: EOF
diff --git a/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_lint b/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_lint
index e1947009774..4c72b01d64d 100644
--- a/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Fo/noarg.out_lint
@@ -1,4 +1,3 @@
-mandoc: noarg.in:12:10: ERROR: skipping excess arguments: Fo ... bogus
mandoc: noarg.in:23:2: WARNING: skipping empty macro: Fa
mandoc: noarg.in:27:2: WARNING: skipping empty macro: Fn
mandoc: noarg.in:29:2: WARNING: skipping empty macro: Ft
@@ -8,3 +7,4 @@ mandoc: noarg.in:37:2: WARNING: skipping empty macro: Ft
mandoc: noarg.in:39:2: WARNING: skipping empty macro: Fa
mandoc: noarg.in:42:2: WARNING: skipping empty macro: Ft
mandoc: noarg.in:43:2: WARNING: skipping empty macro: Fn
+mandoc: noarg.in:12:10: ERROR: skipping excess arguments: Fo ... bogus
diff --git a/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint b/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint
index 25062125154..ae74aa1a542 100644
--- a/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/St/badargs.out_lint
@@ -1,2 +1,2 @@
-mandoc: badargs.in:12:5: ERROR: unknown standard specifier: St -murks
mandoc: badargs.in:15:2: WARNING: skipping empty macro: St
+mandoc: badargs.in:12:5: ERROR: unknown standard specifier: St -murks
diff --git a/regress/usr.bin/mandoc/mdoc/blank/line.out_lint b/regress/usr.bin/mandoc/mdoc/blank/line.out_lint
index a777edc0a24..6e439442125 100644
--- a/regress/usr.bin/mandoc/mdoc/blank/line.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/blank/line.out_lint
@@ -1,4 +1,12 @@
mandoc: line.in:15:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:48:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:50:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:54:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:56:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:60:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:62:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:65:1: WARNING: blank line in fill mode, using .sp
+mandoc: line.in:66:1: WARNING: blank line in fill mode, using .sp
mandoc: line.in:18:2: WARNING: skipping paragraph macro: br after br
mandoc: line.in:20:2: WARNING: skipping paragraph macro: br before Pp
mandoc: line.in:24:2: WARNING: skipping paragraph macro: br after Pp
@@ -6,16 +14,8 @@ mandoc: line.in:26:2: WARNING: skipping paragraph macro: Pp before Pp
mandoc: line.in:33:2: WARNING: skipping paragraph macro: br after sp
mandoc: line.in:36:2: WARNING: skipping paragraph macro: sp after Pp
mandoc: line.in:39:2: WARNING: skipping paragraph macro: sp after Pp
-mandoc: line.in:48:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:50:1: WARNING: blank line in fill mode, using .sp
mandoc: line.in:51:2: WARNING: skipping paragraph macro: br after sp
-mandoc: line.in:54:1: WARNING: blank line in fill mode, using .sp
mandoc: line.in:54:1: WARNING: skipping paragraph macro: sp after Pp
-mandoc: line.in:56:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:60:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:62:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:65:1: WARNING: blank line in fill mode, using .sp
-mandoc: line.in:66:1: WARNING: blank line in fill mode, using .sp
mandoc: line.in:81:2: WARNING: skipping paragraph macro: sp after Sh
mandoc: line.in:83:2: WARNING: skipping paragraph macro: Pp at the end of Sh
mandoc: line.in:85:2: WARNING: skipping paragraph macro: Pp after Sh
diff --git a/regress/usr.bin/mandoc/roff/ft/badargs.out_lint b/regress/usr.bin/mandoc/roff/ft/badargs.out_lint
index 34ca64dc3d9..f84d7ea94d4 100644
--- a/regress/usr.bin/mandoc/roff/ft/badargs.out_lint
+++ b/regress/usr.bin/mandoc/roff/ft/badargs.out_lint
@@ -1,2 +1,2 @@
-mandoc: badargs.in:8:2: WARNING: unknown font, skipping request: ft foo
mandoc: badargs.in:10:7: ERROR: skipping excess arguments: ft ... bogus
+mandoc: badargs.in:8:2: WARNING: unknown font, skipping request: ft foo