-/* $Id: mandoc.c,v 1.21 2010/07/06 22:04:31 kristaps Exp $ */
+/* $Id: mandoc.c,v 1.34 2010/08/29 11:28:09 kristaps Exp $ */
/*
- * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@bsd.lv>
+ * Copyright (c) 2008, 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
#include "libmandoc.h"
static int a2time(time_t *, const char *, const char *);
-static int spec_norm(char *, int);
-
-
-/*
- * "Normalise" a special string by converting its ASCII_HYPH entries
- * into actual hyphens.
- */
-static int
-spec_norm(char *p, int sz)
-{
- int i;
-
- for (i = 0; i < sz; i++)
- if (ASCII_HYPH == p[i])
- p[i] = '-';
-
- return(sz);
-}
int
mandoc_special(char *p)
{
- int terminator; /* Terminator for \s. */
- int lim; /* Limit for N in \s. */
- int c, i;
+ int len, i;
+ char term;
char *sv;
+ len = 0;
+ term = '\0';
sv = p;
- if ('\\' != *p++)
- return(spec_norm(sv, 0));
+ assert('\\' == *p);
+ p++;
- switch (*p) {
- case ('\''):
+ switch (*p++) {
+#if 0
+ case ('Z'):
/* FALLTHROUGH */
- case ('`'):
+ case ('X'):
/* FALLTHROUGH */
- case ('q'):
+ case ('x'):
/* FALLTHROUGH */
- case (ASCII_HYPH):
+ case ('S'):
/* FALLTHROUGH */
- case ('-'):
+ case ('R'):
/* FALLTHROUGH */
- case ('~'):
+ case ('N'):
/* FALLTHROUGH */
- case ('^'):
+ case ('l'):
/* FALLTHROUGH */
- case ('%'):
+ case ('L'):
/* FALLTHROUGH */
- case ('0'):
+ case ('H'):
/* FALLTHROUGH */
- case (' '):
+ case ('h'):
/* FALLTHROUGH */
- case ('}'):
+ case ('D'):
/* FALLTHROUGH */
- case ('|'):
+ case ('C'):
/* FALLTHROUGH */
- case ('&'):
+ case ('b'):
/* FALLTHROUGH */
- case ('.'):
+ case ('B'):
/* FALLTHROUGH */
- case (':'):
+ case ('a'):
/* FALLTHROUGH */
- case ('c'):
+ case ('A'):
+ if (*p++ != '\'')
+ return(0);
+ term = '\'';
+ break;
+#endif
+ case ('h'):
+ /* FALLTHROUGH */
+ case ('v'):
/* FALLTHROUGH */
- case ('e'):
- return(spec_norm(sv, 2));
case ('s'):
- if ('\0' == *++p)
- return(spec_norm(sv, 2));
-
- c = 2;
- terminator = 0;
- lim = 1;
-
- if (*p == '\'') {
- lim = 0;
- terminator = 1;
- ++p;
- ++c;
- } else if (*p == '[') {
- lim = 0;
- terminator = 2;
- ++p;
- ++c;
- } else if (*p == '(') {
- lim = 2;
- terminator = 3;
- ++p;
- ++c;
- }
+ if (ASCII_HYPH == *p)
+ *p = '-';
- if (*p == '+' || *p == '-') {
- ++p;
- ++c;
+ i = 0;
+ if ('+' == *p || '-' == *p) {
+ p++;
+ i = 1;
}
- if (*p == '\'') {
- if (terminator)
- return(spec_norm(sv, 0));
- lim = 0;
- terminator = 1;
- ++p;
- ++c;
- } else if (*p == '[') {
- if (terminator)
- return(spec_norm(sv, 0));
- lim = 0;
- terminator = 2;
- ++p;
- ++c;
- } else if (*p == '(') {
- if (terminator)
- return(spec_norm(sv, 0));
- lim = 2;
- terminator = 3;
- ++p;
- ++c;
+ switch (*p++) {
+ case ('('):
+ len = 2;
+ break;
+ case ('['):
+ term = ']';
+ break;
+ case ('\''):
+ term = '\'';
+ break;
+ case ('0'):
+ i = 1;
+ /* FALLTHROUGH */
+ default:
+ len = 1;
+ p--;
+ break;
}
- /* TODO: needs to handle floating point. */
-
- if ( ! isdigit((u_char)*p))
- return(spec_norm(sv, 0));
-
- for (i = 0; isdigit((u_char)*p); i++) {
- if (lim && i >= lim)
+ if (ASCII_HYPH == *p)
+ *p = '-';
+ if ('+' == *p || '-' == *p) {
+ if (i)
+ return(0);
+ p++;
+ }
+
+ /* Handle embedded numerical subexp or escape. */
+
+ if ('(' == *p) {
+ while (*p && ')' != *p)
+ if ('\\' == *p++) {
+ i = mandoc_special(--p);
+ if (0 == i)
+ return(0);
+ p += i;
+ }
+
+ if (')' == *p++)
break;
- ++p;
- ++c;
- }
- if (terminator && terminator < 3) {
- if (1 == terminator && *p != '\'')
- return(spec_norm(sv, 0));
- if (2 == terminator && *p != ']')
- return(spec_norm(sv, 0));
- ++p;
- ++c;
+ return(0);
+ } else if ('\\' == *p) {
+ if (0 == (i = mandoc_special(p)))
+ return(0);
+ p += i;
}
- return(spec_norm(sv, c));
+ break;
+#if 0
+ case ('Y'):
+ /* FALLTHROUGH */
+ case ('V'):
+ /* FALLTHROUGH */
+ case ('$'):
+ /* FALLTHROUGH */
+ case ('n'):
+ /* FALLTHROUGH */
+#endif
+ case ('k'):
+ /* FALLTHROUGH */
+ case ('M'):
+ /* FALLTHROUGH */
+ case ('m'):
+ /* FALLTHROUGH */
case ('f'):
/* FALLTHROUGH */
case ('F'):
/* FALLTHROUGH */
case ('*'):
- if ('\0' == *++p || isspace((u_char)*p))
- return(spec_norm(sv, 0));
- switch (*p) {
+ switch (*p++) {
case ('('):
- if ('\0' == *++p || isspace((u_char)*p))
- return(spec_norm(sv, 0));
- return(spec_norm(sv, 4));
+ len = 2;
+ break;
case ('['):
- for (c = 3, p++; *p && ']' != *p; p++, c++)
- if (isspace((u_char)*p))
- break;
- return(spec_norm(sv, *p == ']' ? c : 0));
+ term = ']';
+ break;
default:
+ len = 1;
+ p--;
break;
}
- return(spec_norm(sv, 3));
+ break;
case ('('):
- if ('\0' == *++p || isspace((u_char)*p))
- return(spec_norm(sv, 0));
- if ('\0' == *++p || isspace((u_char)*p))
- return(spec_norm(sv, 0));
- return(spec_norm(sv, 4));
+ len = 2;
+ break;
case ('['):
+ term = ']';
break;
+ case ('z'):
+ len = 1;
+ if ('\\' == *p) {
+ if (0 == (i = mandoc_special(p)))
+ return(0);
+ p += i;
+ return(*p ? (int)(p - sv) : 0);
+ }
+ break;
+ case ('o'):
+ /* FALLTHROUGH */
+ case ('w'):
+ if ('\'' == *p++) {
+ term = '\'';
+ break;
+ }
+ /* FALLTHROUGH */
default:
- return(spec_norm(sv, 0));
+ len = 1;
+ p--;
+ break;
}
- for (c = 3, p++; *p && ']' != *p; p++, c++)
- if (isspace((u_char)*p))
- break;
+ if (term) {
+ for ( ; *p && term != *p; p++)
+ if (ASCII_HYPH == *p)
+ *p = '-';
+ return(*p ? (int)(p - sv) : 0);
+ }
- return(spec_norm(sv, *p == ']' ? c : 0));
+ for (i = 0; *p && i < len; i++, p++)
+ if (ASCII_HYPH == *p)
+ *p = '-';
+ return(i == len ? (int)(p - sv) : 0);
}
ptr = calloc(num, size);
if (NULL == ptr) {
perror(NULL);
- exit(EXIT_FAILURE);
+ exit(MANDOCLEVEL_SYSERR);
}
return(ptr);
ptr = malloc(size);
if (NULL == ptr) {
perror(NULL);
- exit(EXIT_FAILURE);
+ exit(MANDOCLEVEL_SYSERR);
}
return(ptr);
ptr = realloc(ptr, size);
if (NULL == ptr) {
perror(NULL);
- exit(EXIT_FAILURE);
+ exit(MANDOCLEVEL_SYSERR);
}
return(ptr);
p = strdup(ptr);
if (NULL == p) {
perror(NULL);
- exit(EXIT_FAILURE);
+ exit(MANDOCLEVEL_SYSERR);
}
return(p);
int
-mandoc_eos(const char *p, size_t sz)
+mandoc_eos(const char *p, size_t sz, int enclosed)
{
+ const char *q;
+ int found;
if (0 == sz)
return(0);
* propogate outward.
*/
- for ( ; sz; sz--) {
- switch (p[(int)sz - 1]) {
+ found = 0;
+ for (q = p + (int)sz - 1; q >= p; q--) {
+ switch (*q) {
case ('\"'):
/* FALLTHROUGH */
case ('\''):
case (']'):
/* FALLTHROUGH */
case (')'):
+ if (0 == found)
+ enclosed = 1;
break;
case ('.'):
- /* Escaped periods. */
- if (sz > 1 && '\\' == p[(int)sz - 2])
- return(0);
/* FALLTHROUGH */
case ('!'):
/* FALLTHROUGH */
case ('?'):
- return(1);
+ found = 1;
+ break;
default:
- return(0);
+ return(found && (!enclosed || isalnum((unsigned char)*q)));
}
}
- return(0);
+ return(found && !enclosed);
}
git.ckatri.com / mandoc.git / blobdiff