Parser reorg:

Generate the first node on the roff level: .br
Fix some column numbers in diagnostic messages while here.

13 files changed, 26 insertions, 26 deletions

diff --git a/regress/usr.bin/mandoc/eqn/define/infinite.out_lint b/regress/usr.bin/mandoc/eqn/define/infinite.out_lint
index cb5a00480f0..8843358a86f 100644
--- a/regress/usr.bin/mandoc/eqn/define/infinite.out_lint
+++ b/regress/usr.bin/mandoc/eqn/define/infinite.out_lint
@@ -1,4 +1,4 @@
-mandoc: infinite.in:9:1: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:15:1: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:21:1: ERROR: input stack limit exceeded, infinite loop?
-mandoc: infinite.in:27:1: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:9:2: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:15:2: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:21:2: ERROR: input stack limit exceeded, infinite loop?
+mandoc: infinite.in:27:2: ERROR: input stack limit exceeded, infinite loop?
diff --git a/regress/usr.bin/mandoc/eqn/define/invalid.out_lint b/regress/usr.bin/mandoc/eqn/define/invalid.out_lint
index 3f2304004dc..b8b9858d09f 100644
--- a/regress/usr.bin/mandoc/eqn/define/invalid.out_lint
+++ b/regress/usr.bin/mandoc/eqn/define/invalid.out_lint
@@ -1,5 +1,5 @@
-mandoc: invalid.in:9:1: WARNING: skipping empty request: define
-mandoc: invalid.in:15:1: WARNING: skipping empty request: define bruch
-mandoc: invalid.in:21:1: WARNING: skipping empty request: undef
-mandoc: invalid.in:27:1: WARNING: skipping empty request: tdefine
-mandoc: invalid.in:33:1: WARNING: skipping empty request: tdefine
+mandoc: invalid.in:9:2: WARNING: skipping empty request: define
+mandoc: invalid.in:15:2: WARNING: skipping empty request: define bruch
+mandoc: invalid.in:21:2: WARNING: skipping empty request: undef
+mandoc: invalid.in:27:2: WARNING: skipping empty request: tdefine
+mandoc: invalid.in:33:2: WARNING: skipping empty request: tdefine
diff --git a/regress/usr.bin/mandoc/eqn/over/noarg.out_lint b/regress/usr.bin/mandoc/eqn/over/noarg.out_lint
index aabfc30b394..34cc2490c57 100644
--- a/regress/usr.bin/mandoc/eqn/over/noarg.out_lint
+++ b/regress/usr.bin/mandoc/eqn/over/noarg.out_lint
@@ -1 +1 @@
-mandoc: noarg.in:9:1: WARNING: missing eqn box, using "": over
+mandoc: noarg.in:9:2: WARNING: missing eqn box, using "": over
diff --git a/regress/usr.bin/mandoc/mdoc/Pp/arg.out_lint b/regress/usr.bin/mandoc/mdoc/Pp/arg.out_lint
index 2e0a2f63739..58b97965e93 100644
--- a/regress/usr.bin/mandoc/mdoc/Pp/arg.out_lint
+++ b/regress/usr.bin/mandoc/mdoc/Pp/arg.out_lint
@@ -1,3 +1,3 @@
+mandoc: arg.in:11:5: ERROR: skipping all arguments: br drop this
 mandoc: arg.in:9:2: ERROR: skipping all arguments: Pp drop
-mandoc: arg.in:11:2: ERROR: skipping all arguments: br drop
 mandoc: arg.in:13:8: ERROR: skipping excess arguments: sp ... drop
