From fc560c515dc97bd36329ee99e655bd3e30c705da Mon Sep 17 00:00:00 2001 From: Ingo Schwarze Date: Sun, 1 May 2022 16:22:06 +0000 Subject: Split a new function roff_parse_comment() out of roff_expand() because this functionality is not needed when called from roff_getarg(). This makes the long and complicated function roff_expand() significantly shorter, and also simpler in so far as it no longer needs to return ROFF_APPEND. No functional change intended. --- regress/roff/esc/Makefile | 6 +++--- regress/roff/esc/comment.in | 25 +++++++++++++++++++++++++ regress/roff/esc/comment.out_ascii | 19 +++++++++++++++++++ regress/roff/esc/comment.out_lint | 1 + 4 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 regress/roff/esc/comment.in create mode 100644 regress/roff/esc/comment.out_ascii create mode 100644 regress/roff/esc/comment.out_lint (limited to 'regress/roff/esc') diff --git a/regress/roff/esc/Makefile b/regress/roff/esc/Makefile index f00aa4d3..111e59bc 100644 --- a/regress/roff/esc/Makefile +++ b/regress/roff/esc/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.19 2022/04/27 13:30:19 schwarze Exp $ +# $OpenBSD: Makefile,v 1.20 2022/05/01 16:18:59 schwarze Exp $ -REGRESS_TARGETS = one two multi +REGRESS_TARGETS = one two multi comment REGRESS_TARGETS += B bs_man bs_mdoc c c_man E1 e f h hneg l O1 o p w z REGRESS_TARGETS += ignore invalid unsupp HTML_TARGETS = f -LINT_TARGETS = B h l O1 w ignore invalid unsupp +LINT_TARGETS = comment B h l O1 w ignore invalid unsupp # mandoc defect: # - \h with a negative argument replaces output characters diff --git a/regress/roff/esc/comment.in b/regress/roff/esc/comment.in new file mode 100644 index 00000000..692cbf00 --- /dev/null +++ b/regress/roff/esc/comment.in @@ -0,0 +1,25 @@ +.\" $OpenBSD: comment.in,v 1.1 2022/05/01 16:18:59 schwarze Exp $ +.Dd $Mdocdate: May 1 2022 $ +.Dt ROFF-ESC-COMMENT 1 +.Os +.Sh NAME +.Nm roff-esc-comment +.Nd roff(7) comments +.Sh DESCRIPTION +text line cont\ +inuation +.Pp +macro line continuation: +.Op Fl f A\ +r file +.Pp +whitespace \& +at the end of an input line +.Pp +text line with \"not printed\ +comment +.Pp +continuation \#not printed +requested by a comment +.Pp +Surpisingly, the sequence \\" does not start a comment. diff --git a/regress/roff/esc/comment.out_ascii b/regress/roff/esc/comment.out_ascii new file mode 100644 index 00000000..a8698686 --- /dev/null +++ b/regress/roff/esc/comment.out_ascii @@ -0,0 +1,19 @@ +ROFF-ESC-COMMENT(1) General Commands Manual ROFF-ESC-COMMENT(1) + +NNAAMMEE + rrooffff--eesscc--ccoommmmeenntt - roff(7) comments + +DDEESSCCRRIIPPTTIIOONN + text line continuation + + macro line continuation: [--ff _f_i_l_e] + + whitespace at the end of an input line + + text line with comment + + continuation requested by a comment + + Surpisingly, the sequence \" does not start a comment. + +OpenBSD May 1, 2022 OpenBSD diff --git a/regress/roff/esc/comment.out_lint b/regress/roff/esc/comment.out_lint new file mode 100644 index 00000000..2844ea8c --- /dev/null +++ b/regress/roff/esc/comment.out_lint @@ -0,0 +1 @@ +mandoc: comment.in:22:29: STYLE: whitespace at end of input line -- cgit v1.2.3-56-ge451