-/* $Id: mdoc_macro.c,v 1.17 2009/07/07 09:29:15 kristaps Exp $ */
+/* $Id: mdoc_macro.c,v 1.24 2009/07/19 21:26:27 kristaps Exp $ */
/*
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
*
{ in_line_eoln, MDOC_PROLOGUE }, /* Os */
{ blk_full, 0 }, /* Sh */
{ blk_full, 0 }, /* Ss */
- { in_line, 0 }, /* Pp */
+ { in_line_eoln, 0 }, /* Pp */
{ blk_part_imp, MDOC_PARSED }, /* D1 */
{ blk_part_imp, MDOC_PARSED }, /* Dl */
{ blk_full, MDOC_EXPLICIT }, /* Bd */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */
- { in_line_eoln, MDOC_CALLABLE }, /* Cd */
+ { in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cd */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Dv */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Er */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */
- { in_line_eoln, 0 }, /* In */ /* FIXME: historic usage! */
+ { in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* In */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */
- { in_line_eoln, 0 }, /* Nd */
+ { blk_full, 0 }, /* Nd */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Op */
{ obsolete, 0 }, /* Ot */
{ obsolete, 0 }, /* Fr */
{ in_line_eoln, 0 }, /* Ud */
{ in_line_eoln, 0 }, /* Lb */
- { in_line, 0 }, /* Lp */
+ { in_line_eoln, 0 }, /* Lp */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Lk */
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Mt */
{ blk_part_imp, MDOC_CALLABLE | MDOC_PARSED }, /* Brq */
{ obsolete, 0 }, /* En */
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Dx */
{ in_line_eoln, 0 }, /* %Q */
+ { in_line_eoln, 0 }, /* br */
+ { in_line_eoln, 0 }, /* sp */
};
const struct mdoc_macro * const mdoc_macros = __mdoc_macros;
if (type == p->type && tok == p->tok)
return(REWIND_REWIND);
break;
+ case (MDOC_Nd):
+ /* FALLTHROUGH */
case (MDOC_Ss):
assert(MDOC_TAIL != type);
if (type == p->type && tok == p->tok)
switch (tok) {
case (MDOC_It):
return(MDOC_It == p->tok);
+ case (MDOC_Nd):
+ return(MDOC_Nd == p->tok);
case (MDOC_Ss):
return(MDOC_Ss == p->tok);
case (MDOC_Sh):
+ if (MDOC_Nd == p->tok)
+ return(1);
if (MDOC_Ss == p->tok)
return(1);
return(MDOC_Sh == p->tok);
}
if ( ! (MDOC_CALLABLE & mdoc_macros[tok].flags)) {
- if (0 == buf[*pos]) {
- if ( ! rew_subblock(MDOC_BODY, mdoc,
- tok, line, ppos))
+ if (buf[*pos])
+ if ( ! mdoc_pwarn(mdoc, line, ppos, ENOLINE))
return(0);
- return(rew_expblock(mdoc, tok, line, ppos));
- }
- return(mdoc_perr(mdoc, line, ppos, ENOLINE));
+
+ if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
+ return(0);
+ return(rew_expblock(mdoc, tok, line, ppos));
}
if ( ! rew_subblock(MDOC_BODY, mdoc, tok, line, ppos))
* usually because of reserved words) to squeak by.
*/
switch (tok) {
- case (MDOC_Lp):
- /* FALLTHROUGH */
- case (MDOC_Pp):
- /* FALLTHROUGH */
case (MDOC_Nm):
/* FALLTHROUGH */
case (MDOC_Fl):
static int
blk_full(MACRO_PROT_ARGS)
{
- int c, lastarg, reopen;
+ int c, lastarg, reopen, dohead;
struct mdoc_arg *arg;
char *p;
+ /*
+ * Whether to process a block-head section. If this is
+ * non-zero, then a head will be opened for all line arguments.
+ * If not, then the head will always be empty and only a body
+ * will be opened, which will stay open at the eoln.
+ */
+
+ switch (tok) {
+ case (MDOC_Nd):
+ dohead = 0;
+ break;
+ default:
+ dohead = 1;
+ break;
+ }
+
if ( ! (MDOC_EXPLICIT & mdoc_macros[tok].flags)) {
if ( ! rew_subblock(MDOC_BODY, mdoc,
tok, line, ppos))
if ( ! mdoc_head_alloc(mdoc, line, ppos, tok))
return(0);
+
+ /* Immediately close out head and enter body, if applicable. */
+
+ if (0 == dohead) {
+ if ( ! rew_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
+ return(0);
+ if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
+ return(0);
+ }
+
mdoc->next = MDOC_NEXT_CHILD;
for (reopen = 0;; ) {
if (ARGS_EOLN == c)
break;
if (ARGS_PHRASE == c) {
+ assert(dohead);
if (reopen && ! mdoc_head_alloc
(mdoc, line, ppos, tok))
return(0);
if (1 == ppos && ! append_delims(mdoc, line, pos, buf))
return(0);
+
+ /* If the body's already open, then just return. */
+ if (0 == dohead)
+ return(1);
+
if ( ! rew_subblock(MDOC_HEAD, mdoc, tok, line, ppos))
return(0);
-
if ( ! mdoc_body_alloc(mdoc, line, ppos, tok))
return(0);
mdoc->next = MDOC_NEXT_CHILD;
}
+/*
+ * Phrases occur within `Bl -column' entries, separated by `Ta' or tabs.
+ * They're unusual because they're basically free-form text until a
+ * macro is encountered.
+ */
static int
phrase(struct mdoc *mdoc, int line, int ppos, char *buf)
{
- int i, la, c, quoted;
-
- /*
- * Parse over words in a phrase. We have to handle this
- * specially because we assume no calling context -- in normal
- * circumstances, we switch argument parsing based on whether
- * the parent macro accepts quotes, tabs, etc. Here, anything
- * goes.
- */
-
- for (i = ppos; buf[i]; ) {
- assert(' ' != buf[i]);
- la = i;
- quoted = 0;
+ int c, w, la, pos;
+ char *p;
- /*
- * Read to next token. If quoted (check not escaped),
- * scan ahead to next unescaped quote. If not quoted or
- * escape-quoted, then scan ahead to next space.
- */
+ for (pos = ppos; ; ) {
+ la = pos;
- if ((i && '\"' == buf[i] && '\\' != buf[i - 1]) ||
- (0 == i && '\"' == buf[i])) {
- for (la = ++i; buf[i]; i++)
- if ('\"' != buf[i])
- continue;
- else if ('\\' != buf[i - 1])
- break;
- if (0 == buf[i])
- return(mdoc_perr(mdoc, line, la, EQUOTPHR));
- quoted = 1;
- } else
- for ( ; buf[i]; i++)
- if (i && ' ' == buf[i]) {
- if ('\\' != buf[i - 1])
- break;
- } else if (' ' == buf[i])
- break;
-
- /* If not end-of-line, terminate argument. */
-
- if (buf[i])
- buf[i++] = 0;
-
- /* Read to next argument. */
-
- for ( ; buf[i] && ' ' == buf[i]; i++)
- /* Spin. */ ;
+ /* Note: no calling context! */
+ w = mdoc_zargs(mdoc, line, &pos, buf, &p);
- /*
- * If we're a non-quoted string, try to look up the
- * value as a macro and execute it, if found.
- */
+ if (ARGS_ERROR == w)
+ return(0);
+ if (ARGS_EOLN == w)
+ break;
- c = quoted ? MDOC_MAX :
- mdoc_hash_find(mdoc->htab, &buf[la]);
+ c = ARGS_QWORD == w ? MDOC_MAX :
+ mdoc_hash_find(mdoc->htab, p);
- if (MDOC_MAX != c) {
- if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))
+ if (MDOC_MAX != c && -1 != c) {
+ if ( ! mdoc_macro(mdoc, c, line, la, &pos, buf))
return(0);
- return(append_delims(mdoc, line, &i, buf));
- }
-
- /* A regular word or quoted string. */
+ return(append_delims(mdoc, line, &pos, buf));
+ } else if (-1 == c)
+ return(0);
- if ( ! mdoc_word_alloc(mdoc, line, la, &buf[la]))
+ if ( ! mdoc_word_alloc(mdoc, line, la, p))
return(0);
mdoc->next = MDOC_NEXT_SIBLING;
}
return(1);
}
+
+
git.ckatri.com / mandoc.git / blobdiff