Refactored most of the sources

CMakeLists.txt

@@ -75,6 +75,18 @@ find_package(PCRE)
 # List sources and headers
 
 set(SOURCE_FILES
+  src/core/abort.c
+  src/core/abort.h
+  src/core/report.c
+  src/core/report.h
+  src/core/runner.c
+  src/core/runner.h
+  src/core/worker.c
+  src/core/worker.h
+  src/core/stats.c
+  src/core/stats.h
+  src/core/ordered-set.c
+  src/core/theories.c
   src/compat/internal.h
   src/compat/pipe.c
   src/compat/pipe.h
@@ -85,40 +97,28 @@ set(SOURCE_FILES
   src/compat/basename.c
   src/compat/basename.h
   src/compat/mockfile.c
+  src/compat/time.c
+  src/compat/time.h
   src/compat/posix.h
-  src/redirect.c
+  src/io/redirect.c
-  src/abort.c
+  src/io/event.c
-  src/abort.h
+  src/io/event.h
-  src/event.c
+  src/io/asprintf.c
-  src/event.h
+  src/io/file.c
-  src/report.c
-  src/report.h
-  src/runner.c
-  src/runner.h
-  src/worker.c
-  src/worker.h
-  src/stats.c
-  src/stats.h
   src/log/logging.c
   src/log/tap.c
   src/log/normal.c
-  src/options.c
+  src/string/i18n.c
-  src/timer.c
+  src/string/i18n.h
-  src/timer.h
+  src/entry/options.c
-  src/i18n.c
+  src/entry/main.c
-  src/i18n.h
+  src/entry/entry.c
-  src/ordered-set.c
-  src/theories.c
-  src/asprintf.c
-  src/file.c
-  src/main.c
-  src/entry.c
 )
 
 if (PCRE_FOUND)
   set (SOURCE_FILES ${SOURCE_FILES}
-    src/extmatch.c
+    src/string/extmatch.c
-    src/extmatch.h
+    src/string/extmatch.h
   )
   set(HAVE_PCRE 1)
 endif ()

po/POTFILES.in

@@ -1,3 +1,3 @@
 # List of source files which contain translatable strings.
 src/log/normal.c
-src/i18n.c
+src/string/i18n.c

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: criterion 2.0.0\n"
 "Report-Msgid-Bugs-To: franklinmathieu+criterion@gmail.com\n"
-"POT-Creation-Date: 2015-09-14 04:12+0200\n"
+"POT-Creation-Date: 2015-09-16 21:18+0200\n"
 "PO-Revision-Date: 2015-04-03 17:58+0200\n"
 "Last-Translator:  <franklinmathieu@gmail.com>\n"
 "Language-Team: French\n"
@@ -109,68 +109,68 @@ msgstr ""
 "%1$sSynthèse: Testés: %2$s%3$lu%4$s | Validés: %5$s%6$lu%7$s | Échoués: %8$s"
 "%9$lu%10$s | Plantages: %11$s%12$lu%13$s %14$s\n"
 
-#: src/i18n.c:13
+#: src/string/i18n.c:13
 msgid "The conditions for this assertion were not met."
 msgstr "Les conditions de cette assertion n'ont pas été remplies."
 
-#: src/i18n.c:14
+#: src/string/i18n.c:14
 #, c-format
 msgid "The expression %s is false."
 msgstr "L'expression %s est fausse."
 
-#: src/i18n.c:15
+#: src/string/i18n.c:15
 #, c-format
 msgid "The expression (as strings) %s is false."
 msgstr "L'expression (en tant que chaînes de caractères) %s est fausse."
 
-#: src/i18n.c:16
+#: src/string/i18n.c:16
 #, c-format
 msgid "%s is null."
 msgstr "%s est nul."
 
-#: src/i18n.c:17
+#: src/string/i18n.c:17
 #, c-format
 msgid "%s is not null."
 msgstr "%s n'est pas nul."
 
-#: src/i18n.c:18
+#: src/string/i18n.c:18
 #, c-format
 msgid "%s is empty."
 msgstr "%s est vide."
 
-#: src/i18n.c:19
+#: src/string/i18n.c:19
 #, c-format
 msgid "%s is not empty."
 msgstr "%s n'est pas vide."
 
-#: src/i18n.c:20
+#: src/string/i18n.c:20
 #, fuzzy, c-format
 msgid "The statement `%s` did not throw any exception."
 msgstr "L'instruction `%s` n'a pas levé d'exception."
 
-#: src/i18n.c:21
+#: src/string/i18n.c:21
 #, fuzzy, c-format
 msgid "The statement `%s` threw some exception."
 msgstr "L'instruction `%1$s` a levé une exception."
 
-#: src/i18n.c:24
+#: src/string/i18n.c:24
 #, c-format
 msgid "The file contents of %1$s does not match the string \"%2$s\"."
 msgstr ""
 "Le contenu du fichier %1$s ne correspond pas à la chaine de caractères \"%2$s"
 "\"."
 
-#: src/i18n.c:25
+#: src/string/i18n.c:25
 #, fuzzy, c-format
 msgid "The file contents of %1$s does not match the contents of %2$s."
 msgstr "Le contenu du fichier %1$s ne correspond pas au contenu de %2$s."
 
-#: src/i18n.c:26
+#: src/string/i18n.c:26
 #, c-format
 msgid "The statement `%1$s` did throw an instance of the `%2$s` exception."
 msgstr "L'instruction `%1$s` a levé une instance de l'exception `%2$s`."
 
-#: src/i18n.c:27
+#: src/string/i18n.c:27
 #, c-format
 msgid "The statement `%1$s` did not throw an instance of the `%2$s` exception."
 msgstr "L'instruction `%1$s` n'a pas levé d'instance de l'exception `%2$s`."

src/compat/time.c

@@ -1,8 +1,8 @@
 #include <errno.h>
 #include <inttypes.h>
 #include <stdlib.h>
-#include "timer.h"
 #include "criterion/common.h"
+#include "compat/time.h"
 #include "compat/posix.h"
 
 #define GIGA 1000000000

src/core/runner.c

@@ -28,20 +28,20 @@
 #include "criterion/options.h"
 #include "criterion/ordered-set.h"
 #include "criterion/logging.h"
+#include "compat/time.h"
+#include "compat/posix.h"
+#include "string/i18n.h"
+#include "io/event.h"
 #include "stats.h"
 #include "runner.h"
 #include "report.h"
-#include "event.h"
 #include "worker.h"
-#include "timer.h"
-#include "compat/posix.h"
 #include "abort.h"
 #include "config.h"
-#include "i18n.h"
 #include "common.h"
 
 #ifdef HAVE_PCRE
-#include "extmatch.h"
+#include "string/extmatch.h"
 #endif
 
 #ifdef _MSC_VER

src/core/stats.h

@@ -25,7 +25,7 @@
 # define STATS_H_
 
 # include "criterion/stats.h"
-# include "event.h"
+# include "io/event.h"
 
 struct criterion_global_stats *stats_init(void);
 struct criterion_test_stats *test_stats_init(struct criterion_test *t);

src/core/worker.c

@@ -28,9 +28,9 @@
 #include "criterion/types.h"
 #include "criterion/options.h"
 #include "criterion/redirect.h"
-#include "worker.h"
+#include "io/event.h"
-#include "event.h"
 #include "compat/posix.h"
+#include "worker.h"
 
 struct process {
     s_proc_handle *proc;

src/entry/main.c

@@ -29,7 +29,7 @@
 #include "criterion/criterion.h"
 #include "criterion/options.h"
 #include "criterion/ordered-set.h"
-#include "runner.h"
+#include "core/runner.h"
 #include "config.h"
 #include "common.h"
 

src/log/logging.c

@@ -27,7 +27,7 @@
 #include <string.h>
 #include "criterion/logging.h"
 #include "criterion/options.h"
-#include "i18n.h"
+#include "string/i18n.h"
 
 #ifdef ENABLE_NLS
 # define LOG_FORMAT "[%1$s%2$s%3$s] %4$s"

src/log/normal.c

@@ -31,9 +31,9 @@
 #include "criterion/options.h"
 #include "criterion/ordered-set.h"
 #include "compat/basename.h"
-#include "timer.h"
+#include "compat/time.h"
+#include "string/i18n.h"
 #include "config.h"
-#include "i18n.h"
 #include "common.h"
 
 #ifdef VANILLA_WIN32

src/log/tap.c

@@ -30,7 +30,7 @@
 #include "criterion/options.h"
 #include "criterion/ordered-set.h"
 #include "compat/basename.h"
-#include "timer.h"
+#include "compat/time.h"
 #include "config.h"
 #include "common.h"