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

Diff for /mandoc/mdoc_macro.c between version 1.5 and 1.8

version 1.5, 2009/03/31 13:50:19 version 1.8, 2009/04/12 19:45:26
Line 1 
Line 1 
 /* $Id$ */  /*      $Id$ */
 /*  /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>   * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@openbsd.org>
  *   *
  * 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 <ctype.h>  #include <ctype.h>
Line 328  lookup(struct mdoc *mdoc, int line, int pos, int from,
Line 326  lookup(struct mdoc *mdoc, int line, int pos, int from,
 {  {
         int              res;          int              res;
   
         res = mdoc_tokhash_find(mdoc->htab, p);          res = mdoc_hash_find(mdoc->htab, p);
         if (MDOC_PARSED & mdoc_macros[from].flags)          if (MDOC_PARSED & mdoc_macros[from].flags)
                 return(res);                  return(res);
         if (MDOC_MAX == res)          if (MDOC_MAX == res)
Line 871  in_line(MACRO_PROT_ARGS)
Line 869  in_line(MACRO_PROT_ARGS)
                                                         tok, arg))                                                          tok, arg))
                                         return(0);                                          return(0);
                                 mdoc->next = MDOC_NEXT_SIBLING;                                  mdoc->next = MDOC_NEXT_SIBLING;
                         } else if ( ! nc && 0 == cnt)                          } else if ( ! nc && 0 == cnt) {
                                   mdoc_argv_free(arg);
                                 if ( ! pwarn(mdoc, line, ppos, WIGNE))                                  if ( ! pwarn(mdoc, line, ppos, WIGNE))
                                         return(0);                                          return(0);
                           }
                         c = mdoc_macro(mdoc, c, line, la, pos, buf);                          c = mdoc_macro(mdoc, c, line, la, pos, buf);
                         if (0 == c)                          if (0 == c)
                                 return(0);                                  return(0);
Line 924  in_line(MACRO_PROT_ARGS)
Line 924  in_line(MACRO_PROT_ARGS)
                 if (0 == c)                  if (0 == c)
                         return(0);                          return(0);
                 mdoc->next = MDOC_NEXT_SIBLING;                  mdoc->next = MDOC_NEXT_SIBLING;
         } else if ( ! nc && 0 == cnt)          } else if ( ! nc && 0 == cnt) {
                   mdoc_argv_free(arg);
                 if ( ! pwarn(mdoc, line, ppos, WIGNE))                  if ( ! pwarn(mdoc, line, ppos, WIGNE))
                         return(0);                          return(0);
           }
   
         if (ppos > 1)          if (ppos > 1)
                 return(1);                  return(1);
Line 1473  phrase(struct mdoc *mdoc, int line, int ppos, char *bu
Line 1475  phrase(struct mdoc *mdoc, int line, int ppos, char *bu
                  */                   */
   
                 c = quoted ? MDOC_MAX :                  c = quoted ? MDOC_MAX :
                         mdoc_tokhash_find(mdoc->htab, &buf[la]);                          mdoc_hash_find(mdoc->htab, &buf[la]);
   
                 if (MDOC_MAX != c) {                  if (MDOC_MAX != c) {
                         if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))                          if ( ! mdoc_macro(mdoc, c, line, la, &i, buf))
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.8
CVSweb