From: kristaps@mdocml.bsd.lv
To: source@mdocml.bsd.lv
Subject: mdocml: Make libman use mandoc_getcontrol() for real this time.
Date: Tue, 29 Mar 2011 04:30:49 -0400 (EDT) [thread overview]
Message-ID: <201103290830.p2T8UnQM022852@krisdoz.my.domain> (raw)
Log Message:
-----------
Make libman use mandoc_getcontrol() for real this time.
Modified Files:
--------------
mdocml:
man.c
Revision Data
-------------
Index: man.c
===================================================================
RCS file: /usr/vhosts/mdocml.bsd.lv/cvs/mdocml/man.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -Lman.c -Lman.c -u -p -r1.106 -r1.107
--- man.c
+++ man.c
@@ -130,7 +130,8 @@ man_parseln(struct man *m, int ln, char
m->flags |= MAN_NEWLINE;
assert( ! (MAN_HALT & m->flags));
- return(('.' == buf[offs] || '\'' == buf[offs]) ?
+
+ return (mandoc_getcontrol(buf, &offs) ?
man_pmacro(m, ln, buf, offs) :
man_ptext(m, ln, buf, offs));
}
@@ -421,21 +422,11 @@ man_descope(struct man *m, int line, int
return(man_body_alloc(m, line, offs, m->last->tok));
}
-
static int
man_ptext(struct man *m, int line, char *buf, int offs)
{
int i;
- /* Ignore bogus comments. */
-
- if ('\\' == buf[offs] &&
- '.' == buf[offs + 1] &&
- '"' == buf[offs + 2]) {
- man_pmsg(m, line, offs, MANDOCERR_BADCOMMENT);
- return(1);
- }
-
/* Literal free-form text whitespace is preserved. */
if (MAN_LITERAL & m->flags) {
@@ -493,50 +484,36 @@ man_ptext(struct man *m, int line, char
return(man_descope(m, line, offs));
}
-
static int
man_pmacro(struct man *m, int ln, char *buf, int offs)
{
- int i, j, ppos;
+ int i, ppos;
enum mant tok;
char mac[5];
struct man_node *n;
- /* Comments and empties are quickly ignored. */
-
- offs++;
-
- if ('\0' == buf[offs])
+ if ('"' == buf[offs]) {
+ man_pmsg(m, ln, offs, MANDOCERR_BADCOMMENT);
+ return(1);
+ } else if ('\0' == buf[offs])
return(1);
- i = offs;
-
- /*
- * Skip whitespace between the control character and initial
- * text. "Whitespace" is both spaces and tabs.
- */
-
- if (' ' == buf[i] || '\t' == buf[i]) {
- i++;
- while (buf[i] && (' ' == buf[i] || '\t' == buf[i]))
- i++;
- if ('\0' == buf[i])
- goto out;
- }
-
- ppos = i;
+ ppos = offs;
/*
* Copy the first word into a nil-terminated buffer.
* Stop copying when a tab, space, or eoln is encountered.
*/
- j = 0;
- while (j < 4 && '\0' != buf[i] && ' ' != buf[i] && '\t' != buf[i])
- mac[j++] = buf[i++];
- mac[j] = '\0';
+ i = 0;
+ while (i < 4 && '\0' != buf[offs] &&
+ ' ' != buf[offs] && '\t' != buf[offs])
+ mac[i++] = buf[offs++];
+
+ mac[i] = '\0';
+
+ tok = (i > 0 && i < 4) ? man_hash_find(mac) : MAN_MAX;
- tok = (j > 0 && j < 4) ? man_hash_find(mac) : MAN_MAX;
if (MAN_MAX == tok) {
mandoc_vmsg(MANDOCERR_MACRO, m->parse, ln,
ppos, "%s", buf + ppos - 1);
@@ -545,16 +522,16 @@ man_pmacro(struct man *m, int ln, char *
/* The macro is sane. Jump to the next word. */
- while (buf[i] && ' ' == buf[i])
- i++;
+ while (buf[offs] && ' ' == buf[offs])
+ offs++;
/*
* Trailing whitespace. Note that tabs are allowed to be passed
* into the parser as "text", so we only warn about spaces here.
*/
- if ('\0' == buf[i] && ' ' == buf[i - 1])
- man_pmsg(m, ln, i - 1, MANDOCERR_EOLNSPACE);
+ if ('\0' == buf[offs] && ' ' == buf[offs - 1])
+ man_pmsg(m, ln, offs - 1, MANDOCERR_EOLNSPACE);
/*
* Remove prior ELINE macro, as it's being clobbered by a new
@@ -591,10 +568,9 @@ man_pmacro(struct man *m, int ln, char *
/* Call to handler... */
assert(man_macros[tok].fp);
- if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &i, buf))
+ if ( ! (*man_macros[tok].fp)(m, tok, ln, ppos, &offs, buf))
goto err;
-out:
/*
* We weren't in a block-line scope when entering the
* above-parsed macro, so return.
@@ -631,7 +607,7 @@ out:
if ( ! man_unscope(m, m->last->parent, MANDOCERR_MAX))
return(0);
- return(man_body_alloc(m, ln, offs, m->last->tok));
+ return(man_body_alloc(m, ln, ppos, m->last->tok));
err: /* Error out. */
--
To unsubscribe send an email to source+unsubscribe@mdocml.bsd.lv
reply other threads:[~2011-03-29 8:30 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=201103290830.p2T8UnQM022852@krisdoz.my.domain \
--to=kristaps@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).