comparison src/regex.c @ 28279:24a23e27dac6

(enum syntaxcode): Provide default for non-Emacs. (re_compile_fastmap, re_match_2_internal): Undo Dave's previous fix.

28278:85db5c5cde20

   USA.	 */

/* TODO:
   - detect nasty infinite loops like "\\(\\)+?ab" when matching "ac".
   - use analyze_first to optimize non-empty loops
   - reduce code duplication
   - optimize succeed_n and jump_n away when possible
   - clean up multibyte issues
   - structure the opcode space into opcode+flag.
   - merge with glic's regex.[ch]

#endif
#endif

/* Define the syntax stuff for \<, \>, etc.  */

/* This must be nonzero for the wordchar pattern
   commands in re_match_2.  */
#ifndef Sword
#define Sword 1
#endif

#ifdef SWITCH_ENUM_BUG
#define SWITCH_ENUM_CAST(x) ((int)(x))
#else
#define SWITCH_ENUM_CAST(x) (x)

	  if (!fastmap) break;
#ifndef emacs
	  not = (re_opcode_t)p[-1] == notsyntaxspec;
	  k = *p++;
	  for (j = 0; j < (1 << BYTEWIDTH); j++)
	    if ((SYNTAX (j) == (re_opcode_t) k) ^ not)
	      fastmap[j] = 1;
	  break;
#else  /* emacs */
	  /* This match depends on text properties.  These end with
	     aborting optimizations.  */

	    else
	      /* everything should be handled as ASCII, even though it
		 looks like multibyte form.  */
	      c = *d, len = 1;

	    if ((SYNTAX (c) != (re_opcode_t) mcnt) ^ not)
	      goto fail;
	    d += len;
	  }
	  break;

28279:24a23e27dac6

   USA.	 */

/* TODO:
   - detect nasty infinite loops like "\\(\\)+?ab" when matching "ac".
   - use analyze_first to optimize non-empty loops
   - optimize succeed_n and jump_n away when possible
   - clean up multibyte issues
   - structure the opcode space into opcode+flag.
   - merge with glic's regex.[ch]

#endif
#endif

/* Define the syntax stuff for \<, \>, etc.  */

/* Sword must be nonzero for the wordchar pattern commands in re_match_2.  */
enum syntaxcode { Swhitespace = 0, Sword = 1 };

#ifdef SWITCH_ENUM_BUG
#define SWITCH_ENUM_CAST(x) ((int)(x))
#else
#define SWITCH_ENUM_CAST(x) (x)

	  if (!fastmap) break;
#ifndef emacs
	  not = (re_opcode_t)p[-1] == notsyntaxspec;
	  k = *p++;
	  for (j = 0; j < (1 << BYTEWIDTH); j++)
	    if ((SYNTAX (j) == (enum syntaxcode) k) ^ not)
	      fastmap[j] = 1;
	  break;
#else  /* emacs */
	  /* This match depends on text properties.  These end with
	     aborting optimizations.  */

	    else
	      /* everything should be handled as ASCII, even though it
		 looks like multibyte form.  */
	      c = *d, len = 1;

	    if ((SYNTAX (c) != (enum syntaxcode) mcnt) ^ not)
	      goto fail;
	    d += len;
	  }
	  break;