Initial modularization with both Clang and VC hacks

Note: gave up on VC about half way though.

1 files changed, 17 insertions, 3 deletions

diff --git a/tests/regex/driver.cxx b/tests/regex/driver.cxx
index 054eb31..d48b716 100644
--- a/tests/regex/driver.cxx
+++ b/tests/regex/driver.cxx
@@ -2,13 +2,27 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <string>
 #include <cassert>
+
+#ifndef __cpp_lib_modules
+#include <string>
 #include <iostream>
 #include <exception>
+#endif
+
+// Other includes.
 
-#include <libbutl/regex.hxx>
-#include <libbutl/utility.hxx> // operator<<(ostream, exception)
+#ifdef __cpp_modules
+#ifdef __cpp_lib_modules
+import std.core;
+import std.io;
+#endif
+import butl.regex;
+import butl.utility; // operator<<(ostream, exception)
+#else
+#include <libbutl/regex.mxx>
+#include <libbutl/utility.mxx>
+#endif
 
 using namespace std;
 using namespace butl;