* Sebastian Hammer, Adam Dickmeiss
*
* $Log: dfa.c,v $
- * Revision 1.19 1998-01-12 14:39:39 adam
+ * Revision 1.22 1998-06-24 12:16:10 adam
+ * Support for relations on text operands. Open range support in
+ * DFA module (i.e. [-j], [g-]).
+ *
+ * Revision 1.21 1998/06/22 11:33:39 adam
+ * Added two type casts.
+ *
+ * Revision 1.20 1998/06/08 14:40:44 adam
+ * Fixed problem with signed character(s) in regular expressions.
+ *
+ * Revision 1.19 1998/01/12 14:39:39 adam
* Fixed bug in term_Tnode.
*
* Revision 1.18 1997/09/29 09:05:17 adam
{
if (!esc0 && ch0 == ']')
break;
- if (parse_info->cmap)
- {
- const char **mapto;
- char mapfrom[2];
- const char *mcp = mapfrom;
- mapfrom[0] = ch0;
- mapto = (*parse_info->cmap)(parse_info->cmap_data, &mcp, 1);
- assert (mapto);
- ch0 = mapto[0][0];
- }
- add_BSet (parse_info->charset, parse_info->look_chars, ch0);
- ch1 = nextchar_set (parse_info, &esc1);
+ if (!esc0 && ch0 == '-')
+ {
+ ch1 = ch0;
+ esc1 = esc0;
+ ch0 = 1;
+ add_BSet (parse_info->charset, parse_info->look_chars, ch0);
+ }
+ else
+ {
+ if (parse_info->cmap)
+ {
+ const char **mapto;
+ char mapfrom[2];
+ const char *mcp = mapfrom;
+ mapfrom[0] = ch0;
+ mapto = (*parse_info->cmap)(parse_info->cmap_data, &mcp, 1);
+ assert (mapto);
+ ch0 = mapto[0][0];
+ }
+ add_BSet (parse_info->charset, parse_info->look_chars, ch0);
+ ch1 = nextchar_set (parse_info, &esc1);
+ }
if (!esc1 && ch1 == '-')
{
int open_range = 0;
if (cp0[0] == 1 && cp0[1])
{
parse_info->expr_ptr++;
- parse_info->look_ch = cp0[1];
+ parse_info->look_ch = ((unsigned char *) cp0)[1];
return L_CHAR;
}
if (!parse_info->cmap)
assert (mapto);
parse_info->expr_ptr = (const unsigned char *) cp0;
- parse_info->look_ch = mapto[i][0];
+ parse_info->look_ch = ((unsigned char **) mapto)[i][0];
logf (LOG_DEBUG, "map from %c to %d", parse_info->expr_ptr[-1], parse_info->look_ch);
return L_CHAR;
}
{
static char s[6];
s[0] = '\\';
- if (c < 32)
+ if (c < 32 || c >= 127)
switch (c)
{
case '\r':