[BACK]Return to validate.c CVS log [TXT][DIR] Up to [cvsweb.bsd.lv] / mandoc

Diff for /mandoc/Attic/validate.c between version 1.42 and 1.44

version 1.42, 2009/01/19 23:11:43 version 1.44, 2009/01/20 13:44:05
Line 21 
Line 21 
   
 #include "private.h"  #include "private.h"
   
   /*
    * Pre- and post-validate macros as they're parsed.  Pre-validation
    * occurs when the macro has been detected and its arguments parsed.
    * Post-validation occurs when all child macros have also been parsed.
    * In the ELEMENT case, this is simply the parameters of the macro; in
    * the BLOCK case, this is the HEAD, BODY, TAIL and so on.
    */
   
 typedef int     (*v_pre)(struct mdoc *, struct mdoc_node *);  typedef int     (*v_pre)(struct mdoc *, struct mdoc_node *);
 typedef int     (*v_post)(struct mdoc *);  typedef int     (*v_post)(struct mdoc *);
   
 /* FIXME: some sections should only occur in specific msecs. */  /* FIXME: some sections should only occur in specific msecs. */
 /* FIXME: ignoring Pp. */  /* FIXME: ignoring Pp. */
 /* FIXME: math symbols. */  /* FIXME: math symbols. */
 /* FIXME: make sure prologue is complete. */  
 /* FIXME: valid character-escape checks. */  /* FIXME: valid character-escape checks. */
 /* FIXME: make sure required sections are included (NAME, ...). */  /* FIXME: make sure required sections are included (NAME, ...). */
   
Line 72  static int pre_prologue(struct mdoc *, struct mdoc_nod
Line 79  static int pre_prologue(struct mdoc *, struct mdoc_nod
   
 static  int     herr_ge1(struct mdoc *);  static  int     herr_ge1(struct mdoc *);
 static  int     herr_le1(struct mdoc *);  static  int     herr_le1(struct mdoc *);
 static  int     hwarn_ge1(struct mdoc *);  
 static  int     herr_eq0(struct mdoc *);  static  int     herr_eq0(struct mdoc *);
 static  int     eerr_eq0(struct mdoc *);  static  int     eerr_eq0(struct mdoc *);
 static  int     eerr_le1(struct mdoc *);  static  int     eerr_le1(struct mdoc *);
Line 82  static int eerr_ge1(struct mdoc *);
Line 88  static int eerr_ge1(struct mdoc *);
 static  int     ewarn_eq0(struct mdoc *);  static  int     ewarn_eq0(struct mdoc *);
 static  int     ewarn_eq1(struct mdoc *);  static  int     ewarn_eq1(struct mdoc *);
 static  int     bwarn_ge1(struct mdoc *);  static  int     bwarn_ge1(struct mdoc *);
 static  int     berr_eq0(struct mdoc *);  
 static  int     ewarn_ge1(struct mdoc *);  static  int     ewarn_ge1(struct mdoc *);
 static  int     ebool(struct mdoc *);  static  int     ebool(struct mdoc *);
 static  int     post_sh(struct mdoc *);  static  int     post_sh(struct mdoc *);
Line 119  static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NULL
Line 124  static v_post posts_bd[] = { herr_eq0, bwarn_ge1, NULL
 static  v_post  posts_text[] = { eerr_ge1, NULL };  static  v_post  posts_text[] = { eerr_ge1, NULL };
 static  v_post  posts_wtext[] = { ewarn_ge1, NULL };  static  v_post  posts_wtext[] = { ewarn_ge1, NULL };
 static  v_post  posts_notext[] = { eerr_eq0, NULL };  static  v_post  posts_notext[] = { eerr_eq0, NULL };
 static  v_post  posts_wline[] = { hwarn_ge1, berr_eq0, NULL };  static  v_post  posts_wline[] = { bwarn_ge1, herr_eq0, NULL };
 static  v_post  posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };  static  v_post  posts_sh[] = { herr_ge1, bwarn_ge1, post_sh, NULL };
 static  v_post  posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };  static  v_post  posts_bl[] = { herr_eq0, bwarn_ge1, post_bl, NULL };
 static  v_post  posts_it[] = { post_it, NULL };  static  v_post  posts_it[] = { post_it, NULL };
 static  v_post  posts_in[] = { ewarn_eq1, NULL };  static  v_post  posts_in[] = { ewarn_eq1, NULL };
 static  v_post  posts_ss[] = { herr_ge1, NULL };  static  v_post  posts_ss[] = { herr_ge1, NULL };
 static  v_post  posts_pp[] = { ewarn_eq0, NULL };  static  v_post  posts_pp[] = { ewarn_eq0, NULL };
 static  v_post  posts_d1[] = { herr_ge1, NULL };  
 static  v_post  posts_ex[] = { eerr_le1, post_ex, NULL };  static  v_post  posts_ex[] = { eerr_le1, post_ex, NULL };
 static  v_post  posts_an[] = { post_an, NULL };  static  v_post  posts_an[] = { post_an, NULL };
 static  v_post  posts_at[] = { post_at, NULL };  static  v_post  posts_at[] = { post_at, NULL };
Line 145  const struct valids mdoc_valids[MDOC_MAX] = {
Line 149  const struct valids mdoc_valids[MDOC_MAX] = {
         { pres_sh, posts_sh }, /* Sh */          { pres_sh, posts_sh }, /* Sh */
         { pres_ss, posts_ss }, /* Ss */          { pres_ss, posts_ss }, /* Ss */
         { NULL, posts_pp }, /* Pp */          { NULL, posts_pp }, /* Pp */
         { pres_d1, posts_d1 }, /* D1 */          { pres_d1, posts_wline }, /* D1 */
         { pres_d1, posts_d1 }, /* Dl */          { pres_d1, posts_wline }, /* Dl */
         { pres_bd, posts_bd }, /* Bd */          { pres_bd, posts_bd }, /* Bd */
         { NULL, NULL }, /* Ed */          { NULL, NULL }, /* Ed */
         { pres_bl, posts_bl }, /* Bl */          { pres_bl, posts_bl }, /* Bl */
Line 365  pre_check_parent(struct mdoc *mdoc, struct mdoc_node *
Line 369  pre_check_parent(struct mdoc *mdoc, struct mdoc_node *
   
   
 static int  static int
 berr_eq0(struct mdoc *mdoc)  
 {  
   
         if (MDOC_BODY != mdoc->last->type)  
                 return(1);  
         return(post_check_children_eq(mdoc, "body children", 0));  
 }  
   
   
 static int  
 bwarn_ge1(struct mdoc *mdoc)  bwarn_ge1(struct mdoc *mdoc)
 {  {
   
Line 463  herr_eq0(struct mdoc *mdoc)
Line 457  herr_eq0(struct mdoc *mdoc)
         if (MDOC_HEAD != mdoc->last->type)          if (MDOC_HEAD != mdoc->last->type)
                 return(1);                  return(1);
         return(post_check_children_eq(mdoc, "parameters", 0));          return(post_check_children_eq(mdoc, "parameters", 0));
 }  
   
   
 static int  
 hwarn_ge1(struct mdoc *mdoc)  
 {  
   
         if (MDOC_HEAD != mdoc->last->type)  
                 return(1);  
         return(post_check_children_wgt(mdoc, "parameters", 0));  
 }  }
   
   
Legend:
Removed from v.1.42  
changed lines
  Added in v.1.44
CVSweb