summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKristaps Dzonsons <kristaps@bsd.lv>2010-07-18 22:55:06 +0000
committerKristaps Dzonsons <kristaps@bsd.lv>2010-07-18 22:55:06 +0000
commit142f3db069bd40d760a2926765c0e051b7789cdf (patch)
treea7b636f8a532e68e56018309f3a16f4cddf54b1a
parentb3729dc0b7e8a9d8bc2b72799e6a7d50e94aaa7b (diff)
downloadmandoc-142f3db069bd40d760a2926765c0e051b7789cdf.tar.gz
Throw out a2roffdeco() in out.c for a readable version. The prior one
was completely unmaintainable. The new one is both readable and quite similar to mandoc_special(), which in future versions will easily allow throwing-away of unsupported escapes (such as \m). It's also a fair bit smaller. DECO_SIZE has been removed: this crap, like colours, will not be supported. mandoc_special() also has #if 0'd switch branches for ALL groff.7 escapes and some lint fixes.
-rw-r--r--mandoc.c63
-rw-r--r--out.c269
-rw-r--r--out.h1
3 files changed, 151 insertions, 182 deletions
diff --git a/mandoc.c b/mandoc.c
index 80972279..83dafb33 100644
--- a/mandoc.c
+++ b/mandoc.c
@@ -48,6 +48,49 @@ mandoc_special(char *p)
p++;
switch (*p++) {
+#if 0
+ case ('Z'):
+ /* FALLTHROUGH */
+ case ('X'):
+ /* FALLTHROUGH */
+ case ('x'):
+ /* FALLTHROUGH */
+ case ('w'):
+ /* FALLTHROUGH */
+ case ('v'):
+ /* FALLTHROUGH */
+ case ('S'):
+ /* FALLTHROUGH */
+ case ('R'):
+ /* FALLTHROUGH */
+ case ('o'):
+ /* FALLTHROUGH */
+ case ('N'):
+ /* FALLTHROUGH */
+ case ('l'):
+ /* FALLTHROUGH */
+ case ('L'):
+ /* FALLTHROUGH */
+ case ('H'):
+ /* FALLTHROUGH */
+ case ('h'):
+ /* FALLTHROUGH */
+ case ('D'):
+ /* FALLTHROUGH */
+ case ('C'):
+ /* FALLTHROUGH */
+ case ('b'):
+ /* FALLTHROUGH */
+ case ('B'):
+ /* FALLTHROUGH */
+ case ('a'):
+ /* FALLTHROUGH */
+ case ('A'):
+ if (*p++ != '\'')
+ return(0);
+ term = '\'';
+ break;
+#endif
case ('s'):
if (ASCII_HYPH == *p)
*p = '-';
@@ -83,6 +126,22 @@ mandoc_special(char *p)
if (0 == i)
return(0);
break;
+#if 0
+ case ('Y'):
+ /* FALLTHROUGH */
+ case ('V'):
+ /* FALLTHROUGH */
+ case ('$'):
+ /* FALLTHROUGH */
+ case ('n'):
+ /* FALLTHROUGH */
+ case ('k'):
+ /* FALLTHROUGH */
+#endif
+ case ('M'):
+ /* FALLTHROUGH */
+ case ('m'):
+ /* FALLTHROUGH */
case ('f'):
/* FALLTHROUGH */
case ('F'):
@@ -117,13 +176,13 @@ mandoc_special(char *p)
for ( ; *p && term != *p; p++)
if (ASCII_HYPH == *p)
*p = '-';
- return(*p ? p - sv : 0);
+ return(*p ? (int)(p - sv) : 0);
}
for (i = 0; *p && i < len; i++, p++)
if (ASCII_HYPH == *p)
*p = '-';
- return(i == len ? p - sv : 0);
+ return(i == len ? (int)(p - sv) : 0);
}
diff --git a/out.c b/out.c
index 347338c3..d5520604 100644
--- a/out.c
+++ b/out.c
@@ -1,6 +1,6 @@
/* $Id$ */
/*
- * Copyright (c) 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv>
*
* Permission to use, copy, modify, and distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
@@ -29,26 +29,6 @@
#include "out.h"
-/* See a2roffdeco(). */
-#define C2LIM(c, l) do { \
- (l) = 1; \
- if ('[' == (c) || '\'' == (c)) \
- (l) = 0; \
- else if ('(' == (c)) \
- (l) = 2; } \
- while (/* CONSTCOND */ 0)
-
-/* See a2roffdeco(). */
-#define C2TERM(c, t) do { \
- (t) = 0; \
- if ('\'' == (c)) \
- (t) = 1; \
- else if ('[' == (c)) \
- (t) = 2; \
- else if ('(' == (c)) \
- (t) = 3; } \
- while (/* CONSTCOND */ 0)
-
/*
* Convert a `scaling unit' to a consistent form, or fail. Scaling
* units are documented in groff.7, mdoc.7, man.7.
@@ -185,213 +165,144 @@ time2a(time_t t, char *dst, size_t sz)
}
-/*
- * Returns length of parsed string (the leading "\" should NOT be
- * included). This can be zero if the current character is the nil
- * terminator. "d" is set to the type of parsed decorator, which may
- * have an adjoining "word" of size "sz" (e.g., "(ab" -> "ab", 2).
- */
int
-a2roffdeco(enum roffdeco *d,
- const char **word, size_t *sz)
+a2roffdeco(enum roffdeco *d, const char **word, size_t *sz)
{
- int j, term, lim;
- char set;
- const char *wp, *sp;
+ int i, j, lim;
+ char term, c;
+ const char *wp;
*d = DECO_NONE;
+ lim = i = 0;
+ term = '\0';
wp = *word;
- switch ((set = *wp)) {
- case ('\0'):
- return(0);
-
+ switch ((c = wp[i++])) {
case ('('):
- if ('\0' == *(++wp))
- return(1);
- if ('\0' == *(wp + 1))
- return(2);
-
*d = DECO_SPECIAL;
- *sz = 2;
- *word = wp;
- return(3);
-
+ lim = 2;
+ break;
case ('F'):
/* FALLTHROUGH */
case ('f'):
- /*
- * FIXME: this needs work and consolidation (it should
- * follow the sequence that special characters do, for
- * one), but isn't a priority at the moment. Note, for
- * one, that in reality \fB != \FB, although here we let
- * these slip by.
- */
- switch (*(++wp)) {
- case ('\0'):
- return(1);
+ *d = 'F' == c ? DECO_FFONT : DECO_FONT;
+
+ switch (wp[i++]) {
+ case ('('):
+ lim = 2;
+ break;
+ case ('['):
+ term = ']';
+ break;
case ('3'):
/* FALLTHROUGH */
case ('B'):
*d = DECO_BOLD;
- return(2);
+ return(i);
case ('2'):
/* FALLTHROUGH */
case ('I'):
*d = DECO_ITALIC;
- return(2);
+ return(i);
case ('P'):
*d = DECO_PREVIOUS;
- return(2);
+ return(i);
case ('1'):
/* FALLTHROUGH */
case ('R'):
*d = DECO_ROMAN;
- return(2);
- case ('('):
- if ('\0' == *(++wp))
- return(2);
- if ('\0' == *(wp + 1))
- return(3);
-
- *d = 'F' == set ? DECO_FFONT : DECO_FONT;
- *sz = 2;
- *word = wp;
- return(4);
- case ('['):
- *word = ++wp;
- for (j = 0; *wp && ']' != *wp; wp++, j++)
- /* Loop... */ ;
-
- if ('\0' == *wp)
- return(j + 2);
-
- *d = 'F' == set ? DECO_FFONT : DECO_FONT;
- *sz = (size_t)j;
- return(j + 3);
+ return(i);
default:
+ i--;
+ lim = 1;
break;
}
-
- *d = 'F' == set ? DECO_FFONT : DECO_FONT;
- *sz = 1;
- *word = wp;
- return(2);
-
+ break;
case ('*'):
- switch (*(++wp)) {
- case ('\0'):
- return(1);
-
+ *d = DECO_RESERVED;
+ switch (wp[i++]) {
case ('('):
- if ('\0' == *(++wp))
- return(2);
- if ('\0' == *(wp + 1))
- return(3);
-
- *d = DECO_RESERVED;
- *sz = 2;
- *word = wp;
- return(4);
-
+ lim = 2;
+ break;
case ('['):
- *word = ++wp;
- for (j = 0; *wp && ']' != *wp; wp++, j++)
- /* Loop... */ ;
-
- if ('\0' == *wp)
- return(j + 2);
-
- *d = DECO_RESERVED;
- *sz = (size_t)j;
- return(j + 3);
-
+ term = ']';
+ break;
default:
+ i--;
+ lim = 1;
break;
}
-
- *d = DECO_RESERVED;
- *sz = 1;
- *word = wp;
- return(2);
-
+ break;
case ('s'):
- sp = wp;
- if ('\0' == *(++wp))
- return(1);
-
- C2LIM(*wp, lim);
- C2TERM(*wp, term);
+ if ('+' == wp[i] || '-' == wp[i])
+ i++;
- if (term)
- wp++;
+ j = ('s' != wp[i - 1]);
- *word = wp;
-
- if (*wp == '+' || *wp == '-')
- ++wp;
-
- switch (*wp) {
- case ('\''):
- /* FALLTHROUGH */
- case ('['):
- /* FALLTHROUGH */
+ switch (wp[i++]) {
case ('('):
- if (term)
- return((int)(wp - sp));
-
- C2LIM(*wp, lim);
- C2TERM(*wp, term);
- wp++;
+ lim = 2;
+ break;
+ case ('['):
+ term = ']';
+ break;
+ case ('\''):
+ term = '\'';
break;
default:
+ i--;
+ lim = 1;
break;
}
- if ( ! isdigit((u_char)*wp))
- return((int)(wp - sp));
-
- for (j = 0; isdigit((u_char)*wp); j++) {
- if (lim && j >= lim)
- break;
- ++wp;
- }
-
- if (term && term < 3) {
- if (1 == term && *wp != '\'')
- return((int)(wp - sp));
- if (2 == term && *wp != ']')
- return((int)(wp - sp));
- ++wp;
- }
-
- *d = DECO_SIZE;
- return((int)(wp - sp));
-
+ if ('+' == wp[i] || '-' == wp[i]) {
+ if (j++)
+ return(i);
+ i++;
+ }
+
+ if (0 == j)
+ return(i);
+ break;
case ('['):
- *word = ++wp;
-
- for (j = 0; *wp && ']' != *wp; wp++, j++)
- /* Loop... */ ;
-
- if ('\0' == *wp)
- return(j + 1);
-
*d = DECO_SPECIAL;
- *sz = (size_t)j;
- return(j + 2);
-
+ term = ']';
+ break;
case ('c'):
*d = DECO_NOSPACE;
- *sz = 1;
- return(1);
-
+ return(i);
default:
+ *d = DECO_SPECIAL;
+ i--;
+ lim = 1;
break;
}
- *d = DECO_SPECIAL;
- *word = wp;
- *sz = 1;
- return(1);
+ assert(term || lim);
+ *word = &wp[i];
+
+ if (term) {
+ j = i;
+ while (wp[i] && wp[i] != term)
+ i++;
+ if ('\0' == wp[i]) {
+ *d = DECO_NONE;
+ return(i);
+ }
+
+ assert(i >= j);
+ *sz = (size_t)(i - j);
+
+ return(i + 1);
+ }
+
+ assert(lim > 0);
+ *sz = (size_t)lim;
+
+ for (j = 0; wp[i] && j < lim; j++)
+ i++;
+ if (j < lim)
+ *d = DECO_NONE;
+
+ return(i);
}
diff --git a/out.h b/out.h
index 80a2d40c..c787f0c6 100644
--- a/out.h
+++ b/out.h
@@ -43,7 +43,6 @@ enum roffdeco {
DECO_ITALIC,
DECO_ROMAN,
DECO_PREVIOUS,
- DECO_SIZE,
DECO_NOSPACE,
DECO_FONT, /* font */
DECO_FFONT, /* font family */