[PATCH] implement .rm

[Ingo Schwarze <schwarze@usta.de>]

Hi Kristaps,

Kristaps Dzonsons wrote on Tue, Jan 11, 2011 at 12:10:18AM +0100:
> On 10/01/2011 23:52, Ingo Schwarze wrote:

>> i just started to implement .rm (remove macro) in libroff,
>> then realized that i would be introducing the third place
>> where names (that is, to be precise, roff macro and string names)
>> get parsed.

Having roff_getname(), this is now really easy.

> Ingo, I'm fine with this.

Thanks for looking, i'm putting that into both trees right now.

> Let me know when your changes into libroff are finished---

After the patch appended below.  ;-)

> I want to
> hash setstr() stuff, as there are a lot of pod2man and man pages
> with lots of requests, and we can probably make a measurably impact
> on performance.

Hmm, last time i did an optimization in libroff, it gave us
2% speedup on ksh(1).  Yes, that was measurable, though the
measurement was somewhat non-trivial.  :)

Thus, i will believe this gives us a measureable improvement
when i see the measurement!

Using hash tables (or RB-trees?) probably makes sense, but please
try to not hack up a third (or fourth?  i have lost count)
independent hash table implementation in mandoc.  ;-)

Yours,
  Ingo


diff -Napur mandoc.getname/roff.c mandoc/roff.c
--- mandoc.getname/roff.c	Mon Jan 10 15:24:03 2011
+++ mandoc/roff.c	Mon Jan 10 16:25:48 2011
@@ -134,10 +134,10 @@ static	char		*roff_getname(struct roff *, char **, int
 static	const char	*roff_getstrn(const struct roff *, 
 				const char *, size_t);
 static	enum rofferr	 roff_line_ignore(ROFF_ARGS);
-static	enum rofferr	 roff_line_error(ROFF_ARGS);
 static	enum rofferr	 roff_nr(ROFF_ARGS);
 static	int		 roff_res(struct roff *, 
 				char **, size_t *, int);
+static	enum rofferr	 roff_rm(ROFF_ARGS);
 static	void		 roff_setstr(struct roff *,
 				const char *, const char *, int);
 static	enum rofferr	 roff_so(ROFF_ARGS);
@@ -171,7 +171,7 @@ static	struct roffmac	 roffs[ROFF_MAX] = {
 	{ "ne", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ "nh", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ "nr", roff_nr, NULL, NULL, 0, NULL },
-	{ "rm", roff_line_error, NULL, NULL, 0, NULL },
+	{ "rm", roff_rm, NULL, NULL, 0, NULL },
 	{ "so", roff_so, NULL, NULL, 0, NULL },
 	{ "tr", roff_line_ignore, NULL, NULL, 0, NULL },
 	{ "TS", roff_TS, NULL, NULL, 0, NULL },
@@ -936,15 +936,6 @@ roff_line_ignore(ROFF_ARGS)
 
 /* ARGSUSED */
 static enum rofferr
-roff_line_error(ROFF_ARGS)
-{
-
-	(*r->msg)(MANDOCERR_REQUEST, r->data, ln, ppos, roffs[tok].name);
-	return(ROFF_IGN);
-}
-
-/* ARGSUSED */
-static enum rofferr
 roff_cond(ROFF_ARGS)
 {
 	int		 sv;
@@ -1086,6 +1077,22 @@ roff_nr(ROFF_ARGS)
 			rg[(int)REG_nS].v.u = 0;
 	}
 
+	return(ROFF_IGN);
+}
+
+/* ARGSUSED */
+static enum rofferr
+roff_rm(ROFF_ARGS)
+{
+	const char	 *name;
+	char		 *cp;
+
+	cp = *bufp + pos;
+	while ('\0' != *cp) {
+		name = roff_getname(r, &cp, ln, cp - *bufp);
+		if ('\0' != *name)
+			roff_setstr(r, name, NULL, 0);
+	}
 	return(ROFF_IGN);
 }
 
--
 To unsubscribe send an email to tech+unsubscribe@mdocml.bsd.lv