version 1.32, 2015/01/21 00:47:04 |
version 1.33, 2015/01/26 00:57:22 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv> |
* Copyright (c) 2011 Ingo Schwarze <schwarze@openbsd.org> |
* Copyright (c) 2011, 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 |
|
|
enum rofferr |
enum rofferr |
tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) |
tbl_read(struct tbl_node *tbl, int ln, const char *p, int offs) |
{ |
{ |
int len; |
|
const char *cp; |
const char *cp; |
|
int active; |
|
|
cp = &p[offs]; |
|
len = (int)strlen(cp); |
|
|
|
/* |
/* |
* If we're in the options section and we don't have a |
* In the options section, proceed to the layout section |
* terminating semicolon, assume we've moved directly into the |
* after a semicolon, or right away if there is no semicolon. |
* layout section. No need to report a warning: this is, |
* Ignore semicolons in arguments. |
* apparently, standard behaviour. |
|
*/ |
*/ |
|
|
if (TBL_PART_OPTS == tbl->part && len) |
if (tbl->part == TBL_PART_OPTS) { |
if (';' != cp[len - 1]) |
tbl->part = TBL_PART_LAYOUT; |
tbl->part = TBL_PART_LAYOUT; |
active = 1; |
|
for (cp = p; *cp != '\0'; cp++) { |
|
switch (*cp) { |
|
case '(': |
|
active = 0; |
|
continue; |
|
case ')': |
|
active = 1; |
|
continue; |
|
case ';': |
|
if (active) |
|
break; |
|
continue; |
|
default: |
|
continue; |
|
} |
|
break; |
|
} |
|
if (*cp == ';') { |
|
tbl_option(tbl, ln, p); |
|
if (*(p = cp + 1) == '\0') |
|
return(ROFF_IGN); |
|
} |
|
} |
|
|
/* Now process each logical section of the table. */ |
/* Process the other section types. */ |
|
|
switch (tbl->part) { |
switch (tbl->part) { |
case TBL_PART_OPTS: |
|
tbl_option(tbl, ln, p); |
|
return(ROFF_IGN); |
|
case TBL_PART_LAYOUT: |
case TBL_PART_LAYOUT: |
tbl_layout(tbl, ln, p); |
tbl_layout(tbl, ln, p); |
return(ROFF_IGN); |
return(ROFF_IGN); |
Line 81 tbl_alloc(int pos, int line, struct mparse *parse) |
|
Line 97 tbl_alloc(int pos, int line, struct mparse *parse) |
|
tbl->parse = parse; |
tbl->parse = parse; |
tbl->part = TBL_PART_OPTS; |
tbl->part = TBL_PART_OPTS; |
tbl->opts.tab = '\t'; |
tbl->opts.tab = '\t'; |
tbl->opts.linesize = 12; |
|
tbl->opts.decimal = '.'; |
tbl->opts.decimal = '.'; |
return(tbl); |
return(tbl); |
} |
} |