gnats-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Changes to gnats/gnats/regex.h


From: Milan Zamazal
Subject: Changes to gnats/gnats/regex.h
Date: Mon, 10 Dec 2001 17:00:21 -0500

Index: gnats/gnats/regex.h
diff -c gnats/gnats/regex.h:1.1 gnats/gnats/regex.h:1.2
*** gnats/gnats/regex.h:1.1     Thu Nov  5 14:54:10 1998
--- gnats/gnats/regex.h Mon Dec 10 17:00:21 2001
***************
*** 1,7 ****
  /* Definitions for data structures and routines for the regular
     expression library, version 0.12.
  
!    Copyright (C) 1985, 1989, 1990, 1991, 1992, 1993 Free Software Foundation, 
Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
--- 1,7 ----
  /* Definitions for data structures and routines for the regular
     expression library, version 0.12.
  
!    Copyright (C) 1985,89,90,91,92,93,95,2000 Free Software Foundation, Inc.
  
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
***************
*** 15,48 ****
  
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
!    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
 */
  
! #ifndef __REGEXP_LIBRARY_H__
! #define __REGEXP_LIBRARY_H__
  
  /* POSIX says that <sys/types.h> must be included (by the caller) before
     <regex.h>.  */
  
! #ifdef VMS
  /* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
     should be there.  */
! #include <stddef.h>
  #endif
  
- 
  /* The following bits are used to determine the regexp syntax we
!    recognize.  The set/not-set meanings are chosen so that Emacs syntax
!    remains the value 0.  The bits are given in alphabetical order, and
     the definitions shifted by one from the previous bit; thus, when we
     add or remove a bit, only one other definition need change.  */
! typedef unsigned reg_syntax_t;
  
  /* If this bit is not set, then \ inside a bracket expression is literal.
     If set, then such a \ quotes the following character.  */
! #define RE_BACKSLASH_ESCAPE_IN_LISTS (1)
  
  /* If this bit is not set, then + and ? are operators, and \+ and \? are
!      literals. 
     If set, then \+ and \? are operators and + and ? are literals.  */
  #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
  
--- 15,54 ----
  
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
!    Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
!    USA.  */
  
