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

Diff for /mandoc/mdoc.c between version 1.84 and 1.85

version 1.84, 2009/06/17 07:59:47 version 1.85, 2009/06/17 10:53:32
Line 113  mdoc_meta(const struct mdoc *m)
Line 113  mdoc_meta(const struct mdoc *m)
 }  }
   
   
   /*
    * Frees volatile resources (parse tree, meta-data, fields).
    */
 static void  static void
 mdoc_free1(struct mdoc *mdoc)  mdoc_free1(struct mdoc *mdoc)
 {  {
Line 132  mdoc_free1(struct mdoc *mdoc)
Line 135  mdoc_free1(struct mdoc *mdoc)
 }  }
   
   
   /*
    * Allocate all volatile resources (parse tree, meta-data, fields).
    */
 static int  static int
 mdoc_alloc1(struct mdoc *mdoc)  mdoc_alloc1(struct mdoc *mdoc)
 {  {
   
         bzero(&mdoc->meta, sizeof(struct mdoc_meta));          bzero(&mdoc->meta, sizeof(struct mdoc_meta));
         mdoc->flags = 0;          mdoc->flags = 0;
         mdoc->lastnamed = mdoc->lastsec = 0;          mdoc->lastnamed = mdoc->lastsec = SEC_NONE;
         mdoc->last = calloc(1, sizeof(struct mdoc_node));          mdoc->last = calloc(1, sizeof(struct mdoc_node));
         if (NULL == mdoc->last)          if (NULL == mdoc->last)
                 return(0);                  return(0);
Line 151  mdoc_alloc1(struct mdoc *mdoc)
Line 157  mdoc_alloc1(struct mdoc *mdoc)
   
   
 /*  /*
  * Free up all resources contributed by a parse:  the node tree,   * Free up volatile resources (see mdoc_free1()) then re-initialises the
  * meta-data and so on.  Then reallocate the root node for another   * data with mdoc_alloc1().  After invocation, parse data has been reset
  * parse.   * and the parser is ready for re-invocation on a new tree; however,
    * cross-parse non-volatile data is kept intact.
  */   */
 int  int
 mdoc_reset(struct mdoc *mdoc)  mdoc_reset(struct mdoc *mdoc)
Line 165  mdoc_reset(struct mdoc *mdoc)
Line 172  mdoc_reset(struct mdoc *mdoc)
   
   
 /*  /*
  * Completely free up all resources.   * Completely free up all volatile and non-volatile parse resources.
    * After invocation, the pointer is no longer usable.
  */   */
 void  void
 mdoc_free(struct mdoc *mdoc)  mdoc_free(struct mdoc *mdoc)
Line 178  mdoc_free(struct mdoc *mdoc)
Line 186  mdoc_free(struct mdoc *mdoc)
 }  }
   
   
   /*
    * Allocate volatile and non-volatile parse resources.
    */
 struct mdoc *  struct mdoc *
 mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)  mdoc_alloc(void *data, int pflags, const struct mdoc_cb *cb)
 {  {
Line 204  mdoc_alloc(void *data, int pflags, const struct mdoc_c
Line 215  mdoc_alloc(void *data, int pflags, const struct mdoc_c
   
 /*  /*
  * Climb back up the parse tree, validating open scopes.  Mostly calls   * Climb back up the parse tree, validating open scopes.  Mostly calls
  * through to macro_end in macro.c.   * through to macro_end() in macro.c.
  */   */
 int  int
 mdoc_endparse(struct mdoc *m)  mdoc_endparse(struct mdoc *m)
Line 221  mdoc_endparse(struct mdoc *m)
Line 232  mdoc_endparse(struct mdoc *m)
   
 /*  /*
  * Main parse routine.  Parses a single line -- really just hands off to   * Main parse routine.  Parses a single line -- really just hands off to
  * the macro or text parser.   * the macro (parsemacro()) or text parser (parsetext()).
  */   */
 int  int
 mdoc_parseln(struct mdoc *m, int ln, char *buf)  mdoc_parseln(struct mdoc *m, int ln, char *buf)
Line 360  mdoc_macro(struct mdoc *m, int tok, 
Line 371  mdoc_macro(struct mdoc *m, int tok, 
                 int ln, int pp, int *pos, char *buf)                  int ln, int pp, int *pos, char *buf)
 {  {
   
         /* FIXME - these should happen during validation. */  
   
         if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&          if (MDOC_PROLOGUE & mdoc_macros[tok].flags &&
                         SEC_PROLOGUE != m->lastnamed)                          MDOC_PBODY & m->flags)
                 return(perr(m, ln, pp, EPROLBODY));                  return(perr(m, ln, pp, EPROLBODY));
   
         if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&          if ( ! (MDOC_PROLOGUE & mdoc_macros[tok].flags) &&
                         SEC_PROLOGUE == m->lastnamed)                          ! (MDOC_PBODY & m->flags))
                 return(perr(m, ln, pp, EBODYPROL));                  return(perr(m, ln, pp, EBODYPROL));
   
         if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))          if (1 != pp && ! (MDOC_CALLABLE & mdoc_macros[tok].flags))
Line 618  static int
Line 626  static int
 parsetext(struct mdoc *m, int line, char *buf)  parsetext(struct mdoc *m, int line, char *buf)
 {  {
   
         if (SEC_PROLOGUE == m->lastnamed)          if (SEC_NONE == m->lastnamed)
                 return(perr(m, line, 0, ETEXTPROL));                  return(perr(m, line, 0, ETEXTPROL));
   
         if (0 == buf[0] && ! (MDOC_LITERAL & m->flags))          if (0 == buf[0] && ! (MDOC_LITERAL & m->flags))

Legend:
Removed from v.1.84  
changed lines
  Added in v.1.85

CVSweb