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

Diff for /mandoc/Attic/action.c between version 1.12 and 1.14

version 1.12, 2009/01/19 17:02:58 version 1.14, 2009/01/20 13:44:05
Line 22 
Line 22 
   
 #include "private.h"  #include "private.h"
   
   /*
    * Actions are executed on macros after they've been post-validated: in
    * other words, a macro will not be "acted upon" until all of its
    * children have been filled in (post-fix order).
    */
   
 struct  actions {  struct  actions {
         int     (*post)(struct mdoc *);          int     (*post)(struct mdoc *);
Line 29  struct actions {
Line 34  struct actions {
   
 /* Per-macro action routines. */  /* Per-macro action routines. */
   
 static int       post_sh(struct mdoc *);  static  int      post_sh(struct mdoc *);
 static int       post_os(struct mdoc *);  static  int      post_os(struct mdoc *);
 static int       post_dt(struct mdoc *);  static  int      post_dt(struct mdoc *);
 static int       post_dd(struct mdoc *);  static  int      post_dd(struct mdoc *);
 static int       post_nm(struct mdoc *);  static  int      post_nm(struct mdoc *);
   
   static  int      post_prologue(struct mdoc *);
   
 /* Array of macro action routines. */  /* Array of macro action routines. */
   
 const   struct actions mdoc_actions[MDOC_MAX] = {  const   struct actions mdoc_actions[MDOC_MAX] = {
Line 147  const struct actions mdoc_actions[MDOC_MAX] = {
Line 154  const struct actions mdoc_actions[MDOC_MAX] = {
 };  };
   
   
   /*
    * The `Nm' macro sets the document's name when used the first time with
    * an argument.  Subsequent calls without a value will result in the
    * name value being used.
    */
 static int  static int
 post_nm(struct mdoc *mdoc)  post_nm(struct mdoc *mdoc)
 {  {
Line 167  post_nm(struct mdoc *mdoc)
Line 179  post_nm(struct mdoc *mdoc)
 }  }
   
   
   /*
    * We keep track of the current section in order to provide warnings on
    * section ordering, per-section macros, and so on.
    */
 static int  static int
 post_sh(struct mdoc *mdoc)  post_sh(struct mdoc *mdoc)
 {  {
Line 186  post_sh(struct mdoc *mdoc)
Line 202  post_sh(struct mdoc *mdoc)
 }  }
   
   
   /*
    * Prologue title must be parsed into document meta-data.
    */
 static int  static int
 post_dt(struct mdoc *mdoc)  post_dt(struct mdoc *mdoc)
 {  {
Line 226  post_dt(struct mdoc *mdoc)
Line 245  post_dt(struct mdoc *mdoc)
   
         if (NULL == mdoc->meta.title)          if (NULL == mdoc->meta.title)
                 mdoc->meta.title = xstrdup("untitled");                  mdoc->meta.title = xstrdup("untitled");
         return(1);  
           return(post_prologue(mdoc));
 }  }
   
   
   /*
    * Prologue operating system must be parsed into document meta-data.
    */
 static int  static int
 post_os(struct mdoc *mdoc)  post_os(struct mdoc *mdoc)
 {  {
Line 244  post_os(struct mdoc *mdoc)
Line 267  post_os(struct mdoc *mdoc)
   
         mdoc->meta.os = xstrdup(buf[0] ? buf : "local");          mdoc->meta.os = xstrdup(buf[0] ? buf : "local");
         mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;          mdoc->sec_lastn = mdoc->sec_last = SEC_BODY;
         return(1);          mdoc->flags |= MDOC_BODYPARSE;
   
           return(post_prologue(mdoc));
 }  }
   
   
   /*
    * Prologue date must be parsed into document meta-data.
    */
 static int  static int
 post_dd(struct mdoc *mdoc)  post_dd(struct mdoc *mdoc)
 {  {
Line 285  post_dd(struct mdoc *mdoc)
Line 313  post_dd(struct mdoc *mdoc)
         }          }
   
         if (mdoc->meta.date && NULL == n)          if (mdoc->meta.date && NULL == n)
                 return(1);                  return(post_prologue(mdoc));
         else if (n)          else if (n)
                 return(mdoc_err(mdoc, "invalid parameter syntax"));                  return(mdoc_err(mdoc, "invalid parameter syntax"));
         if ((mdoc->meta.date = mdoc_atotime(date)))          if ((mdoc->meta.date = mdoc_atotime(date)))
                 return(1);                  return(post_prologue(mdoc));
         return(mdoc_err(mdoc, "invalid parameter syntax"));          return(mdoc_err(mdoc, "invalid parameter syntax"));
   }
   
   
   /*
    * The end document shouldn't have the prologue macros as part of the
    * syntax tree (they encompass only meta-data).
    */
   static int
   post_prologue(struct mdoc *mdoc)
   {
           struct mdoc_node *n;
   
           if (mdoc->last->parent->child == mdoc->last)
                   mdoc->last->parent->child = mdoc->last->prev;
           if (mdoc->last->prev)
                   mdoc->last->prev->next = NULL;
   
           n = mdoc->last;
           assert(NULL == mdoc->last->next);
   
           if (mdoc->last->prev) {
                   mdoc->last = mdoc->last->prev;
                   mdoc->next = MDOC_NEXT_SIBLING;
           } else {
                   mdoc->last = mdoc->last->parent;
                   mdoc->next = MDOC_NEXT_CHILD;
           }
   
           mdoc_node_freelist(n);
           return(1);
 }  }
   
   

Legend:
Removed from v.1.12  
changed lines
  Added in v.1.14

CVSweb