! #ifndef _REGEX_H
! #define _REGEX_H 1
! 
! /* Allow the use in C++ code.  */
! #ifdef __cplusplus
! extern "C" {
! #endif
  
  /* POSIX says that <sys/types.h> must be included (by the caller) before
     <regex.h>.  */
  
! #if !defined _POSIX_C_SOURCE && !defined _POSIX_SOURCE && defined VMS
  /* VMS doesn't have `size_t' in <sys/types.h>, even though POSIX says it
     should be there.  */
! # include <stddef.h>
  #endif
  
  /* The following bits are used to determine the regexp syntax we
!    recognize.  The set/not-set meanings where historically chosen so
!    that Emacs syntax had the value 0.
!    The bits are given in alphabetical order, and
     the definitions shifted by one from the previous bit; thus, when we
     add or remove a bit, only one other definition need change.  */
! typedef unsigned long int reg_syntax_t;
  
  /* If this bit is not set, then \ inside a bracket expression is literal.
     If set, then such a \ quotes the following character.  */
! #define RE_BACKSLASH_ESCAPE_IN_LISTS ((unsigned long int) 1)
  
  /* If this bit is not set, then + and ? are operators, and \+ and \? are
!      literals.
     If set, then \+ and \? are operators and + and ? are literals.  */
  #define RE_BK_PLUS_QM (RE_BACKSLASH_ESCAPE_IN_LISTS << 1)
  
***************
*** 58,64 ****
          ^  is an anchor if it is at the beginning of a regular
             expression or after an open-group or an alternation operator;
          $  is an anchor if it is at the end of a regular expression, or
!            before a close-group or an alternation operator.  
  
     This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
     POSIX draft 11.2 says that * etc. in leading positions is undefined.
--- 64,70 ----
          ^  is an anchor if it is at the beginning of a regular
             expression or after an open-group or an alternation operator;
          $  is an anchor if it is at the end of a regular expression, or
!            before a close-group or an alternation operator.
  
     This bit could be (re)combined with RE_CONTEXT_INDEP_OPS, because
     POSIX draft 11.2 says that * etc. in leading positions is undefined.
***************
*** 69,75 ****
  /* If this bit is set, then special characters are always special
       regardless of where they are in the pattern.
     If this bit is not set, then special characters are special only in
!      some contexts; otherwise they are ordinary.  Specifically, 
       * + ? and intervals are only special when not after the beginning,
       open-group, or alternation operator.  */
  #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
--- 75,81 ----
  /* If this bit is set, then special characters are always special
       regardless of where they are in the pattern.
     If this bit is not set, then special characters are special only in
!      some contexts; otherwise they are ordinary.  Specifically,
       * + ? and intervals are only special when not after the beginning,
       open-group, or alternation operator.  */
  #define RE_CONTEXT_INDEP_OPS (RE_CONTEXT_INDEP_ANCHORS << 1)
***************
*** 91,97 ****
  #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
  
  /* If this bit is set, either \{...\} or {...} defines an
!      interval, depending on RE_NO_BK_BRACES. 
     If not set, \{, \}, {, and } are literals.  */
  #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
  
--- 97,103 ----
  #define RE_HAT_LISTS_NOT_NEWLINE (RE_DOT_NOT_NULL << 1)
  
  /* If this bit is set, either \{...\} or {...} defines an
!      interval, depending on RE_NO_BK_BRACES.
     If not set, \{, \}, {, and } are literals.  */
  #define RE_INTERVALS (RE_HAT_LISTS_NOT_NEWLINE << 1)
  
***************
*** 116,122 ****
     If not set, then \<digit> is a back-reference.  */
  #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
  
! /* If this bit is set, then | is an alternation operator, and \| is literal. 
     If not set, then \| is an alternation operator, and | is literal.  */
  #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
  
--- 122,128 ----
     If not set, then \<digit> is a back-reference.  */
  #define RE_NO_BK_REFS (RE_NO_BK_PARENS << 1)
  
! /* If this bit is set, then | is an alternation operator, and \| is literal.
     If not set, then \| is an alternation operator, and | is literal.  */
  #define RE_NO_BK_VBAR (RE_NO_BK_REFS << 1)
  
***************
*** 130,155 ****
     If not set, then an unmatched ) is invalid.  */
  #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
  
  /* This global variable defines the particular regexp syntax to use (for
     some interfaces).  When a regexp is compiled, the syntax used is
     stored in the pattern buffer, so changing this does not affect
     already-compiled regexps.  */
  extern reg_syntax_t re_syntax_options;
  
  /* Define combinations of the above bits for the standard possibilities.
     (The [[[ comments delimit what gets put into the Texinfo file, so
!    don't delete them!)  */ 
  /* [[[begin syntaxes]]] */
! #define RE_SYNTAX_EMACS 0
  
  #define RE_SYNTAX_AWK                                                 \
!   (RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DOT_NOT_NULL                     \
!    | RE_NO_BK_PARENS            | RE_NO_BK_REFS                               
\
!    | RE_NO_BK_VBAR               | RE_NO_EMPTY_RANGES                 \
!    | RE_UNMATCHED_RIGHT_PAREN_ORD)
  
  #define RE_SYNTAX_POSIX_AWK                                           \
!   (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS)
  
  #define RE_SYNTAX_GREP                                                        
\
    (RE_BK_PLUS_QM              | RE_CHAR_CLASSES                               
\
--- 136,200 ----
     If not set, then an unmatched ) is invalid.  */
  #define RE_UNMATCHED_RIGHT_PAREN_ORD (RE_NO_EMPTY_RANGES << 1)
  
