From: schwarze@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: better handle .In .Sh .Ss .St .Xr without arguments
Date: Thu, 5 Feb 2015 20:07:53 -0500 (EST) [thread overview]
Message-ID: <10815237862129348769.enqueue@fantadrom.bsd.lv> (raw)
Log Message:
-----------
better handle .In .Sh .Ss .St .Xr without arguments
Modified Files:
--------------
mdocml:
mdoc_macro.c
mdoc_validate.c
Revision Data
-------------
Index: mdoc_validate.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_validate.c,v
retrieving revision 1.271
retrieving revision 1.272
diff -Lmdoc_validate.c -Lmdoc_validate.c -u -p -r1.271 -r1.272
--- mdoc_validate.c
+++ mdoc_validate.c
@@ -156,7 +156,7 @@ static const struct valids mdoc_valids[M
{ NULL, post_fn }, /* Fn */
{ NULL, NULL }, /* Ft */
{ NULL, NULL }, /* Ic */
- { NULL, ewarn_eq1 }, /* In */
+ { NULL, NULL }, /* In */
{ NULL, post_defaults }, /* Li */
{ NULL, post_nd }, /* Nd */
{ NULL, post_nm }, /* Nm */
@@ -167,7 +167,7 @@ static const struct valids mdoc_valids[M
{ NULL, post_st }, /* St */
{ NULL, NULL }, /* Va */
{ NULL, post_vt }, /* Vt */
- { NULL, ewarn_ge1 }, /* Xr */
+ { NULL, NULL }, /* Xr */
{ NULL, ewarn_ge1 }, /* %A */
{ NULL, post_hyphtext }, /* %B */ /* FIXME: can be used outside Rs/Re. */
{ NULL, ewarn_ge1 }, /* %D */
@@ -1640,13 +1640,6 @@ post_st(POST_ARGS)
n = mdoc->last;
nch = n->child;
- if (NULL == nch) {
- mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
- n->line, n->pos, mdoc_macronames[n->tok]);
- mdoc_node_delete(mdoc, n);
- return;
- }
-
assert(MDOC_TEXT == nch->type);
if (NULL == (p = mdoc_a2st(nch->string))) {
@@ -2076,7 +2069,6 @@ post_ignpar(POST_ARGS)
{
struct mdoc_node *np;
- check_count(mdoc, MDOC_HEAD, CHECK_GT, 0);
post_hyph(mdoc);
if (MDOC_BODY != mdoc->last->type)
Index: mdoc_macro.c
===================================================================
RCS file: /home/cvs/mdocml/mdocml/mdoc_macro.c,v
retrieving revision 1.176
retrieving revision 1.177
diff -Lmdoc_macro.c -Lmdoc_macro.c -u -p -r1.176 -r1.177
--- mdoc_macro.c
+++ mdoc_macro.c
@@ -904,6 +904,12 @@ blk_full(MACRO_PROT_ARGS)
nl = MDOC_NEWLINE & mdoc->flags;
+ if (buf[*pos] == '\0' && (tok == MDOC_Sh || tok == MDOC_Ss)) {
+ mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+ line, ppos, mdoc_macronames[tok]);
+ return;
+ }
+
if ( ! (mdoc_macros[tok].flags & MDOC_EXPLICIT)) {
/* Here, tok is one of Sh Ss Nm Nd It. */
@@ -1367,6 +1373,11 @@ in_line_argn(MACRO_PROT_ARGS)
}
if (j == 0) {
+ if (tok == MDOC_In || tok == MDOC_St || tok == MDOC_Xr) {
+ mandoc_msg(MANDOCERR_MACRO_EMPTY, mdoc->parse,
+ line, ppos, mdoc_macronames[tok]);
+ return;
+ }
mdoc_elem_alloc(mdoc, line, ppos, tok, arg);
if (ac == ARGS_PUNCT && tok == MDOC_Pf)
append_delims(mdoc, line, pos, buf);
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2015-02-06 1:07 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10815237862129348769.enqueue@fantadrom.bsd.lv \
--to=schwarze@mdocml.bsd.lv \
--cc=source@mdocml.bsd.lv \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).