* mdocml: Merge schwarze@'s relaxation of scope-breaking rules: allow
@ 2010-12-06 11:01 kristaps
0 siblings, 0 replies; only message in thread
From: kristaps @ 2010-12-06 11:01 UTC (permalink / raw)
To: source
Log Message:
-----------
Merge schwarze@'s relaxation of scope-breaking rules: allow implicit
ending of scopes and drop stray scope-endings.
Modified Files:
--------------
mdocml:
main.c
mandoc.h
mdoc.c
mdoc_macro.c
Revision Data
-------------
Index: mdoc_macro.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc_macro.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -Lmdoc_macro.c -Lmdoc_macro.c -u -p -r1.97 -r1.98
--- mdoc_macro.c
+++ mdoc_macro.c
@@ -34,6 +34,7 @@ enum rew { /* see rew_dohalt() */
REWIND_NONE,
REWIND_THIS,
REWIND_MORE,
+ REWIND_FORCE,
REWIND_LATER,
REWIND_ERROR
};
@@ -320,6 +321,7 @@ rew_alt(enum mdoct tok)
* inside *p, so there is no need to rewind anything at all.
* REWIND_THIS: *p matches tok, so rewind *p and nothing else.
* REWIND_MORE: *p is implicit, rewind it and keep searching for tok.
+ * REWIND_FORCE: *p is explicit, but tok is full, force rewinding *p.
* REWIND_LATER: *p is explicit and still open, postpone rewinding.
* REWIND_ERROR: No tok block is open at all.
*/
@@ -413,16 +415,13 @@ rew_dohalt(enum mdoct tok, enum mdoc_typ
return(REWIND_MORE);
/*
- * Partial blocks allow delayed rewinding by default.
+ * By default, closing out full blocks
+ * forces closing of broken explicit blocks,
+ * while closing out partial blocks
+ * allows delayed rewinding by default.
*/
- if (&blk_full != mdoc_macros[tok].fp)
- return (REWIND_LATER);
-
- /*
- * Full blocks can only be rewound when matching
- * or when there is an explicit rule.
- */
- return(REWIND_ERROR);
+ return (&blk_full == mdoc_macros[tok].fp ?
+ REWIND_FORCE : REWIND_LATER);
}
@@ -513,9 +512,7 @@ make_pending(struct mdoc_node *broken, e
/*
* Found no matching block for tok.
* Are you trying to close a block that is not open?
- * XXX Make this non-fatal.
*/
- mdoc_pmsg(m, line, ppos, MANDOCERR_SYNTNOSCOPE);
return(0);
}
@@ -533,17 +530,22 @@ rew_sub(enum mdoc_type t, struct mdoc *m
return(1);
case (REWIND_THIS):
break;
+ case (REWIND_FORCE):
+ mdoc_vmsg(m, MANDOCERR_SCOPEBROKEN, line, ppos,
+ "%s breaks %s", mdoc_macronames[tok],
+ mdoc_macronames[n->tok]);
+ /* FALLTHROUGH */
case (REWIND_MORE):
n = n->parent;
continue;
case (REWIND_LATER):
- return(make_pending(n, tok, m, line, ppos));
+ if (make_pending(n, tok, m, line, ppos) ||
+ MDOC_BLOCK != t)
+ return(1);
+ /* FALLTHROUGH */
case (REWIND_ERROR):
- /* XXX Make this non-fatal. */
- mdoc_vmsg(m, MANDOCERR_SCOPEFATAL, line, ppos,
- "%s cannot break %s", mdoc_macronames[tok],
- mdoc_macronames[n->tok]);
- return 0;
+ mdoc_pmsg(m, line, ppos, MANDOCERR_NOSCOPE);
+ return(1);
}
break;
}
@@ -671,8 +673,7 @@ blk_exp_close(MACRO_PROT_ARGS)
* postpone closing out the current block
* until the rew_sub() closing out the sub-block.
*/
- if ( ! make_pending(later, tok, m, line, ppos))
- return(0);
+ make_pending(later, tok, m, line, ppos);
/*
* Mark the place where the formatting - but not
@@ -1274,8 +1275,7 @@ blk_part_imp(MACRO_PROT_ARGS)
if (MDOC_BLOCK == n->type &&
MDOC_EXPLICIT & mdoc_macros[n->tok].flags &&
! (MDOC_VALID & n->flags)) {
- if ( ! make_pending(n, tok, m, line, ppos))
- return(0);
+ make_pending(n, tok, m, line, ppos);
if ( ! mdoc_endbody_alloc(m, line, ppos,
tok, body, ENDBODY_NOSPACE))
return(0);
Index: mdoc.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mdoc.c,v
retrieving revision 1.167
retrieving revision 1.168
diff -Lmdoc.c -Lmdoc.c -u -p -r1.167 -r1.168
--- mdoc.c
+++ mdoc.c
@@ -766,9 +766,7 @@ mdoc_pmacro(struct mdoc *m, int ln, char
tok = (j > 1 || j < 4) ? mdoc_hash_find(mac) : MDOC_MAX;
if (MDOC_MAX == tok) {
- mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv,
- "unknown macro: %s%s",
- buf, strlen(buf) > 3 ? "..." : "");
+ mdoc_vmsg(m, MANDOCERR_MACRO, ln, sv, "%s", buf + sv - 1);
return(1);
}
Index: mandoc.h
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/mandoc.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -Lmandoc.h -Lmandoc.h -u -p -r1.29 -r1.30
--- mandoc.h
+++ mandoc.h
@@ -89,6 +89,7 @@ enum mandocerr {
MANDOCERR_LINESCOPE, /* line scope broken */
MANDOCERR_ARGCOUNT, /* argument count wrong */
MANDOCERR_NOSCOPE, /* no such block is open */
+ MANDOCERR_SCOPEBROKEN, /* missing end of block */
MANDOCERR_SCOPEREP, /* scope already open */
MANDOCERR_SCOPEEXIT, /* scope open on exit */
MANDOCERR_UNAME, /* uname(3) system call failed */
Index: main.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/main.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -Lmain.c -Lmain.c -u -p -r1.118 -r1.119
--- main.c
+++ main.c
@@ -187,6 +187,7 @@ static const char * const mandocerrs[MAN
"unsupported display type",
"blocks badly nested",
"no such block is open",
+ "missing end of block",
"line scope broken, syntax violated",
"argument count wrong, violates syntax",
"child violates parent syntax",
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2010-12-06 11:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-12-06 11:01 mdocml: Merge schwarze@'s relaxation of scope-breaking rules: allow kristaps
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).