+ /* If this bit is set, succeed as soon as we match the whole pattern,
+    without further backtracking.  */
+ #define RE_NO_POSIX_BACKTRACKING (RE_UNMATCHED_RIGHT_PAREN_ORD << 1)
+ 
+ /* If this bit is set, do not process the GNU regex operators.
+    If not set, then the GNU regex operators are recognized. */
+ #define RE_NO_GNU_OPS (RE_NO_POSIX_BACKTRACKING << 1)
+ 
+ /* If this bit is set, then *?, +? and ?? match non greedily. */
+ #define RE_FRUGAL (RE_NO_GNU_OPS << 1)
+ 
+ /* If this bit is set, then (?:...) is treated as a shy group.  */
+ #define RE_SHY_GROUPS (RE_FRUGAL << 1)
+ 
+ /* If this bit is set, ^ and $ only match at beg/end of buffer.  */
+ #define RE_NO_NEWLINE_ANCHOR (RE_SHY_GROUPS << 1)
+ 
+ /* If this bit is set, turn on internal regex debugging.
+    If not set, and debugging was on, turn it off.
+    This only works if regex.c is compiled -DDEBUG.
+    We define this bit always, so that all that's needed to turn on
+    debugging is to recompile regex.c; the calling code can always have
+    this bit set, and it won't affect anything in the normal case. */
+ #define RE_DEBUG (RE_NO_NEWLINE_ANCHOR << 1)
+ 
  /* This global variable defines the particular regexp syntax to use (for
     some interfaces).  When a regexp is compiled, the syntax used is
     stored in the pattern buffer, so changing this does not affect
     already-compiled regexps.  */
  extern reg_syntax_t re_syntax_options;
+ 
+ #ifdef emacs
+ /* In Emacs, this is the string or buffer in which we
+    are matching.  It is used for looking up syntax properties.  */
+ extern Lisp_Object re_match_object;
+ #endif
+ 
  
  /* Define combinations of the above bits for the standard possibilities.
     (The [[[ comments delimit what gets put into the Texinfo file, so
!    don't delete them!)  */
  /* [[[begin syntaxes]]] */
! #define RE_SYNTAX_EMACS                                                       
\
!   (RE_CHAR_CLASSES | RE_INTERVALS | RE_SHY_GROUPS | RE_FRUGAL)
  
  #define RE_SYNTAX_AWK                                                 \
!   (RE_BACKSLASH_ESCAPE_IN_LISTS   | RE_DOT_NOT_NULL                   \
!    | RE_NO_BK_PARENS              | RE_NO_BK_REFS                     \
!    | RE_NO_BK_VBAR                | RE_NO_EMPTY_RANGES                        
\
!    | RE_DOT_NEWLINE             | RE_CONTEXT_INDEP_ANCHORS            \
!    | RE_UNMATCHED_RIGHT_PAREN_ORD | RE_NO_GNU_OPS)
! 
! #define RE_SYNTAX_GNU_AWK                                             \
!   ((RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS | RE_DEBUG)       
\
!    & ~(RE_DOT_NOT_NULL | RE_INTERVALS | RE_CONTEXT_INDEP_OPS))
  
  #define RE_SYNTAX_POSIX_AWK                                           \
!   (RE_SYNTAX_POSIX_EXTENDED | RE_BACKSLASH_ESCAPE_IN_LISTS            \
!    | RE_INTERVALS         | RE_NO_GNU_OPS)
  
  #define RE_SYNTAX_GREP                                                        
