version 1.5, 2009/03/31 13:50:19 |
version 1.11, 2009/06/11 20:02:37 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org> |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* |
* |
* 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 |
* purpose with or without fee is hereby granted, provided that the above |
* above copyright notice and this permission notice appear in all |
* copyright notice and this permission notice appear in all copies. |
* copies. |
|
* |
* |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL |
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
* WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED |
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
* WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE |
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
* AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL |
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
* DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR |
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
* PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER |
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR |
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
* PERFORMANCE OF THIS SOFTWARE. |
|
*/ |
*/ |
#include <assert.h> |
#include <assert.h> |
#include <ctype.h> |
#include <ctype.h> |
Line 91 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 89 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ blk_exp_close, MDOC_EXPLICIT }, /* El */ |
{ blk_exp_close, MDOC_EXPLICIT }, /* El */ |
{ blk_full, MDOC_PARSED }, /* It */ |
{ blk_full, MDOC_PARSED }, /* It */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ad */ |
{ in_line, MDOC_PARSED }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* An */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ar */ |
{ in_line_eoln, MDOC_CALLABLE }, /* Cd */ |
{ in_line_eoln, MDOC_CALLABLE }, /* Cd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Cm */ |
Line 103 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 101 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line_eoln, 0 }, /* Fd */ |
{ in_line_eoln, 0 }, /* Fd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fl */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Fn */ |
{ in_line, MDOC_PARSED }, /* Ft */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ft */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ic */ |
{ in_line_eoln, 0 }, /* In */ |
{ in_line_eoln, 0 }, /* In */ /* FIXME: historic usage! */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Li */ |
{ in_line_eoln, 0 }, /* Nd */ |
{ in_line_eoln, 0 }, /* Nd */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Nm */ |
Line 147 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
Line 145 const struct mdoc_macro __mdoc_macros[MDOC_MAX] = { |
|
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Em */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ blk_part_exp, MDOC_CALLABLE | MDOC_PARSED | MDOC_EXPLICIT }, /* Eo */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Fx */ |
{ in_line, MDOC_PARSED }, /* Ms */ |
{ in_line, MDOC_CALLABLE | MDOC_PARSED }, /* Ms */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* No */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Ns */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
{ in_line_argn, MDOC_CALLABLE | MDOC_PARSED }, /* Nx */ |
Line 328 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
Line 326 lookup(struct mdoc *mdoc, int line, int pos, int from, |
|
{ |
{ |
int res; |
int res; |
|
|
res = mdoc_tokhash_find(mdoc->htab, p); |
res = mdoc_hash_find(mdoc->htab, p); |
if (MDOC_PARSED & mdoc_macros[from].flags) |
if (MDOC_PARSED & mdoc_macros[from].flags) |
return(res); |
return(res); |
if (MDOC_MAX == res) |
if (MDOC_MAX == res) |
Line 871 in_line(MACRO_PROT_ARGS) |
|
Line 869 in_line(MACRO_PROT_ARGS) |
|
tok, arg)) |
tok, arg)) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} else if ( ! nc && 0 == cnt) |
} else if ( ! nc && 0 == cnt) { |
|
mdoc_argv_free(arg); |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
return(0); |
return(0); |
|
} |
c = mdoc_macro(mdoc, c, line, la, pos, buf); |
c = mdoc_macro(mdoc, c, line, la, pos, buf); |
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
Line 924 in_line(MACRO_PROT_ARGS) |
|
Line 924 in_line(MACRO_PROT_ARGS) |
|
if (0 == c) |
if (0 == c) |
return(0); |
return(0); |
mdoc->next = MDOC_NEXT_SIBLING; |
mdoc->next = MDOC_NEXT_SIBLING; |
} else if ( ! nc && 0 == cnt) |
} else if ( ! nc && 0 == cnt) { |
|
mdoc_argv_free(arg); |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
if ( ! pwarn(mdoc, line, ppos, WIGNE)) |
return(0); |
return(0); |
|
} |
|
|
if (ppos > 1) |
if (ppos > 1) |
return(1); |
return(1); |
Line 1473 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
Line 1475 phrase(struct mdoc *mdoc, int line, int ppos, char *bu |
|
*/ |
*/ |
|
|
c = quoted ? MDOC_MAX : |
c = quoted ? MDOC_MAX : |
mdoc_tokhash_find(mdoc->htab, &buf[la]); |
mdoc_hash_find(mdoc->htab, &buf[la]); |
|
|
if (MDOC_MAX != c) { |
if (MDOC_MAX != c) { |
if ( ! mdoc_macro(mdoc, c, line, la, &i, buf)) |
if ( ! mdoc_macro(mdoc, c, line, la, &i, buf)) |