#include <time.h>
#include "platform.h"
#include "gnunet_regex_lib.h"
+#include "regex_internal.h"
-#define KEEP_FILES 0
+#define KEEP_FILES 1
/**
* Check if 'filename' exists and is not empty.
*
* @return 0 if ok, non 0 on error.
*/
-int
+static int
filecheck (const char *filename)
{
int error = 0;
- FILE *fp = NULL;
-
- // Check if file was created and delete it again
- fp = fopen (filename, "r");
+ FILE *fp;
- if (NULL == fp)
+ /* Check if file was created and delete it again */
+ if (NULL == (fp = fopen (filename, "r")))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not find graph %s\n", filename);
- return ++error;
+ return 1;
}
- fseek (fp, 0L, SEEK_END);
+ GNUNET_break (0 == fseek (fp, 0L, SEEK_END));
if (1 > ftell (fp))
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
"Graph writing failed, got empty file (%s)!\n", filename);
- error++;
+ error = 2;
}
- error += fclose (fp);
+ GNUNET_assert (0 == fclose (fp));
if (!KEEP_FILES)
{
if (0 != unlink (filename))
- {
- GNUNET_log (GNUNET_ERROR_TYPE_ERROR, "Could not remove temp files (%s)\n",
- filename);
- }
+ GNUNET_log_strerror_file (GNUNET_ERROR_TYPE_ERROR, "unlink", filename);
}
-
-
return error;
}
+
int
main (int argc, char *argv[])
{
- GNUNET_log_setup ("test-regex", "WARNING", NULL);
-
int error;
struct GNUNET_REGEX_Automaton *a;
unsigned int i;
const char *filename = "test_graph.dot";
- error = 0;
-
const char *regex[12] = {
"ab(c|d)+c*(a(b|c)+d)+(bla)+",
"(bla)*",
"a+X*y+c|p|R|Z*K*y*R+w|Y*6+n+h*k*w+V*F|W*B*e*",
"a",
"a|b",
-// "abc(d+|e)fgh"
"PADPADPADPADPADPabcdefghixxxxxxxxxxxxxjklmnop*qstoisdjfguisdfguihsdfgbdsuivggsd"
};
+ GNUNET_log_setup ("test-regex", "WARNING", NULL);
+ error = 0;
for (i = 0; i < 12; i++)
{
- // Check NFA graph creation
+ /* Check NFA graph creation */
a = GNUNET_REGEX_construct_nfa (regex[i], strlen (regex[i]));
GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT);
GNUNET_REGEX_automaton_destroy (a);
error += filecheck (filename);
- // Check DFA graph creation
- a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]));
+ /* Check DFA graph creation */
+ a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 0);
GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT);
GNUNET_REGEX_automaton_destroy (a);
error += filecheck (filename);
- a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]));
+ a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 0);
GNUNET_REGEX_automaton_save_graph (a, filename,
GNUNET_REGEX_GRAPH_DEFAULT |
GNUNET_REGEX_GRAPH_VERBOSE);
GNUNET_REGEX_automaton_destroy (a);
error += filecheck (filename);
- a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]));
+ a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 0);
GNUNET_REGEX_automaton_save_graph (a, filename,
GNUNET_REGEX_GRAPH_DEFAULT |
GNUNET_REGEX_GRAPH_COLORING);
error += filecheck (filename);
- a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]));
- GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT); //|
- // GNUNET_REGEX_GRAPH_VERBOSE |
- //GNUNET_REGEX_GRAPH_COLORING);
+ a = GNUNET_REGEX_construct_dfa (regex[i], strlen (regex[i]), 4);
+ GNUNET_REGEX_automaton_save_graph (a, filename, GNUNET_REGEX_GRAPH_DEFAULT);
GNUNET_REGEX_automaton_destroy (a);
error += filecheck (filename);