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

Diff for /mandoc/libmdoc.h between version 1.1 and 1.12

version 1.1, 2009/03/23 14:22:11 version 1.12, 2009/07/06 09:21:24
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.  
  */   */
 #ifndef LIBMDOC_H  #ifndef LIBMDOC_H
 #define LIBMDOC_H  #define LIBMDOC_H
Line 31  struct mdoc {
Line 29  struct mdoc {
         struct mdoc_cb    cb;          struct mdoc_cb    cb;
         void             *htab;          void             *htab;
         int               flags;          int               flags;
 #define MDOC_HALT        (1 << 0)  #define MDOC_HALT        (1 << 0)       /* Error in parse. Halt. */
 #define MDOC_LITERAL     (1 << 1)  #define MDOC_LITERAL     (1 << 1)       /* In a literal scope. */
   #define MDOC_PBODY       (1 << 2)       /* In the document body. */
         int               pflags;          int               pflags;
         enum mdoc_next    next;          enum mdoc_next    next;
         struct mdoc_node *last;          struct mdoc_node *last;
Line 57  struct mdoc_macro {
Line 56  struct mdoc_macro {
         /* Reserved words in arguments treated as text. */          /* Reserved words in arguments treated as text. */
 };  };
   
 #define mdoc_nwarn(mdoc, node, type, fmt, ...) \  
                   mdoc_vwarn((mdoc), (node)->line, \  
                   (node)->pos, (type), (fmt), ##__VA_ARGS__)  
   
 #define mdoc_nerr(mdoc, node, fmt, ...) \  
                   mdoc_verr((mdoc), (node)->line, \  
                   (node)->pos, (fmt), ##__VA_ARGS__)  
   
 #define mdoc_warn(mdoc, type, fmt, ...) \  
                   mdoc_vwarn((mdoc), (mdoc)->last->line, \  
                   (mdoc)->last->pos, (type), (fmt), ##__VA_ARGS__)  
   
 #define mdoc_err(mdoc, fmt, ...) \  
                   mdoc_verr((mdoc), (mdoc)->last->line, \  
                   (mdoc)->last->pos, (fmt), ##__VA_ARGS__)  
   
 #define mdoc_msg(mdoc, fmt, ...) \  
                   mdoc_vmsg((mdoc), (mdoc)->last->line, \  
                   (mdoc)->last->pos, (fmt), ##__VA_ARGS__)  
   
 #define mdoc_pmsg(mdoc, line, pos, fmt, ...) \  
                   mdoc_vmsg((mdoc), (line), \  
                   (pos), (fmt), ##__VA_ARGS__)  
   
 #define mdoc_pwarn(mdoc, line, pos, type, fmt, ...) \  
                   mdoc_vwarn((mdoc), (line), \  
                   (pos), (type), (fmt), ##__VA_ARGS__)  
   
 #define mdoc_perr(mdoc, line, pos, fmt, ...) \  
                   mdoc_verr((mdoc), (line), \  
                   (pos), (fmt), ##__VA_ARGS__)  
   
 extern  const struct mdoc_macro *const mdoc_macros;  extern  const struct mdoc_macro *const mdoc_macros;
   
 __BEGIN_DECLS  __BEGIN_DECLS
   
 int               mdoc_vwarn(struct mdoc *, int, int,  /*
                         enum mdoc_warn, const char *, ...);   * When GCC2 is deprecated, most of these can be reverted to #define
 void              mdoc_vmsg(struct mdoc *, int, int,   * as mdoc_vXXX using __VA_ARGS__.  Until then, use real functions.
    */
   int               mdoc_vwarn(struct mdoc *, int, int, const char *, ...);
   int               mdoc_verr(struct mdoc *, int, int, const char *, ...);
   int               mdoc_nerr(struct mdoc *, const struct mdoc_node *,
                         const char *, ...);                          const char *, ...);
 int               mdoc_verr(struct mdoc *, int, int,  int               mdoc_warn(struct mdoc *, const char *, ...);
                         const char *, ...);  int               mdoc_err(struct mdoc *, const char *, ...);
   int               mdoc_pwarn(struct mdoc *, int, int, const char *, ...);
   int               mdoc_perr(struct mdoc *, int, int, const char *, ...);
 int               mdoc_macro(MACRO_PROT_ARGS);  int               mdoc_macro(MACRO_PROT_ARGS);
 int               mdoc_word_alloc(struct mdoc *,  int               mdoc_word_alloc(struct mdoc *,
                         int, int, const char *);                          int, int, const char *);
Line 111  int    mdoc_tail_alloc(struct mdoc *, int, int, int);
Line 84  int    mdoc_tail_alloc(struct mdoc *, int, int, int);
 int               mdoc_body_alloc(struct mdoc *, int, int, int);  int               mdoc_body_alloc(struct mdoc *, int, int, int);
 void              mdoc_node_free(struct mdoc_node *);  void              mdoc_node_free(struct mdoc_node *);
 void              mdoc_node_freelist(struct mdoc_node *);  void              mdoc_node_freelist(struct mdoc_node *);
 void             *mdoc_tokhash_alloc(void);  void             *mdoc_hash_alloc(void);
 int               mdoc_tokhash_find(const void *, const char *);  int               mdoc_hash_find(const void *, const char *);
 void              mdoc_tokhash_free(void *);  void              mdoc_hash_free(void *);
 int               mdoc_iscdelim(char);  int               mdoc_iscdelim(char);
 int               mdoc_isdelim(const char *);  int               mdoc_isdelim(const char *);
 size_t            mdoc_isescape(const char *);  size_t            mdoc_isescape(const char *);
Line 146  int    mdoc_args(struct mdoc *, int,
Line 119  int    mdoc_args(struct mdoc *, int,
 #define ARGS_QWORD      (3)  #define ARGS_QWORD      (3)
 #define ARGS_PHRASE     (4)  #define ARGS_PHRASE     (4)
   
 /* FIXME: get rid of these. */  int               mdoc_macroend(struct mdoc *);
 int               xstrlcpys(char *, const struct mdoc_node *, size_t);  
 int               xstrlcat(char *, const char *, size_t);  
 int               xstrlcpy(char *, const char *, size_t);  
 int               xstrcmp(const char *, const char *);  
 void             *xrealloc(void *, size_t);  
 char             *xstrdup(const char *);  
 int               macro_end(struct mdoc *);  
   
 __END_DECLS  __END_DECLS
   
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.12
CVSweb