diff --git a/regress/usr.bin/mandoc/roff/cond/close.out_lint b/regress/usr.bin/mandoc/roff/cond/close.out_lint
index e3419dbac11..c59a98d79e4 100644
--- a/regress/usr.bin/mandoc/roff/cond/close.out_lint
+++ b/regress/usr.bin/mandoc/roff/cond/close.out_lint
@@ -1 +1 @@
-mandoc: close.in:14:1: ERROR: appending missing end of block: if
+mandoc: close.in:14:2: ERROR: appending missing end of block: if
diff --git a/regress/usr.bin/mandoc/roff/cond/if.out_lint b/regress/usr.bin/mandoc/roff/cond/if.out_lint
index bb8e2d3ad48..22f112d5310 100644
--- a/regress/usr.bin/mandoc/roff/cond/if.out_lint
+++ b/regress/usr.bin/mandoc/roff/cond/if.out_lint
@@ -1,2 +1,2 @@
-mandoc: if.in:14:1: WARNING: conditional request controls empty scope: if
-mandoc: if.in:16:1: WARNING: conditional request controls empty scope: if
+mandoc: if.in:14:2: WARNING: conditional request controls empty scope: if
+mandoc: if.in:16:2: WARNING: conditional request controls empty scope: if
diff --git a/regress/usr.bin/mandoc/roff/de/escname.out_lint b/regress/usr.bin/mandoc/roff/de/escname.out_lint
index b4dd49a0867..f0fd210923f 100644
--- a/regress/usr.bin/mandoc/roff/de/escname.out_lint
+++ b/regress/usr.bin/mandoc/roff/de/escname.out_lint
@@ -1,8 +1,8 @@
-mandoc: escname.in:21:1: ERROR: escaped character not allowed in a name: first\e
+mandoc: escname.in:21:2: ERROR: escaped character not allowed in a name: first\e
 mandoc: escname.in:31:19: ERROR: escaped character not allowed in a name: first\e
 mandoc: escname.in:32:2: ERROR: skipping unknown macro: .first
 mandoc: escname.in:34:2: ERROR: skipping unknown macro: .first\\second
 mandoc: escname.in:37:5: ERROR: skipping excess arguments: .de ... excess arguments
 mandoc: escname.in:40:1: ERROR: escaped character not allowed in a name: witharg\(
 mandoc: escname.in:42:1: ERROR: escaped character not allowed in a name: de\e
-mandoc: escname.in:42:1: WARNING: skipping empty request: de
+mandoc: escname.in:42:2: WARNING: skipping empty request: de
diff --git a/regress/usr.bin/mandoc/roff/de/indir.out_lint b/regress/usr.bin/mandoc/roff/de/indir.out_lint
index 43194fea5bd..96f42d1d6d7 100644
--- a/regress/usr.bin/mandoc/roff/de/indir.out_lint
+++ b/regress/usr.bin/mandoc/roff/de/indir.out_lint
@@ -1,4 +1,4 @@
 mandoc: indir.in:18:11: WARNING: undefined string, using "": myie
 mandoc: indir.in:25:6: WARNING: undefined string, using "": myim
-mandoc: indir.in:25:1: WARNING: skipping empty request: dei
-mandoc: indir.in:29:1: WARNING: skipping empty request: dei
+mandoc: indir.in:25:2: WARNING: skipping empty request: dei
+mandoc: indir.in:29:2: WARNING: skipping empty request: dei
diff --git a/regress/usr.bin/mandoc/roff/ig/basic.out_lint b/regress/usr.bin/mandoc/roff/ig/basic.out_lint
index 2b03b9cf69f..7c068e87e03 100644
--- a/regress/usr.bin/mandoc/roff/ig/basic.out_lint
+++ b/regress/usr.bin/mandoc/roff/ig/basic.out_lint
@@ -1,3 +1,3 @@
 mandoc: basic.in:19:5: ERROR: skipping excess arguments: .ig ... excess
-mandoc: basic.in:24:1: ERROR: skipping end of block that is not open: ..
-mandoc: basic.in:26:1: ERROR: appending missing end of block: ig
+mandoc: basic.in:24:2: ERROR: skipping end of block that is not open: ..
+mandoc: basic.in:26:2: ERROR: appending missing end of block: ig
diff --git a/regress/usr.bin/mandoc/roff/it/badarg.out_lint b/regress/usr.bin/mandoc/roff/it/badarg.out_lint
index d2d4edb3771..ac526c6b2aa 100644
--- a/regress/usr.bin/mandoc/roff/it/badarg.out_lint
+++ b/regress/usr.bin/mandoc/roff/it/badarg.out_lint
@@ -1,2 +1,2 @@
-mandoc: badarg.in:12:1: ERROR: skipping request without numeric argument: it mytrap
-mandoc: badarg.in:15:1: ERROR: skipping request without numeric argument: it
+mandoc: badarg.in:12:2: ERROR: skipping request without numeric argument: it mytrap
+mandoc: badarg.in:15:2: ERROR: skipping request without numeric argument: it
diff --git a/regress/usr.bin/mandoc/roff/tr/args.out_lint b/regress/usr.bin/mandoc/roff/tr/args.out_lint
index dec14b802a9..e2883ef7268 100644
--- a/regress/usr.bin/mandoc/roff/tr/args.out_lint
+++ b/regress/usr.bin/mandoc/roff/tr/args.out_lint
@@ -1,3 +1,3 @@
-mandoc: args.in:6:1: WARNING: skipping empty request: tr
+mandoc: args.in:6:2: WARNING: skipping empty request: tr
 mandoc: args.in:8:5: WARNING: odd number of characters in request: tr x
 mandoc: args.in:14:7: WARNING: odd number of characters in request: tr z
diff --git a/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint b/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint
index 452cde4d05c..d140694850d 100644
--- a/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint
+++ b/regress/usr.bin/mandoc/tbl/data/block_unclosed.out_lint
@@ -1,2 +1,2 @@
-mandoc: block_unclosed.in:6:1: ERROR: data block open at end of tbl: TE
-mandoc: block_unclosed.in: ERROR: data block open at end of tbl: T&
+mandoc: block_unclosed.in:6:2: ERROR: data block open at end of tbl: TE
+mandoc: block_unclosed.in:29:2: ERROR: data block open at end of tbl: T&
diff --git a/regress/usr.bin/mandoc/tbl/data/empty.out_lint b/regress/usr.bin/mandoc/tbl/data/empty.out_lint
index 153902d0c53..0244cdd7d1c 100644
--- a/regress/usr.bin/mandoc/tbl/data/empty.out_lint
+++ b/regress/usr.bin/mandoc/tbl/data/empty.out_lint
@@ -1 +1 @@
-mandoc: empty.in:6:1: ERROR: tbl without any data cells
+mandoc: empty.in:6:2: ERROR: tbl without any data cells