octave-jordi/gnulib-hg: lib/regex.c comparison

comparison lib/regex.c @ 80:d689538c6d85

merge with 1.4.1

author	Jim Meyering <jim@meyering.net>
date	Sat, 01 May 1993 19:59:12 +0000
parents	c2b3b494a819
children	8bc040c4fa94

comparison

equal deleted inserted replaced

-:a2b5af765702
+:d689538c6d85
 /* Extended regular expression matching and search library,
-version 0.11.
+version 0.12.
 (Implements POSIX draft P10003.2/D11.2, except for
 internationalization features.)
 Copyright (C) 1993 Free Software Foundation, Inc.
 #include "regex.h"
 /* isalpha etc. are used for the character classes.  */
 #include <ctype.h>
-#if !defined (isascii) || defined (STDC_HEADERS)
+/* Jim Meyering writes:
+"... Some ctype macros are valid only for character codes that
+isascii says are ASCII (SGI's IRIX-4.0.5 is one such system --when
+using /bin/cc or gcc but without giving an ansi option).  So, all
+ctype uses should be through macros like ISPRINT...  If
+STDC_HEADERS is defined, then autoconf has verified that the ctype
+macros don't need to be guarded with references to isascii. ...
+Defining isascii to 1 should let any compiler worth its salt
+eliminate the && through constant folding."  */
+#if ! defined (isascii) || defined (STDC_HEADERS)
 #undef isascii
 #define isascii(c) 1
 #endif
 #ifdef isblank
 because laststart was nonzero.  And we've already
 incremented `p', by the way, to be the character after
 the `*'.  Do we have to do something analogous here
 for null bytes, because of RE_DOT_NOT_NULL?  */
 if (TRANSLATE (*(p - 2)) == TRANSLATE ('.')
+		    && zero_times_ok
 && p < pend && TRANSLATE (*p) == TRANSLATE ('\n')
 && !(syntax & RE_DOT_NEWLINE))
 { /* We have .*\n.  */
 STORE_JUMP (jump, b, laststart);
 keep_string_p = true;
 compile_stack.avail++;
 fixup_alt_jump = 0;
 laststart = 0;
 begalt = b;
+	      /* If we've reached MAX_REGNUM groups, then this open
+		 won't actually generate any code, so we'll have to
+		 clear pending_exact explicitly.  */
+	      pending_exact = 0;
 break;
 case ')':
 if (syntax & RE_NO_BK_PARENS) goto normal_backslash;
 = COMPILE_STACK_TOP.fixup_alt_jump
 ? bufp->buffer + COMPILE_STACK_TOP.fixup_alt_jump - 1
 : 0;
 laststart = bufp->buffer + COMPILE_STACK_TOP.laststart_offset;
 this_group_regnum = COMPILE_STACK_TOP.regnum;
+		/* If we've reached MAX_REGNUM groups, then this open
+		   won't actually generate any code, so we'll have to
+		   clear pending_exact explicitly.  */
+		pending_exact = 0;
 /* We're at the end of the group, so now we know how many
 groups were inside this one.  */
 if (this_group_regnum <= MAX_REGNUM)
 {
 /* Written out as an if-else to avoid testing `translate'
 inside the loop.  */
 	      if (translate)
 while (range > lim
-&& !fastmap[(unsigned char) translate[*d++]])
+&& !fastmap[(unsigned char)
+				   translate[(unsigned char) *d++]])
 range--;
 	      else
 while (range > lim && !fastmap[(unsigned char) *d++])
 range--;
 if (regs->start == NULL || regs->end == NULL)
 return -2;
 }
 }
 else
-assert (bufp->regs_allocated == REGS_FIXED);
+		{
+		  /* These braces fend off a "empty body in an else-statement"
+		     warning under GCC when assert expands to nothing.  */
+		  assert (bufp->regs_allocated == REGS_FIXED);
+		}
 /* Convert the pointer data in `regstart' and `regend' to
 indices.  Register zero has to be set differently,
 since we haven't kept track of any info for it.  */
 if (regs->num_regs > 0)
 to this routine.  If we are given anything else, or if other regex
 code generates an invalid error code, then the program has a bug.
 Dump core so we can fix it.  */
 abort ();
+msg = re_error_msg[errcode];
+/* POSIX doesn't require that we do anything in this case, but why
+not be nice.  */
+if (! msg)
+msg = "Success";
 msg_size = strlen (msg) + 1; /* Includes the null.  */
 if (errbuf_size != 0)
 {
 if (msg_size > errbuf_size)

Mercurial > hg > octave-jordi > gnulib-hg

comparison lib/regex.c @ 80:d689538c6d85