psyc/social: local join flag; social service: leave place, save _file

[oweals/gnunet.git] / src / regex / test_regex_graph_api.c

diff --git a/src/regex/test_regex_graph_api.c b/src/regex/test_regex_graph_api.c
index a0d44fb2f904cdbee31d367275acefd4d80c28f9..e12ff89be8f4d2cb040e6128593611e79e99a73b 100644 (file)
--- a/src/regex/test_regex_graph_api.c
+++ b/src/regex/test_regex_graph_api.c
@@ -1,6 +1,6 @@
 /*
      This file is part of GNUnet
-     (C) 2012 Christian Grothoff (and other contributing authors)
+     Copyright (C) 2012 Christian Grothoff (and other contributing authors)
 
      GNUnet is free software; you can redistribute it and/or modify
      it under the terms of the GNU General Public License as published
@@ -14,8 +14,8 @@
 
      You should have received a copy of the GNU General Public License
      along with GNUnet; see the file COPYING.  If not, write to the
-     Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-     Boston, MA 02111-1307, USA.
+     Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA 02110-1301, USA.
 */
 /**
  * @file regex/test_regex_graph_api.c
@@ -74,7 +74,7 @@ int
 main (int argc, char *argv[])
 {
   int error;
-  struct REGEX_ITERNAL_Automaton *a;
+  struct REGEX_INTERNAL_Automaton *a;
   unsigned int i;
   const char *filename = "test_graph.dot";
 
@@ -98,58 +98,58 @@ main (int argc, char *argv[])
   for (i = 0; i < 12; i++)
   {
     /* Check NFA graph creation */
-    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
-    REGEX_ITERNAL_automaton_save_graph (a, filename, REGEX_ITERNAL_GRAPH_DEFAULT);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_TEST_automaton_save_graph (a, filename, REGEX_TEST_GRAPH_DEFAULT);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
-    REGEX_ITERNAL_automaton_save_graph (a, filename,
-                                       REGEX_ITERNAL_GRAPH_DEFAULT |
-                                       REGEX_ITERNAL_GRAPH_VERBOSE);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_TEST_automaton_save_graph (a, filename,
+                                       REGEX_TEST_GRAPH_DEFAULT |
+                                       REGEX_TEST_GRAPH_VERBOSE);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
-    REGEX_ITERNAL_automaton_save_graph (a, filename,
-                                       REGEX_ITERNAL_GRAPH_DEFAULT |
-                                       REGEX_ITERNAL_GRAPH_COLORING);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_TEST_automaton_save_graph (a, filename,
+                                       REGEX_TEST_GRAPH_DEFAULT |
+                                       REGEX_TEST_GRAPH_COLORING);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = REGEX_ITERNAL_construct_nfa (regex[i], strlen (regex[i]));
-    REGEX_ITERNAL_automaton_save_graph (a, filename,
-                                       REGEX_ITERNAL_GRAPH_DEFAULT |
-                                       REGEX_ITERNAL_GRAPH_VERBOSE |
-                                       REGEX_ITERNAL_GRAPH_COLORING);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_nfa (regex[i], strlen (regex[i]));
+    REGEX_TEST_automaton_save_graph (a, filename,
+                                       REGEX_TEST_GRAPH_DEFAULT |
+                                       REGEX_TEST_GRAPH_VERBOSE |
+                                       REGEX_TEST_GRAPH_COLORING);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
 
     /* Check DFA graph creation */
-    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
-    REGEX_ITERNAL_automaton_save_graph (a, filename, REGEX_ITERNAL_GRAPH_DEFAULT);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
+    REGEX_TEST_automaton_save_graph (a, filename, REGEX_TEST_GRAPH_DEFAULT);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
-    REGEX_ITERNAL_automaton_save_graph (a, filename,
-                                       REGEX_ITERNAL_GRAPH_DEFAULT |
-                                       REGEX_ITERNAL_GRAPH_VERBOSE);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
+    REGEX_TEST_automaton_save_graph (a, filename,
+                                       REGEX_TEST_GRAPH_DEFAULT |
+                                       REGEX_TEST_GRAPH_VERBOSE);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
-    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
-    REGEX_ITERNAL_automaton_save_graph (a, filename,
-                                       REGEX_ITERNAL_GRAPH_DEFAULT |
-                                       REGEX_ITERNAL_GRAPH_COLORING);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_dfa (regex[i], strlen (regex[i]), 0);
+    REGEX_TEST_automaton_save_graph (a, filename,
+                                       REGEX_TEST_GRAPH_DEFAULT |
+                                       REGEX_TEST_GRAPH_COLORING);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
 
-    a = REGEX_ITERNAL_construct_dfa (regex[i], strlen (regex[i]), 4);
-    REGEX_ITERNAL_automaton_save_graph (a, filename, REGEX_ITERNAL_GRAPH_DEFAULT);
-    REGEX_ITERNAL_automaton_destroy (a);
+    a = REGEX_INTERNAL_construct_dfa (regex[i], strlen (regex[i]), 4);
+    REGEX_TEST_automaton_save_graph (a, filename, REGEX_TEST_GRAPH_DEFAULT);
+    REGEX_INTERNAL_automaton_destroy (a);
     error += filecheck (filename);
 
   }