# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 953786174 0
# Node ID 24a23e27dac681e6954ba328395425ade2f46419
# Parent  85db5c5cde2051c14ed0ec05c80c7ed11297a0cb
(enum syntaxcode): Provide default for non-Emacs.
(re_compile_fastmap, re_match_2_internal): Undo Dave's previous fix.

diff -r 85db5c5cde20 -r 24a23e27dac6 src/regex.c
--- a/src/regex.c	Thu Mar 23 02:39:58 2000 +0000
+++ b/src/regex.c	Thu Mar 23 04:36:14 2000 +0000
@@ -22,7 +22,6 @@
 /* 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.
@@ -133,11 +132,8 @@
 
 /* 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
+/* 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))
@@ -3462,7 +3458,7 @@
 	  not = (re_opcode_t)p[-1] == notsyntaxspec;
 	  k = *p++;
 	  for (j = 0; j < (1 << BYTEWIDTH); j++)
-	    if ((SYNTAX (j) == (re_opcode_t) k) ^ not)
+	    if ((SYNTAX (j) == (enum syntaxcode) k) ^ not)
 	      fastmap[j] = 1;
 	  break;
 #else  /* emacs */
@@ -5363,7 +5359,7 @@
 		 looks like multibyte form.  */
 	      c = *d, len = 1;
 
-	    if ((SYNTAX (c) != (re_opcode_t) mcnt) ^ not)
+	    if ((SYNTAX (c) != (enum syntaxcode) mcnt) ^ not)
 	      goto fail;
 	    d += len;
 	  }