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

Diff for /mandoc/tree.c between version 1.10 and 1.16

version 1.10, 2009/03/23 15:20:51 version 1.16, 2009/10/13 10:57:25
Line 1 
Line 1 
 /* $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 <err.h>  #include <err.h>
Line 23 
Line 21 
   
 #include "mdoc.h"  #include "mdoc.h"
 #include "man.h"  #include "man.h"
   #include "main.h"
   
 static  void    tree_mdoc(const struct mdoc_node *, int);  static  void    print_mdoc(const struct mdoc_node *, int);
 static  void    tree_man(const struct man_node *, int);  static  void    print_man(const struct man_node *, int);
   
   
 /* ARGSUSED */  /* ARGSUSED */
 int  void
 tree_run(void *arg, const struct man *man,  tree_mdoc(void *arg, const struct mdoc *mdoc)
                 const struct mdoc *mdoc)  
 {  {
   
         if (man)          print_mdoc(mdoc_node(mdoc), 0);
                 tree_man(man_node(man), 0);  
         if (mdoc)  
                 tree_mdoc(mdoc_node(mdoc), 0);  
         return(1);  
 }  }
   
   
   /* ARGSUSED */
   void
   tree_man(void *arg, const struct man *man)
   {
   
           print_man(man_node(man), 0);
   }
   
   
 static void  static void
 tree_mdoc(const struct mdoc_node *n, int indent)  print_mdoc(const struct mdoc_node *n, int indent)
 {  {
         const char       *p, *t;          const char       *p, *t;
         int               i, j;          int               i, j;
Line 137  tree_mdoc(const struct mdoc_node *n, int indent)
Line 140  tree_mdoc(const struct mdoc_node *n, int indent)
         (void)printf(" %d:%d\n", n->line, n->pos);          (void)printf(" %d:%d\n", n->line, n->pos);
   
         if (n->child)          if (n->child)
                 tree_mdoc(n->child, indent + 1);                  print_mdoc(n->child, indent + 1);
         if (n->next)          if (n->next)
                 tree_mdoc(n->next, indent);                  print_mdoc(n->next, indent);
 }  }
   
   
 static void  static void
 tree_man(const struct man_node *n, int indent)  print_man(const struct man_node *n, int indent)
 {  {
         const char       *p, *t;          const char       *p, *t;
         int               i;          int               i;
Line 159  tree_man(const struct man_node *n, int indent)
Line 162  tree_man(const struct man_node *n, int indent)
         case (MAN_TEXT):          case (MAN_TEXT):
                 t = "text";                  t = "text";
                 break;                  break;
           case (MAN_BLOCK):
                   t = "block";
                   break;
           case (MAN_HEAD):
                   t = "block-head";
                   break;
           case (MAN_BODY):
                   t = "block-body";
                   break;
         default:          default:
                 abort();                  abort();
                 /* NOTREACHED */                  /* NOTREACHED */
Line 169  tree_man(const struct man_node *n, int indent)
Line 181  tree_man(const struct man_node *n, int indent)
                 p = n->string;                  p = n->string;
                 break;                  break;
         case (MAN_ELEM):          case (MAN_ELEM):
                   /* FALLTHROUGH */
           case (MAN_BLOCK):
                   /* FALLTHROUGH */
           case (MAN_HEAD):
                   /* FALLTHROUGH */
           case (MAN_BODY):
                 p = man_macronames[n->tok];                  p = man_macronames[n->tok];
                 break;                  break;
         case (MAN_ROOT):          case (MAN_ROOT):
Line 184  tree_man(const struct man_node *n, int indent)
Line 202  tree_man(const struct man_node *n, int indent)
         (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);          (void)printf("%s (%s) %d:%d\n", p, t, n->line, n->pos);
   
         if (n->child)          if (n->child)
                 tree_man(n->child, indent + 1);                  print_man(n->child, indent + 1);
         if (n->next)          if (n->next)
                 tree_man(n->next, indent);                  print_man(n->next, indent);
 }  }
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.16
CVSweb