\
    (RE_BK_PLUS_QM              | RE_CHAR_CLASSES                               
\
***************
*** 185,197 ****
    (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
  
  #define RE_SYNTAX_POSIX_EXTENDED                                      \
!   (_RE_SYNTAX_POSIX_COMMON | RE_CONTEXT_INDEP_ANCHORS                 \
!    | RE_CONTEXT_INDEP_OPS  | RE_NO_BK_BRACES                          \
!    | RE_NO_BK_PARENS       | RE_NO_BK_VBAR                            \
!    | RE_UNMATCHED_RIGHT_PAREN_ORD)
  
! /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INVALID_OPS
!    replaces RE_CONTEXT_INDEP_OPS and RE_NO_BK_REFS is added.  */
  #define RE_SYNTAX_POSIX_MINIMAL_EXTENDED                              \
    (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS                        
\
     | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES                         \
--- 230,242 ----
    (_RE_SYNTAX_POSIX_COMMON | RE_LIMITED_OPS)
  
  #define RE_SYNTAX_POSIX_EXTENDED                                      \
!   (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS                        
\
!    | RE_CONTEXT_INDEP_OPS   | RE_NO_BK_BRACES                         \
!    | RE_NO_BK_PARENS        | RE_NO_BK_VBAR                           \
!    | RE_CONTEXT_INVALID_OPS | RE_UNMATCHED_RIGHT_PAREN_ORD)
  
! /* Differs from ..._POSIX_EXTENDED in that RE_CONTEXT_INDEP_OPS is
!    removed and RE_NO_BK_REFS is added.  */
  #define RE_SYNTAX_POSIX_MINIMAL_EXTENDED                              \
    (_RE_SYNTAX_POSIX_COMMON  | RE_CONTEXT_INDEP_ANCHORS                        
\
     | RE_CONTEXT_INVALID_OPS | RE_NO_BK_BRACES                         \
***************
*** 203,211 ****
     (erroneously) define this in other header files, but we want our
     value, so remove any previous define.  */
  #ifdef RE_DUP_MAX
! #undef RE_DUP_MAX
  #endif
! #define RE_DUP_MAX ((1 << 15) - 1) 
  
  
  /* POSIX `cflags' bits (i.e., information for `regcomp').  */
--- 248,257 ----
     (erroneously) define this in other header files, but we want our
     value, so remove any previous define.  */
  #ifdef RE_DUP_MAX
! # undef RE_DUP_MAX
  #endif
! /* If sizeof(int) == 2, then ((1 << 15) - 1) overflows.  */
! #define RE_DUP_MAX (0x7fff)
  
  
  /* POSIX `cflags' bits (i.e., information for `regcomp').  */
***************
*** 217,223 ****
  /* If this bit is set, then ignore case when matching.
     If not set, then case is significant.  */
  #define REG_ICASE (REG_EXTENDED << 1)
!  
  /* If this bit is set, then anchors do not match at newline
       characters in the string.
     If not set, then anchors do match at newlines.  */
--- 263,269 ----
  /* If this bit is set, then ignore case when matching.
     If not set, then case is significant.  */
  #define REG_ICASE (REG_EXTENDED << 1)
! 
  /* If this bit is set, then anchors do not match at newline
       characters in the string.
     If not set, then anchors do match at newlines.  */
***************
*** 245,250 ****
--- 291,300 ----
     `re_error_msg' table in regex.c.  */
  typedef enum
  {
+ #ifdef _XOPEN_SOURCE
+   REG_ENOSYS = -1,    /* This will never happen for this implementation.  */
+ #endif
+ 
    REG_NOERROR = 0,    /* Success.  */
    REG_NOMATCH,                /* Didn't find a match (for regexec).  */
  
***************
*** 256,262 ****
    REG_EESCAPE,                /* Trailing backslash.  */
    REG_ESUBREG,                /* Invalid back reference.  */
    REG_EBRACK,         /* Unmatched left bracket.  */
!   REG_EPAREN,         /* Parenthesis imbalance.  */ 
    REG_EBRACE,         /* Unmatched \{.  */
    REG_BADBR,          /* Invalid contents of \{\}.  */
    REG_ERANGE,         /* Invalid range end.  */
--- 306,312 ----
    REG_EESCAPE,                /* Trailing backslash.  */
    REG_ESUBREG,                /* Invalid back reference.  */
    REG_EBRACK,         /* Unmatched left bracket.  */
!   REG_EPAREN,         /* Parenthesis imbalance.  */
    REG_EBRACE,         /* Unmatched \{.  */
    REG_BADBR,          /* Invalid contents of \{\}.  */
    REG_ERANGE,         /* Invalid range end.  */
***************
*** 275,280 ****
--- 325,334 ----
     compiled, the `re_nsub' field is available.  All other fields are
     private to the regex routines.  */
  
+ #ifndef RE_TRANSLATE_TYPE
+ # define RE_TRANSLATE_TYPE char *
+ #endif
+ 
  struct re_pattern_buffer
  {
  /* [[[begin pattern_buffer]]] */
***************
*** 284,293 ****
    unsigned char *buffer;
  
        /* Number of bytes to which `buffer' points.  */
!   unsigned long allocated;
  
        /* Number of bytes actually used in `buffer'.  */
!   unsigned long used; 
  
          /* Syntax setting with which the pattern was compiled.  */
    reg_syntax_t syntax;
--- 338,347 ----
    unsigned char *buffer;
  
        /* Number of bytes to which `buffer' points.  */
!   size_t allocated;
  
        /* Number of bytes actually used in `buffer'.  */
!   size_t used;
  
          /* Syntax setting with which the pattern was compiled.  */
    reg_syntax_t syntax;
***************
*** 301,307 ****
             comparing them, or zero for no translation.  The translation
             is applied to a pattern when it is compiled and to a string
             when it is matched.  */
!   char *translate;
  
        /* Number of subexpressions found by the compiler.  */
    size_t re_nsub;
--- 355,361 ----
             comparing them, or zero for no translation.  The translation
             is applied to a pattern when it is compiled and to a string
             when it is matched.  */
!   RE_TRANSLATE_TYPE translate;
  
        /* Number of subexpressions found by the compiler.  */
    size_t re_nsub;
***************
*** 309,316 ****
          /* Zero if this pattern cannot match the empty string, one else.
             Well, in truth it's used only in `re_search_2', to see
             whether or not we should use the fastmap, so we don't set
!            this absolutely perfectly; see `re_compile_fastmap' (the
!            `duplicate' case).  */
    unsigned can_be_null : 1;
  
          /* If REGS_UNALLOCATED, allocate space in the `regs' structure
--- 363,369 ----
          /* Zero if this pattern cannot match the empty string, one else.
             Well, in truth it's used only in `re_search_2', to see
             whether or not we should use the fastmap, so we don't set
!            this absolutely perfectly; see `re_compile_fastmap'.  */
    unsigned can_be_null : 1;
  
          /* If REGS_UNALLOCATED, allocate space in the `regs' structure
***************
*** 331,354 ****
    unsigned no_sub : 1;
  
          /* If set, a beginning-of-line anchor doesn't match at the
!            beginning of the string.  */ 
    unsigned not_bol : 1;
  
          /* Similarly for an end-of-line anchor.  */
    unsigned not_eol : 1;
  
!         /* If true, an anchor at a newline matches.  */
!   unsigned newline_anchor : 1;
  
  /* [[[end pattern_buffer]]] */
  };
  
  typedef struct re_pattern_buffer regex_t;
- 
- 
- /* search.c (search_buffer) in Emacs needs this one opcode value.  It is
-    defined both in `regex.c' and here.  */
- #define RE_EXACTN_VALUE 1
  
  /* Type for byte offsets within the string.  POSIX mandates this.  */
  typedef int regoff_t;
--- 384,405 ----
    unsigned no_sub : 1;
  
          /* If set, a beginning-of-line anchor doesn't match at the
!            beginning of the string.  */
    unsigned not_bol : 1;
  
          /* Similarly for an end-of-line anchor.  */
    unsigned not_eol : 1;
  
! #ifdef emacs
!   /* If true, multi-byte form in the `buffer' should be recognized as a
!      multibyte character. */
!   unsigned multibyte : 1;
! #endif
  
  /* [[[end pattern_buffer]]] */
  };
  
  typedef struct re_pattern_buffer regex_t;
  
  /* Type for byte offsets within the string.  POSIX mandates this.  */
  typedef int regoff_t;
***************
*** 368,374 ****
     `re_match_2' returns information about at least this many registers
     the first time a `regs' structure is passed.  */
  #ifndef RE_NREGS
! #define RE_NREGS 30
  #endif
  
  
--- 419,425 ----
     `re_match_2' returns information about at least this many registers
     the first time a `regs' structure is passed.  */
  #ifndef RE_NREGS
! # define RE_NREGS 30
  #endif
  
  
***************
*** 389,407 ****
     unfortunately clutters up the declarations a bit, but I think it's
     worth it.  */
  
! #if __STDC__
  
! #define _RE_ARGS(args) args
  
! #else /* not __STDC__ */
  
! #ifndef const
! #define const
! #endif
  
! #define _RE_ARGS(args) ()
! 
! #endif /* not __STDC__ */
  
  /* Sets the current default syntax to SYNTAX, and return the old syntax.
     You can also simply assign to the `re_syntax_options' variable.  */
--- 440,454 ----
     unfortunately clutters up the declarations a bit, but I think it's
     worth it.  */
  
! #if defined __STDC__ || defined PROTOTYPES
  
! # define _RE_ARGS(args) args
  
! #else /* not __STDC__  || PROTOTYPES */
  
! # define _RE_ARGS(args) ()
  
! #endif /* not __STDC__  || PROTOTYPES */
  
  /* Sets the current default syntax to SYNTAX, and return the old syntax.
     You can also simply assign to the `re_syntax_options' variable.  */
***************
*** 411,417 ****
     and syntax given by the global `re_syntax_options', into the buffer
     BUFFER.  Return NULL if successful, and an error string if not.  */
  extern const char *re_compile_pattern
!   _RE_ARGS ((const char *pattern, int length,
               struct re_pattern_buffer *buffer));
  
  
--- 458,464 ----
     and syntax given by the global `re_syntax_options', into the buffer
     BUFFER.  Return NULL if successful, and an error string if not.  */
  extern const char *re_compile_pattern
!   _RE_ARGS ((const char *pattern, size_t length,
               struct re_pattern_buffer *buffer));
  
  
***************
*** 447,453 ****
  
  
  /* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
! extern int re_match_2 
    _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
               int length1, const char *string2, int length2,
               int start, struct re_registers *regs, int stop));
--- 494,500 ----
  
  
  /* Relates to `re_match' as `re_search_2' relates to `re_search'.  */
! extern int re_match_2
    _RE_ARGS ((struct re_pattern_buffer *buffer, const char *string1,
               int length1, const char *string2, int length2,
               int start, struct re_registers *regs, int stop));
***************
*** 469,489 ****
    _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
               unsigned num_regs, regoff_t *starts, regoff_t *ends));
  
  /* 4.2 bsd compatibility.  */
  extern char *re_comp _RE_ARGS ((const char *));
  extern int re_exec _RE_ARGS ((const char *));
  
  /* POSIX compatibility.  */
! extern int regcomp _RE_ARGS ((regex_t *preg, const char *pattern, int 
cflags));
! extern int regexec
!   _RE_ARGS ((const regex_t *preg, const char *string, size_t nmatch,
!              regmatch_t pmatch[], int eflags));
! extern size_t regerror
!   _RE_ARGS ((int errcode, const regex_t *preg, char *errbuf,
!              size_t errbuf_size));
! extern void regfree _RE_ARGS ((regex_t *preg));
  
! #endif /* not __REGEXP_LIBRARY_H__ */
  
  /*
  Local variables:
--- 516,566 ----
    _RE_ARGS ((struct re_pattern_buffer *buffer, struct re_registers *regs,
               unsigned num_regs, regoff_t *starts, regoff_t *ends));
  
+ #if defined _REGEX_RE_COMP || defined _LIBC
+ # ifndef _CRAY
  /* 4.2 bsd compatibility.  */
  extern char *re_comp _RE_ARGS ((const char *));
  extern int re_exec _RE_ARGS ((const char *));
+ # endif
+ #endif
+ 
+ /* GCC 2.95 and later have "__restrict"; C99 compilers have
+    "restrict", and "configure" may have defined "restrict".  */
+ #ifndef __restrict
+ # if ! (2 < __GNUC__ || (2 == __GNUC__ && 95 <= __GNUC_MINOR__))
+ #  if defined restrict || 199901L <= __STDC_VERSION__
+ #   define __restrict restrict
+ #  else
+ #   define __restrict
+ #  endif
+ # endif
+ #endif
+ /* For now unconditionally define __restrict_arr to expand to nothing.
+    Ideally we would have a test for the compiler which allows defining
+    it to restrict.  */
+ #define __restrict_arr
  
  /* POSIX compatibility.  */
! extern int regcomp _RE_ARGS ((regex_t *__restrict __preg,
!                             const char *__restrict __pattern,
!                             int __cflags));
! 
! extern int regexec _RE_ARGS ((const regex_t *__restrict __preg,
!                             const char *__restrict __string, size_t __nmatch,
!                             regmatch_t __pmatch[__restrict_arr],
!                             int __eflags));
! 
! extern size_t regerror _RE_ARGS ((int __errcode, const regex_t *__preg,
!                                 char *__errbuf, size_t __errbuf_size));
! 
! extern void regfree _RE_ARGS ((regex_t *__preg));
! 
! 
! #ifdef __cplusplus
! }
! #endif        /* C++ */
  
! #endif /* regex.h */
  
  /*
  Local variables:



reply via email to

[Prev in Thread] Current Thread [Next in Thread]