version 1.27, 2014/08/10 23:54:41 |
version 1.32, 2015/01/26 18:42:30 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2012, 2014 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org> |
* |
* |
* Permission to use, copy, modify, and distribute this software for any |
* Permission to use, copy, modify, and distribute this software for any |
* purpose with or without fee is hereby granted, provided that the above |
* purpose with or without fee is hereby granted, provided that the above |
Line 34 struct tbl_phrase { |
|
Line 34 struct tbl_phrase { |
|
enum tbl_cellt key; |
enum tbl_cellt key; |
}; |
}; |
|
|
/* |
static const struct tbl_phrase keys[] = { |
* FIXME: we can make this parse a lot nicer by, when an error is |
|
* encountered in a layout key, bailing to the next key (i.e. to the |
|
* next whitespace then continuing). |
|
*/ |
|
|
|
#define KEYS_MAX 11 |
|
|
|
static const struct tbl_phrase keys[KEYS_MAX] = { |
|
{ 'c', TBL_CELL_CENTRE }, |
{ 'c', TBL_CELL_CENTRE }, |
{ 'r', TBL_CELL_RIGHT }, |
{ 'r', TBL_CELL_RIGHT }, |
{ 'l', TBL_CELL_LEFT }, |
{ 'l', TBL_CELL_LEFT }, |
Line 55 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
Line 47 static const struct tbl_phrase keys[KEYS_MAX] = { |
|
{ '=', TBL_CELL_DHORIZ } |
{ '=', TBL_CELL_DHORIZ } |
}; |
}; |
|
|
static int mods(struct tbl_node *, struct tbl_cell *, |
#define KEYS_MAX ((int)(sizeof(keys)/sizeof(keys[0]))) |
|
|
|
static void mods(struct tbl_node *, struct tbl_cell *, |
int, const char *, int *); |
int, const char *, int *); |
static int cell(struct tbl_node *, struct tbl_row *, |
static void cell(struct tbl_node *, struct tbl_row *, |
int, const char *, int *); |
int, const char *, int *); |
static void row(struct tbl_node *, int, const char *, int *); |
|
static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, |
static struct tbl_cell *cell_alloc(struct tbl_node *, struct tbl_row *, |
enum tbl_cellt, int vert); |
enum tbl_cellt, int vert); |
|
|
|
|
static int |
static void |
mods(struct tbl_node *tbl, struct tbl_cell *cp, |
mods(struct tbl_node *tbl, struct tbl_cell *cp, |
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
char buf[5]; |
char *endptr; |
int i; |
|
|
|
/* Not all types accept modifiers. */ |
mod: |
|
while (p[*pos] == ' ' || p[*pos] == '\t') |
|
(*pos)++; |
|
|
switch (cp->pos) { |
/* Row delimiters and cell specifiers end modifier lists. */ |
case TBL_CELL_DOWN: |
|
/* FALLTHROUGH */ |
|
case TBL_CELL_HORIZ: |
|
/* FALLTHROUGH */ |
|
case TBL_CELL_DHORIZ: |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
|
mod: |
if (strchr(".,-=^_ACLNRSaclnrs|", p[*pos]) != NULL) |
/* |
return; |
* XXX: since, at least for now, modifiers are non-conflicting |
|
* (are separable by value, regardless of position), we let |
|
* modifiers come in any order. The existing tbl doesn't let |
|
* this happen. |
|
*/ |
|
switch (p[*pos]) { |
|
case '\0': |
|
/* FALLTHROUGH */ |
|
case ' ': |
|
/* FALLTHROUGH */ |
|
case '\t': |
|
/* FALLTHROUGH */ |
|
case ',': |
|
/* FALLTHROUGH */ |
|
case '.': |
|
/* FALLTHROUGH */ |
|
case '|': |
|
return(1); |
|
default: |
|
break; |
|
} |
|
|
|
/* Throw away parenthesised expression. */ |
/* Throw away parenthesised expression. */ |
|
|
|
|
(*pos)++; |
(*pos)++; |
goto mod; |
goto mod; |
} |
} |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_PAR, tbl->parse, |
ln, *pos, NULL); |
ln, *pos, NULL); |
return(0); |
return; |
} |
} |
|
|
/* Parse numerical spacing from modifier string. */ |
/* Parse numerical spacing from modifier string. */ |
|
|
if (isdigit((unsigned char)p[*pos])) { |
if (isdigit((unsigned char)p[*pos])) { |
for (i = 0; i < 4; i++) { |
cp->spacing = strtoull(p + *pos, &endptr, 10); |
if ( ! isdigit((unsigned char)p[*pos + i])) |
*pos = endptr - p; |
break; |
|
buf[i] = p[*pos + i]; |
|
} |
|
buf[i] = '\0'; |
|
|
|
/* No greater than 4 digits. */ |
|
|
|
if (4 == i) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, |
|
tbl->parse, ln, *pos, NULL); |
|
return(0); |
|
} |
|
|
|
*pos += i; |
|
cp->spacing = (size_t)atoi(buf); |
|
|
|
goto mod; |
goto mod; |
/* NOTREACHED */ |
|
} |
} |
|
|
/* TODO: GNU has many more extensions. */ |
|
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
case 'z': |
case 'b': |
cp->flags |= TBL_CELL_WIGN; |
/* FALLTHROUGH */ |
|
case 'i': |
|
/* FALLTHROUGH */ |
|
case 'r': |
|
(*pos)--; |
|
break; |
|
case 'd': |
|
cp->flags |= TBL_CELL_BALIGN; |
goto mod; |
goto mod; |
case 'u': |
|
cp->flags |= TBL_CELL_UP; |
|
goto mod; |
|
case 'e': |
case 'e': |
cp->flags |= TBL_CELL_EQUAL; |
cp->flags |= TBL_CELL_EQUAL; |
goto mod; |
goto mod; |
|
case 'f': |
|
break; |
|
case 'm': |
|
mandoc_msg(MANDOCERR_TBLLAYOUT_MOD, tbl->parse, |
|
ln, *pos, "m"); |
|
goto mod; |
|
case 'p': |
|
/* FALLTHROUGH */ |
|
case 'v': |
|
if (p[*pos] == '-' || p[*pos] == '+') |
|
(*pos)++; |
|
while (isdigit((unsigned char)p[*pos])) |
|
(*pos)++; |
|
goto mod; |
case 't': |
case 't': |
cp->flags |= TBL_CELL_TALIGN; |
cp->flags |= TBL_CELL_TALIGN; |
goto mod; |
goto mod; |
case 'd': |
case 'u': |
cp->flags |= TBL_CELL_BALIGN; |
cp->flags |= TBL_CELL_UP; |
goto mod; |
goto mod; |
case 'w': /* XXX for now, ignore minimal column width */ |
case 'w': /* XXX for now, ignore minimal column width */ |
goto mod; |
goto mod; |
case 'f': |
case 'x': |
break; |
cp->flags |= TBL_CELL_WMAX; |
case 'r': |
goto mod; |
/* FALLTHROUGH */ |
case 'z': |
case 'b': |
cp->flags |= TBL_CELL_WIGN; |
/* FALLTHROUGH */ |
goto mod; |
case 'i': |
|
(*pos)--; |
|
break; |
|
default: |
default: |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
ln, *pos - 1, NULL); |
ln, *pos - 1, "%c", p[*pos - 1]); |
return(0); |
goto mod; |
} |
} |
|
|
switch (tolower((unsigned char)p[(*pos)++])) { |
switch (tolower((unsigned char)p[(*pos)++])) { |
|
|
case 'r': |
case 'r': |
goto mod; |
goto mod; |
default: |
default: |
break; |
mandoc_vmsg(MANDOCERR_FT_BAD, tbl->parse, |
|
ln, *pos - 1, "TS f%c", p[*pos - 1]); |
|
goto mod; |
} |
} |
|
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
|
ln, *pos - 1, NULL); |
|
return(0); |
|
} |
} |
|
|
static int |
static void |
cell(struct tbl_node *tbl, struct tbl_row *rp, |
cell(struct tbl_node *tbl, struct tbl_row *rp, |
int ln, const char *p, int *pos) |
int ln, const char *p, int *pos) |
{ |
{ |
Line 216 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 174 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
|
|
/* Handle vertical lines. */ |
/* Handle vertical lines. */ |
|
|
for (vert = 0; '|' == p[*pos]; ++*pos) |
vert = 0; |
vert++; |
again: |
while (' ' == p[*pos]) |
while (p[*pos] == ' ' || p[*pos] == '\t' || p[*pos] == '|') { |
|
if (p[*pos] == '|') { |
|
if (vert < 2) |
|
vert++; |
|
else |
|
mandoc_msg(MANDOCERR_TBLLAYOUT_VERT, |
|
tbl->parse, ln, *pos, NULL); |
|
} |
(*pos)++; |
(*pos)++; |
|
} |
|
|
/* Handle trailing vertical lines */ |
/* Handle trailing vertical lines */ |
|
|
if ('.' == p[*pos] || '\0' == p[*pos]) { |
if ('.' == p[*pos] || '\0' == p[*pos]) { |
rp->vert = vert; |
rp->vert = vert; |
return(1); |
return; |
} |
} |
|
|
/* Parse the column position (`c', `l', `r', ...). */ |
/* Parse the column position (`c', `l', `r', ...). */ |
Line 234 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
Line 200 cell(struct tbl_node *tbl, struct tbl_row *rp, |
|
if (tolower((unsigned char)p[*pos]) == keys[i].name) |
if (tolower((unsigned char)p[*pos]) == keys[i].name) |
break; |
break; |
|
|
if (KEYS_MAX == i) { |
if (i == KEYS_MAX) { |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_vmsg(MANDOCERR_TBLLAYOUT_CHAR, tbl->parse, |
ln, *pos, NULL); |
ln, *pos, "%c", p[*pos]); |
return(0); |
(*pos)++; |
|
goto again; |
} |
} |
|
|
c = keys[i].key; |
c = keys[i].key; |
|
|
/* |
/* Special cases of spanners. */ |
* If a span cell is found first, raise a warning and abort the |
|
* parse. If a span cell is found and the last layout element |
|
* isn't a "normal" layout, bail. |
|
* |
|
* FIXME: recover from this somehow? |
|
*/ |
|
|
|
if (TBL_CELL_SPAN == c) { |
if (c == TBL_CELL_SPAN) { |
if (NULL == rp->first) { |
if (rp->last == NULL) |
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, |
mandoc_msg(MANDOCERR_TBLLAYOUT_SPAN, |
ln, *pos, NULL); |
tbl->parse, ln, *pos, NULL); |
return(0); |
else if (rp->last->pos == TBL_CELL_HORIZ || |
} else if (rp->last) |
rp->last->pos == TBL_CELL_DHORIZ) |
switch (rp->last->pos) { |
c = rp->last->pos; |
case TBL_CELL_HORIZ: |
} else if (c == TBL_CELL_DOWN && rp == tbl->first_row) |
/* FALLTHROUGH */ |
mandoc_msg(MANDOCERR_TBLLAYOUT_DOWN, |
case TBL_CELL_DHORIZ: |
tbl->parse, ln, *pos, NULL); |
mandoc_msg(MANDOCERR_TBLLAYOUT, |
|
tbl->parse, ln, *pos, NULL); |
|
return(0); |
|
default: |
|
break; |
|
} |
|
} |
|
|
|
/* |
|
* If a vertical spanner is found, we may not be in the first |
|
* row. |
|
*/ |
|
|
|
if (TBL_CELL_DOWN == c && rp == tbl->first_row) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos, NULL); |
|
return(0); |
|
} |
|
|
|
(*pos)++; |
(*pos)++; |
|
|
/* Disallow adjacent spacers. */ |
|
|
|
if (vert > 2) { |
|
mandoc_msg(MANDOCERR_TBLLAYOUT, tbl->parse, ln, *pos - 1, NULL); |
|
return(0); |
|
} |
|
|
|
/* Allocate cell then parse its modifiers. */ |
/* Allocate cell then parse its modifiers. */ |
|
|
return(mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos)); |
mods(tbl, cell_alloc(tbl, rp, c, vert), ln, p, pos); |
} |
} |
|
|
static void |
void |
row(struct tbl_node *tbl, int ln, const char *p, int *pos) |
tbl_layout(struct tbl_node *tbl, int ln, const char *p) |
{ |
{ |
struct tbl_row *rp; |
struct tbl_row *rp; |
|
int pos; |
|
|
row: /* |
pos = 0; |
* EBNF describing this section: |
rp = NULL; |
* |
|
* row ::= row_list [:space:]* [.]?[\n] |
|
* row_list ::= [:space:]* row_elem row_tail |
|
* row_tail ::= [:space:]*[,] row_list | |
|
* epsilon |
|
* row_elem ::= [\t\ ]*[:alpha:]+ |
|
*/ |
|
|
|
rp = mandoc_calloc(1, sizeof(struct tbl_row)); |
for (;;) { |
if (tbl->last_row) |
/* Skip whitespace before and after each cell. */ |
tbl->last_row->next = rp; |
|
else |
|
tbl->first_row = rp; |
|
tbl->last_row = rp; |
|
|
|
cell: |
while (p[pos] == ' ' || p[pos] == '\t') |
while (isspace((unsigned char)p[*pos])) |
pos++; |
(*pos)++; |
|
|
|
/* Safely exit layout context. */ |
switch (p[pos]) { |
|
case ',': /* Next row on this input line. */ |
|
pos++; |
|
rp = NULL; |
|
continue; |
|
case '\0': /* Next row on next input line. */ |
|
return; |
|
case '.': /* End of layout. */ |
|
pos++; |
|
tbl->part = TBL_PART_DATA; |
|
if (tbl->first_row != NULL) |
|
return; |
|
mandoc_msg(MANDOCERR_TBLLAYOUT_NONE, |
|
tbl->parse, ln, pos, NULL); |
|
rp = mandoc_calloc(1, sizeof(*rp)); |
|
cell_alloc(tbl, rp, TBL_CELL_LEFT, 0); |
|
tbl->first_row = tbl->last_row = rp; |
|
return; |
|
default: /* Cell. */ |
|
break; |
|
} |
|
|
if ('.' == p[*pos]) { |
if (rp == NULL) { /* First cell on this line. */ |
tbl->part = TBL_PART_DATA; |
rp = mandoc_calloc(1, sizeof(*rp)); |
if (NULL == tbl->first_row) |
if (tbl->last_row) |
mandoc_msg(MANDOCERR_TBLNOLAYOUT, |
tbl->last_row->next = rp; |
tbl->parse, ln, *pos, NULL); |
else |
(*pos)++; |
tbl->first_row = rp; |
return; |
tbl->last_row = rp; |
|
} |
|
cell(tbl, rp, ln, p, &pos); |
} |
} |
|
|
/* End (and possibly restart) a row. */ |
|
|
|
if (',' == p[*pos]) { |
|
(*pos)++; |
|
goto row; |
|
} else if ('\0' == p[*pos]) |
|
return; |
|
|
|
if ( ! cell(tbl, rp, ln, p, pos)) |
|
return; |
|
|
|
goto cell; |
|
/* NOTREACHED */ |
|
} |
|
|
|
int |
|
tbl_layout(struct tbl_node *tbl, int ln, const char *p) |
|
{ |
|
int pos; |
|
|
|
pos = 0; |
|
row(tbl, ln, p, &pos); |
|
|
|
/* Always succeed. */ |
|
return(1); |
|
} |
} |
|
|
static struct tbl_cell * |
static struct tbl_cell * |