Added facility for open character sets, eg [a-].

[idzebra-moved-to-github.git] / dfa / dfa.c

diff --git a/dfa/dfa.c b/dfa/dfa.c
index 5504f41..199ebea 100644 (file)
--- a/dfa/dfa.c
+++ b/dfa/dfa.c
@@ -4,7 +4,13 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dfa.c,v $
- * Revision 1.13  1996-06-17 14:24:08  adam
+ * Revision 1.15  1997-02-10 10:19:20  adam
+ * Added facility for open character sets, eg [a-].
+ *
+ * Revision 1.14  1996/10/29 13:57:22  adam
+ * Include of zebrautl.h instead of alexutil.h.
+ *
+ * Revision 1.13  1996/06/17 14:24:08  adam
  * Bug fix: read_charset didn't handle character mapping.
  *
  * Revision 1.12  1996/06/04 10:20:02  adam
@@ -54,10 +60,12 @@
 #include <string.h>
 #include <ctype.h>
 
-#include <alexutil.h>
+#include <zebrautl.h>
 #include "dfap.h"
 #include "imalloc.h"
 
+#define DFA_OPEN_RANGE 1
+
 #define CAT     16000
 #define OR      16001
 #define STAR    16002
@@ -421,14 +429,23 @@ static int read_charset (void)
         ch1 = nextchar_set (&esc1);
         if (!esc1 && ch1 == '-')
         {
+            int open_range = 0;
             if ((ch1 = nextchar_set (&esc1)) == 0)
                 break;
+#if DFA_OPEN_RANGE
+            if (!esc1 && ch1 == ']')
+            {
+                ch1 = 255;
+                open_range = 1;
+            }
+#else
             if (!esc1 && ch1 == ']')
             {
                 add_BSet (parse_info->charset, look_chars, '-');
                 break;
             }
-            if (parse_info->cmap)
+#endif
+            if (!open_range && parse_info->cmap)
             {
                 char **mapto, mapfrom[2];
                 const char *mcp = mapfrom;
@@ -439,7 +456,10 @@ static int read_charset (void)
             }
             for (i=ch0; ++i<=ch1;)
                 add_BSet (parse_info->charset, look_chars, i);
-            ch0 = nextchar_set (&esc0);
+            if (!open_range)
+                ch0 = nextchar_set (&esc0);
+            else
+                break;
         }
         else
         {
@@ -455,7 +475,7 @@ static int read_charset (void)
 static int map_l_char (void)
 {
     char **mapto;
-    const char *cp0 = expr_ptr-1;
+    const char *cp0 = (const char *) (expr_ptr-1);
     int i = 0, len = strlen(cp0);
 
     if (cp0[0] == 1 && cp0[1])
@@ -470,7 +490,7 @@ static int map_l_char (void)
     mapto = (*parse_info->cmap) (&cp0, len);
     assert (mapto);
     
-    expr_ptr = cp0;
+    expr_ptr = (const unsigned char *) cp0;
     look_ch = mapto[i][0];
     logf (LOG_DEBUG, "map from %c to %d", expr_ptr[-1], look_ch);
     return L_CHAR;