-/* $Id: regxread.c,v 1.3 2006-08-22 13:39:27 adam Exp $
- Copyright (C) 1995-2006
+/* $Id: regxread.c,v 1.7 2007-03-19 21:50:39 adam Exp $
+ Copyright (C) 1995-2007
Index Data ApS
This file is part of the Zebra server.
}
}
fclose (spec_inf);
- wrbuf_free(lineBuf, 1);
+ wrbuf_destroy(lineBuf);
for (lc = spec->context; lc; lc = lc->next)
{
start_ptr, pptr);
}
-data1_node *lexNode (struct lexSpec *spec, int *ptr)
+int lexNode (struct lexSpec *spec, int *ptr)
{
struct lexContext *context = spec->context_stack[spec->context_stack_top];
struct DFA_state *state = context->dfa->states[0];
int last_ptr = *ptr; /* last char of match */
int start_ptr = *ptr; /* first char of match */
int skip_ptr = *ptr; /* first char of run */
+ int more = 0;
while (1)
{
*ptr = last_ptr;
/* execute rule */
if (!execRule (spec, context, last_rule, start_ptr, ptr))
- break;
+ return more;
/* restore skip pointer */
skip_ptr = *ptr;
last_rule = 0;
buf = f_win_get (spec, skip_ptr, *ptr, &size);
execDataP (spec, buf, size, 0);
}
+ state = context->dfa->states[0];
if (*ptr == F_WIN_EOF)
- break;
+ return more;
}
t = state->trans;
i = state->tran_no;
#endif
(*spec->f_win_ef)(spec->stream, &end_offset);
}
- return NULL;
+ return more;
}
context = spec->context_stack[spec->context_stack_top];
skip_ptr = *ptr;
last_rule = state->rule_nno;
last_ptr = *ptr;
}
+ more = 1;
}
break;
}
else
t++;
}
- return NULL;
+ return more;
}
static data1_node *lexRoot (struct lexSpec *spec, off_t offset,
{
struct lexContext *lt = spec->context;
int ptr = offset;
+ int ret;
spec->stop_flag = 0;
spec->d1_level = 0;
}
#endif
execAction (spec, lt->beginActionList, ptr, &ptr);
- lexNode (spec, &ptr);
+
+ ret = lexNode (spec, &ptr);
while (spec->d1_level)
{
tagDataRelease (spec);
(spec->d1_level)--;
}
+ if (!ret)
+ return 0;
execAction (spec, lt->endActionList, ptr, &ptr);
return spec->d1_stack[0];
}