Changed prototype for chr_map_input - added const.

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

diff --git a/dfa/dfa.c b/dfa/dfa.c
index 276ca06..945adad 100644 (file)
--- a/dfa/dfa.c
+++ b/dfa/dfa.c
@@ -1,10 +1,17 @@
 /*
- * Copyright (C) 1994-1996, Index Data I/S 
+ * Copyright (C) 1994-1997, Index Data I/S 
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: dfa.c,v $
- * Revision 1.14  1996-10-29 13:57:22  adam
+ * Revision 1.16  1997-09-05 15:29:57  adam
+ * Changed prototype for chr_map_input - added const.
+ * Added support for C++, headers uses extern "C" for public definitions.
+ *
+ * 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
@@ -61,6 +68,8 @@
 #include "dfap.h"
 #include "imalloc.h"
 
+#define DFA_OPEN_RANGE 1
+
 #define CAT     16000
 #define OR      16001
 #define STAR    16002
@@ -413,7 +422,8 @@ static int read_charset (void)
             break;
         if (parse_info->cmap)
         {
-            char **mapto, mapfrom[2];
+            const char **mapto;
+           char mapfrom[2];
             const char *mcp = mapfrom;
             mapfrom[0] = ch0;
             mapto = (*parse_info->cmap)(&mcp, 1);
@@ -424,16 +434,26 @@ 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 **mapto;
+               char mapfrom[2];
                 const char *mcp = mapfrom;
                 mapfrom[0] = ch1;
                 mapto = (*parse_info->cmap) (&mcp, 1);
@@ -442,7 +462,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
         {
@@ -457,7 +480,7 @@ static int read_charset (void)
 
 static int map_l_char (void)
 {
-    char **mapto;
+    const char **mapto;
     const char *cp0 = (const char *) (expr_ptr-1);
     int i = 0, len = strlen(cp0);
 
@@ -1084,7 +1107,8 @@ struct DFA *dfa_init (void)
     return dfa;
 }
 
-void dfa_set_cmap (struct DFA *dfa, char **(*cmap)(const char **from, int len))
+void dfa_set_cmap (struct DFA *dfa,
+                  const char **(*cmap)(const char **from, int len))
 {
     dfa->parse_info->cmap = cmap;
 }