/*
- * Copyright (C) 1994-1998, Index Data
+ * Copyright (C) 1994-1999, Index Data
* All rights reserved.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dfa.c,v $
- * Revision 1.23 1998-09-02 14:15:28 adam
+ * Revision 1.27 1999-07-15 12:05:32 adam
+ * Bug fix: Anyset (.) includes all 8-bit characters when charmap is defined.
+ *
+ * Revision 1.26 1999/05/26 07:49:12 adam
+ * C++ compilation.
+ *
+ * Revision 1.25 1999/02/02 14:50:05 adam
+ * Updated WIN32 code specific sections. Changed header.
+ *
+ * Revision 1.24 1998/10/28 10:48:55 adam
+ * Added type cast to prevent warning.
+ *
+ * Revision 1.23 1998/09/02 14:15:28 adam
* Zebra uses GNU Configure.
*
* Revision 1.22 1998/06/24 12:16:10 adam
{
const int *cc;
for (cc = parse_info->charMap; *cc; cc += 2)
- if (*cc == parse_info->look_ch)
+ if (*cc == (int) (parse_info->look_ch))
{
if (!cc[1])
--parse_info->expr_ptr;
if (!dfa->charMap)
{
dfa->charMapSize = 7;
- dfa->charMap = imalloc (dfa->charMapSize * sizeof(*dfa->charMap));
+ dfa->charMap = (int *)
+ imalloc (dfa->charMapSize * sizeof(*dfa->charMap));
}
dfa->charMap[0] = 0;
}
if (dfa->charMap)
ifree (dfa->charMap);
dfa->charMapSize = size;
- dfa->charMap = imalloc (size * sizeof(*dfa->charMap));
+ dfa->charMap = (int *) imalloc (size * sizeof(*dfa->charMap));
}
memcpy (dfa->charMap, cmap, size * sizeof(*dfa->charMap));
}
size = dfa->charMapSize;
if (indx >= size)
{
- int *cn = imalloc ((size+16) * sizeof(*dfa->charMap));
+ int *cn = (int *) imalloc ((size+16) * sizeof(*dfa->charMap));
memcpy (cn, dfa->charMap, indx*sizeof(*dfa->charMap));
ifree (dfa->charMap);
dfa->charMap = cn;
parse_info->anyset = mk_BSet (&parse_info->charset);
res_BSet (parse_info->charset, parse_info->anyset);
- add_BSet (parse_info->charset, parse_info->anyset, '\n');
com_BSet (parse_info->charset, parse_info->anyset);
parse_info->use_Tnode = parse_info->max_Tnode = 0;
parse_info->start = parse_info->end = NULL;
if (debug_dfa_followpos)
pr_followpos(parse_info);
- init_DFA_states (&dfas, parse_info->poset, STATE_HASH);
+ init_DFA_states (&dfas, parse_info->poset, (int) (STATE_HASH));
mk_dfa_tran (parse_info, dfas);
if (debug_dfa_tran)
pr_tran (parse_info, dfas);
{
struct DFA *dfa;
- dfa = imalloc (sizeof(*dfa));
+ dfa = (struct DFA *) imalloc (sizeof(*dfa));
dfa->parse_info = dfa_parse_init ();
dfa->state_info = NULL;
dfa->states = NULL;
assert (dfa);
assert (dfa->parse_info);
parse_info = dfa->parse_info;
+
+ if (!parse_info->cmap)
+ {
+ res_BSet (parse_info->charset, parse_info->anyset);
+ add_BSet (parse_info->charset, parse_info->anyset, '\n');
+ com_BSet (parse_info->charset, parse_info->anyset);
+ }
do_parse (parse_info, pattern, &top);
if (parse_info->err_code)
return parse_info->err_code;