version 1.45, 2010/05/17 10:50:32 |
version 1.50, 2010/07/31 23:52:58 |
|
|
/* $Id$ */ |
/* $Id$ */ |
/* |
/* |
* Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se> |
* Copyright (c) 2008, 2009, 2010 Kristaps Dzonsons <kristaps@bsd.lv> |
* |
* |
* 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 |
|
|
#include <stdlib.h> |
#include <stdlib.h> |
#include <string.h> |
#include <string.h> |
|
|
|
#include "mandoc.h" |
#include "libman.h" |
#include "libman.h" |
|
|
enum rew { |
enum rew { |
Line 43 static enum rew rew_dohalt(enum mant, enum man_type, |
|
Line 44 static enum rew rew_dohalt(enum mant, enum man_type, |
|
static enum rew rew_block(enum mant, enum man_type, |
static enum rew rew_block(enum mant, enum man_type, |
const struct man_node *); |
const struct man_node *); |
static int rew_warn(struct man *, |
static int rew_warn(struct man *, |
struct man_node *, enum merr); |
struct man_node *, enum mandocerr); |
|
|
const struct man_macro __man_macros[MAN_MAX] = { |
const struct man_macro __man_macros[MAN_MAX] = { |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
{ in_line_eoln, MAN_NSCOPED }, /* br */ |
Line 82 const struct man_macro __man_macros[MAN_MAX] = { |
|
Line 83 const struct man_macro __man_macros[MAN_MAX] = { |
|
{ in_line_eoln, 0 }, /* Vb */ |
{ in_line_eoln, 0 }, /* Vb */ |
{ in_line_eoln, 0 }, /* Ve */ |
{ in_line_eoln, 0 }, /* Ve */ |
{ in_line_eoln, 0 }, /* AT */ |
{ in_line_eoln, 0 }, /* AT */ |
|
{ in_line_eoln, 0 }, /* in */ |
}; |
}; |
|
|
const struct man_macro * const man_macros = __man_macros; |
const struct man_macro * const man_macros = __man_macros; |
Line 91 const struct man_macro * const man_macros = __man_macr |
|
Line 93 const struct man_macro * const man_macros = __man_macr |
|
* Warn when "n" is an explicit non-roff macro. |
* Warn when "n" is an explicit non-roff macro. |
*/ |
*/ |
static int |
static int |
rew_warn(struct man *m, struct man_node *n, enum merr er) |
rew_warn(struct man *m, struct man_node *n, enum mandocerr er) |
{ |
{ |
|
|
if (er == WERRMAX || MAN_BLOCK != n->type) |
if (er == MANDOCERR_MAX || MAN_BLOCK != n->type) |
return(1); |
return(1); |
if (MAN_VALID & n->flags) |
if (MAN_VALID & n->flags) |
return(1); |
return(1); |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
if ( ! (MAN_EXPLICIT & man_macros[n->tok].flags)) |
return(1); |
return(1); |
return(man_nwarn(m, n, er)); |
return(man_nmsg(m, n, er)); |
} |
} |
|
|
|
|
/* |
/* |
* Rewind scope. If a code "er" != WERRMAX has been provided, it will |
* Rewind scope. If a code "er" != MANDOCERR_MAX has been provided, it |
* be used if an explicit block scope is being closed out. |
* will be used if an explicit block scope is being closed out. |
*/ |
*/ |
int |
int |
man_unscope(struct man *m, const struct man_node *n, enum merr er) |
man_unscope(struct man *m, const struct man_node *n, |
|
enum mandocerr er) |
{ |
{ |
|
|
assert(n); |
assert(n); |
Line 248 rew_scope(enum man_type type, struct man *m, enum mant |
|
Line 251 rew_scope(enum man_type type, struct man *m, enum mant |
|
*/ |
*/ |
assert(n); |
assert(n); |
|
|
return(man_unscope(m, n, WERRMAX)); |
return(man_unscope(m, n, MANDOCERR_MAX)); |
} |
} |
|
|
|
|
Line 276 blk_close(MACRO_PROT_ARGS) |
|
Line 279 blk_close(MACRO_PROT_ARGS) |
|
break; |
break; |
|
|
if (NULL == nn) |
if (NULL == nn) |
if ( ! man_pwarn(m, line, ppos, WNOSCOPE)) |
if ( ! man_pmsg(m, line, ppos, MANDOCERR_NOSCOPE)) |
return(0); |
return(0); |
|
|
if ( ! rew_scope(MAN_BODY, m, ntok)) |
if ( ! rew_scope(MAN_BODY, m, ntok)) |
Line 288 blk_close(MACRO_PROT_ARGS) |
|
Line 291 blk_close(MACRO_PROT_ARGS) |
|
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
int |
int |
blk_exp(MACRO_PROT_ARGS) |
blk_exp(MACRO_PROT_ARGS) |
{ |
{ |
Line 339 blk_exp(MACRO_PROT_ARGS) |
|
Line 343 blk_exp(MACRO_PROT_ARGS) |
|
* scopes, such as `SH' closing out an `SS', are defined in the rew |
* scopes, such as `SH' closing out an `SS', are defined in the rew |
* routines. |
* routines. |
*/ |
*/ |
|
/* ARGSUSED */ |
int |
int |
blk_imp(MACRO_PROT_ARGS) |
blk_imp(MACRO_PROT_ARGS) |
{ |
{ |
Line 396 blk_imp(MACRO_PROT_ARGS) |
|
Line 401 blk_imp(MACRO_PROT_ARGS) |
|
} |
} |
|
|
|
|
|
/* ARGSUSED */ |
int |
int |
in_line_eoln(MACRO_PROT_ARGS) |
in_line_eoln(MACRO_PROT_ARGS) |
{ |
{ |
|
|
man_macroend(struct man *m) |
man_macroend(struct man *m) |
{ |
{ |
|
|
return(man_unscope(m, m->first, WEXITSCOPE)); |
return(man_unscope(m, m->first, MANDOCERR_SCOPEEXIT)); |
} |
} |
|
|