Next installment in C++ modules saga: module search, re-export support

12 files changed, 585 insertions, 103 deletions

diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx
index 658a6cd..9310644 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -1089,20 +1089,26 @@ namespace build2
   pair<optional<target_state>, const target*>
   execute_prerequisites (const target_type* tt,
                          action a, const target& t,
-                         const timestamp& mt, const prerequisite_filter& pf)
+                         const timestamp& mt, const prerequisite_filter& pf,
+                         size_t n)
   {
     assert (current_mode == execution_mode::first);
 
     auto& pts (const_cast<target&> (t).prerequisite_targets); // MT-aware.
 
+    if (n == 0)
+      n = pts.size ();
+
     // Pretty much as straight_execute_members() but hairier.
     //
     target_state rs (target_state::unchanged);
 
     wait_guard wg (target::count_busy (), t.task_count);
 
-    for (const target*& pt : pts)
+    for (size_t i (0); i != n; ++i)
     {
+      const target*& pt (pts[i]);
+
       if (pt == nullptr) // Skipped.
         continue;
 
@@ -1124,8 +1130,10 @@ namespace build2
     bool e (mt == timestamp_nonexistent);
     const target* rt (tt != nullptr ? nullptr : &t);
 
-    for (const target*& pt : pts)
+    for (size_t i (0); i != n; ++i)
     {
+      const target*& pt (pts[i]);
+
       if (pt == nullptr)
         continue;
 
diff --git a/build2/algorithm.hxx b/build2/algorithm.hxx
index 9f54c8d..49ca7a7 100644
--- a/build2/algorithm.hxx
+++ b/build2/algorithm.hxx
@@ -307,7 +307,8 @@ namespace build2
   //
   // The filter is passed each prerequisite target and is expected to signal
   // which ones should be used for timestamp comparison. If the filter is
-  // NULL, then all the prerequisites are used.
+  // NULL, then all the prerequisites are used. If the count is not 0, then
+  // only the first count prerequisites are executed.
   //
   // Note that the return value is an optional target state. If the target
   // needs updating, then the value absent. Otherwise it is the state that
@@ -327,7 +328,8 @@ namespace build2
   optional<target_state>
   execute_prerequisites (action, const target&,
                          const timestamp&,
-                         const prerequisite_filter& = nullptr);
+                         const prerequisite_filter& = nullptr,
+                         size_t count = 0);
 
   // Another version of the above that does two extra things for the caller:
   // it determines whether the action needs to be executed on the target based
@@ -340,20 +342,23 @@ namespace build2
   pair<optional<target_state>, const T&>
   execute_prerequisites (action, const target&,
                          const timestamp&,
-                         const prerequisite_filter& = nullptr);
+                         const prerequisite_filter& = nullptr,
+                         size_t count = 0);
 
   pair<optional<target_state>, const target&>
   execute_prerequisites (const target_type&,
                          action, const target&,
                          const timestamp&,
-                         const prerequisite_filter& = nullptr);
+                         const prerequisite_filter& = nullptr,
+                         size_t count = 0);
 
   template <typename T>
   pair<optional<target_state>, const T&>
   execute_prerequisites (const target_type&,
                          action, const target&,
                          const timestamp&,
-                         const prerequisite_filter& = nullptr);
+                         const prerequisite_filter& = nullptr,
+                         size_t count = 0);
 
   // Execute members of a group or similar prerequisite-like dependencies.
   // Similar in semantics to execute_prerequisites().
diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx
index 0e721f5..27759c9 100644
--- a/build2/algorithm.ixx
+++ b/build2/algorithm.ixx
@@ -364,21 +364,24 @@ namespace build2
   pair<optional<target_state>, const target*>
   execute_prerequisites (const target_type*,
                          action, const target&,
-                         const timestamp&, const prerequisite_filter&);
+                         const timestamp&, const prerequisite_filter&,
+                         size_t);
 
   inline optional<target_state>
   execute_prerequisites (action a, const target& t,
-                         const timestamp& mt, const prerequisite_filter& pf)
+                         const timestamp& mt, const prerequisite_filter& pf,
+                         size_t n)
   {
-    return execute_prerequisites (nullptr, a, t, mt, pf).first;
+    return execute_prerequisites (nullptr, a, t, mt, pf, n).first;
   }
 
   template <typename T>
   inline pair<optional<target_state>, const T&>
   execute_prerequisites (action a, const target& t,
-                         const timestamp& mt, const prerequisite_filter& pf)
+                         const timestamp& mt, const prerequisite_filter& pf,
+                         size_t n)
   {
-    auto p (execute_prerequisites (T::static_type, a, t, mt, pf));
+    auto p (execute_prerequisites (T::static_type, a, t, mt, pf, n));
     return pair<optional<target_state>, const T&> (
       p.first, static_cast<const T&> (p.second));
   }
@@ -386,9 +389,10 @@ namespace build2
   inline pair<optional<target_state>, const target&>
   execute_prerequisites (const target_type& tt,
                          action a, const target& t,
-                         const timestamp& mt, const prerequisite_filter& pf)
+                         const timestamp& mt, const prerequisite_filter& pf,
+                         size_t n)
   {
-    auto p (execute_prerequisites (&tt, a, t, mt, pf));
+    auto p (execute_prerequisites (&tt, a, t, mt, pf, n));
     return pair<optional<target_state>, const target&> (p.first, *p.second);
   }
 
@@ -396,9 +400,10 @@ namespace build2
   inline pair<optional<target_state>, const T&>
   execute_prerequisites (const target_type& tt,
                          action a, const target& t,
-                         const timestamp& mt, const prerequisite_filter& pf)
+                         const timestamp& mt, const prerequisite_filter& pf,
+                         size_t n)
   {
-    auto p (execute_prerequisites (tt, a, t, mt, pf));
+    auto p (execute_prerequisites (tt, a, t, mt, pf, n));
     return pair<optional<target_state>, const T&> (
       p.first, static_cast<const T&> (p.second));
   }
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index d72ad90..0825fc2 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -49,17 +49,14 @@ namespace build2
     struct compile::match_data
     {
       explicit
-      match_data (bool m, const prerequisite_member& s)
-          : mod (m),
-            src (s),
-            pp (preprocessed::none),
-            mt (timestamp_unknown) {}
+      match_data (bool m, const prerequisite_member& s): mod (m), src (s) {}
 
-      bool mod;                  // Target is bmi*{} and src is x_mod.
+      bool mod;                             // True if bmi*{} and src is x_mod.
       prerequisite_member src;
-      preprocessed pp;
-      auto_rmfile psrc;          // Preprocessed source, if any.
-      timestamp mt;              // Target timestamp.
+      preprocessed pp = preprocessed::none;
+      auto_rmfile psrc;                     // Preprocessed source, if any.
+      timestamp mt = timestamp_unknown;     // Target timestamp.
+      modules_positions mod_pos = {0, 0};   // 0 if not present.
     };
 
     compile::
@@ -717,10 +714,12 @@ namespace build2
         // Extract the module dependency information in addition to header
         // dependencies above.
         //
+        // NOTE: assumes that no further targets will be added into
+        //       t.prerequisite_targets!
+        //
         if (u) // @@ TMP (depdb validation similar to extract_headers()).
         {
-          extract_modules (act, t, lo, src, p.first, md, dd, u);
-          search_modules (bs, act, t, lo, tt.bmi);
+          extract_modules (act, t, lo, tt, src, p.first, md, dd, u);
         }
 
         // If the preprocessed output is suitable for compilation and is not
@@ -2103,9 +2102,10 @@ namespace build2
     extract_modules (action act,
                      file& t,
                      lorder lo,
+                     const compile_target_types& tt,
                      const file& src,
                      auto_rmfile& psrc,
-                     const match_data& md,
+                     match_data& md,
                      depdb& /*dd*/,
                      bool& /*updating*/) const
     {
@@ -2123,6 +2123,8 @@ namespace build2
             dr << info << "while extracting module dependencies from " << src;
         });
 
+      const scope& bs (t.base_scope ());
+
       // For some compilers (GCC, Clang) the preporcessed output is only
       // partially preprocessed. For others (VC), it is already fully
       // preprocessed (well, almost: it still has comments but we can handle
@@ -2149,8 +2151,6 @@ namespace build2
           // This should match with how we setup preprocessing and is pretty
           // similar to init_args() from extract_headers().
           //
-          const scope& bs (t.base_scope ());
-
           args.push_back (cpath.recall_string ());
 
           append_lib_options (bs, args, t, act, lo);
@@ -2337,18 +2337,26 @@ namespace build2
       if (!modules)
         fail << "modules support not enabled or unavailable";
 
-      // Set the cc.module_name variable if this is an interface unit. If we
-      // have the bmi{} group, set it there (in which case we have to lock).
+      // Search and match all the modules we depend on. If this is a module
+      // implementation unit, then treat the module itself as if it was
+      // imported.
+      //
+      if (!tu.module_interface && !tu.module_name.empty ())
+        tu.module_imports.push_back (
+          module_import {move (tu.module_name), false, 0});
+
+      if (!tu.module_imports.empty ())
+        md.mod_pos = search_modules (
+          bs, act, t, lo, tt.bmi, move (tu.module_imports));
+
+      // Set the cc.module_name variable if this is an interface unit. Note
+      // that it may seem like a good idea to set it on the bmi{} group to
+      // avoid duplication. We, however, cannot do it MT-safely since we don't
+      // match the group.
       //
       if (tu.module_interface)
       {
-        target_lock l;
-        target* x (t.group == nullptr
-                   ? &t
-                   : (l = lock (act, *t.group)).target);
-        assert (x != nullptr); // Should be lockable.
-
-        if (value& v = x->vars.assign (c_module_name))
+        if (value& v = t.vars.assign (c_module_name))
           assert (cast<string> (v) == tu.module_name);
         else
           v = move (tu.module_name); // Note: move.
@@ -2357,32 +2365,327 @@ namespace build2
 
     // Resolve imported modules to bmi*{} targets.
     //
-    void compile::
-    search_modules (const scope& /*bs*/,
+    modules_positions compile::
+    search_modules (const scope& bs,
                     action act,
                     file& t,
-                    lorder /*lo*/,
-                    const target_type& mtt) const
+                    lorder lo,
+                    const target_type& mtt,
+                    module_imports&& imports) const
     {
+      // So we have a list of imports and a list of "potential" module
+      // prerequisites. They are potential in the sense that they may or may
+      // not be required by this translation unit. In other words, they are
+      // the pool where we can resolve actual imports.
+      //
+      // Because we may not need all of these prerequisites, we cannot just go
+      // ahead and match all of them (and they can even have cycles; see rule
+      // synthesis). This poses a bit of a problem: the only way to discover
+      // the module's actual name (see cc.module_name) is by matching it.
+      //
+      // One way to solve this would be to make the user specify the module
+      // name for each mxx{} explicitly. This will be a major pain, however.
+      // Another would be to require encoding of the module name in the
+      // interface unit file name. For example, hello.core -> hello-core.mxx.
+      // This is better but will still too restrictive: some will want to call
+      // it hello_core.mxx or HelloCore.mxx (because that's their file naming
+      // convention) or place it in a subdirectory, say, hello/core.mxx.
+      //
+      // In the above examples one common theme about all the file names is
+      // that they contain, in one form or another, the "tail" of the module
+      // name ('core'). So what we are going to do is require that the
+      // interface file names contain enough of the module name tail to
+      // unambiguously resolve all the module imports. On our side we are
+      // going to implement a "fuzzy" module name to file name match. This
+      // should be reliable enough since we will always verify our guesses
+      // once we match the target and extract the actual module name. Plus,
+      // the user will always have the option of resolving any impasses by
+      // specifying the module name explicitly.
+      //
+      // So, the fuzzy match: the idea is that each match gets a score, the
+      // number of characters in the module name that got matched. A match
+      // with the highest score is used.
+      //
+      auto match = [] (const string& f, const string& m) -> size_t
+      {
+        size_t fi (f.size ());
+        size_t mi (m.size ());
+
+        // Scan backwards for as long as we match. Keep track of the previous
+        // character for case change detection.
+        //
+        for (char fc, mc, fp ('\0'), mp ('\0');
+             fi != 0 && mi != 0;
+             fp = fc, mp = mc, --fi, --mi)
+        {
+          fc = f[fi - 1];
+          mc = m[mi - 1];
+
+          if (casecmp (fc, mc) == 0)
+            continue;
+
+          // We consider all separators equal and character case change being
+          // a separators. Some examples of the latter:
+          //
+          // foo.bar
+          //  fooBAR
+          //  FOObar
+          //
+          bool fs (fc == '_' || fc == '-' || fc == '.' ||
+                   path::traits::is_separator (fc));
+          bool ms (mc == '_' || mc == '.');
+
+          if (fs && ms)
+            continue;
+
+          // Only if one is a real separator do we consider case change.
+          //
+          if (fs || ms)
+          {
+            auto cc = [] (char c1, char c2) -> bool
+            {
+              return (alpha (c1) &&
+                      alpha (c2) &&
+                      (ucase (c1) == c1) != (ucase (c2) == c2));
+            };
+
+            bool fa (false), ma (false);
+            if ((fs || (fa = cc (fp, fc))) && (ms || (ma = cc (mp, mc))))
+            {
+              // Stay on this character if imaginary punctuation (note: cannot
+              // be both true).
+              //
+              if (fa) ++fi;
+              if (ma) ++mi;
+              continue;
+            }
+          }
+
+          break; // No match.
+        }
+
+        // Return the number of characters matched in the module name and not
+        // in the file (this may not be the same because of the imaginary
+        // separators).
+        //
+        return m.size () - mi;
+      };
+
       auto& pts (t.prerequisite_targets);
-      size_t start (pts.size ());         // Index of the first to be added.
+      size_t start (pts.size ()); // Index of the first to be added.
+
+      // We have two parallel vectors: module names/scores in imports and
+      // targets in prerequisite_targets (offset with start). Pre-allocate
+      // NULL entries in the latter.
+      //
+      size_t n (imports.size ());
+      pts.resize (start + n, nullptr);
+
+      // Oh, yes, there is one "minor" complication. It's the last one, I
+      // promise. It has to do with module re-exporting (export import M;).
+      // In this case (currently) all implementations simply treat it as a
+      // shallow (from the BMI's point of view) reference to the module (or an
+      // implicit import, if you will). Do you see where it's going? Nowever
+      // good, that's right. This shallow reference means that the compiler
+      // should be able to find BMIs for all the re-imported modules,
+      // recursive. The good news is we are actually in a pretty good shape to
+      // handle this: after match all our prerequisite BMIs will have their
+      // prerequisite BMIs known, recursively. The only bit that is missing is
+      // the re-export flag of some sorts. As well as deciding where to handle
+      // it: here or in append_modules(). After some meditation it became
+      // clear handling it here will be simpler: We need to weed out
+      // duplicates for which we can re-use the imports vector. And we may
+      // also need to save this "flattened" list of modules in depdb.
+      //
+      // Ok, so, here is the plan:
+      //
+      // 1. There is no good place in prerequisite_targets to store the
+      //    exported flag (no, using the marking facility across match/execute
+      //    is a bad idea). So what we are going to do is put re-exported
+      //    bmi{}s at the back and store (in the target's data pad) the start
+      //    position. One bad aspect about this part is that we assume those
+      //    bmi{}s have been matched by the same rule. But let's not kid
+      //    ourselves, there will be no other rule that matches bmi{}s.
+      //
+      // 2. Once we have matched all the bmi{}s we are importing directly
+      //    (with all the re-exported by us at the back), we will go over them
+      //    and copy all of their re-exported bmi{}s (using the position we
+      //    saved on step #1). The end result will be a recursively-explored
+      //    list of imported bmi{}s that append_modules() can simply convert
+      //    to the list of options.
+      //
+      //    One issue with this approach is that these copied targets will be
+      //    executed which means we need to adjust their dependent counts
+      //    (which is normally done by match). While this seems conceptually
+      //    correct (especially if you view re-exports as implicit imports),
+      //    it's just extra overhead (we know they will be updated). So what
+      //    we are going to do is save another position, that of the start of
+      //    these copied-over targets, and will only execute up to this point.
+      //
+      // As a first sub-step of step #1, move all the re-exported imports to
+      // the end of the vector. This will make sure they end up at the end
+      // of prerequisite_targets.
+      //
+      sort (imports.begin (), imports.end (),
+            [] (const module_import& x, const module_import& y)
+            {
+              return !x.exported && y.exported;
+            });
 
+      // Go over the prerequisites once checking if each (better) matches any
+      // of the imports.
+      //
       for (prerequisite_member p: group_prerequisite_members (act, t))
       {
-        const target* pt (nullptr);
+        const target* bt (nullptr);
 
+        // While it would have been even better not to search for a target, we
+        // need to get hold of the corresponding mxx{} (unlikely but possible
+        // for bmi{} to have a different name).
+        //
         if (p.is_a<bmi> ())
-          pt = &search (t, mtt, p.key ()); //@@ MOD: fuzzy...
+          bt = &search (t, mtt, p.key ()); //@@ MOD: fuzzy...
         else if (p.is_a (mtt))
-          pt = &p.search (t);
+          bt = &p.search (t);
+
+        if (bt == nullptr)
+          continue;
+
+        // Find the mxx{} prerequisite and extract its "file name" for the
+        // fuzzy match.
+        //
+        string f;
+        for (prerequisite_member p: group_prerequisite_members (act, *bt))
+        {
+          if (p.is_a (*x_mod))
+          {
+            //@@ MOD: TODO check if module name set? Won't we have to search
+            //   it for that? Search to existing only?
+
+            // Add the directory part if it is relative. The idea is to
+            // include it into the module match, say hello.core vs
+            // hello/mxx{core}. Why not for absolute? Good question. What
+            // if it contains special components, say, ../mxx{core}?
+            //
+            const dir_path& d (p.dir ());
 
-        if (pt != nullptr)
-          pts.push_back (pt);
+            if (!d.empty () && d.relative ())
+              f = d.representation (); // Includes trailing slash.
+
+            f += p.name ();
+            break;
+          }
+        }
+
+        if (f.empty ()) // bmi{} without mxx{}? Good luck with that.
+          continue;
+
+        // Check if it resolves any of our imports.
+        //
+        for (size_t i (0); i != n; ++i)
+        {
+          module_import& m (imports[i]);
+          size_t s (match (f, m.name));
+          if (s > m.score)
+          {
+            pts[start + i] = bt;
+            m.score = s;
+          }
+        }
+      }
+
+      // Diagnose unresolved modules.
+      //
+      for (size_t i (0); i != n; ++i)
+      {
+        if (pts[start + i] == nullptr)
+        {
+          // @@ MOD: keep import location for diagnostics?
+          //
+          fail << "unresolved import for module " << imports[i].name;
+        }
       }
 
       // Match in parallel and wait for completion.
       //
       match_members (act, t, pts, start);
+
+      // Post-process the list of our (direct) imports.
+      //
+      size_t ex_start (n);
+      size_t ex_tail (pts.size ());
+
+      for (size_t i (0); i != n; ++i)
+      {
+        const module_import& m (imports[i]);
+        const target& bt (*pts[start + i]);
+
+        // Verify our guesses against extracted module names.
+        //
+        const string& in (m.name);
+        const string& mn (cast<string> (bt.vars[c_module_name]));
+
+        if (in != mn)
+        {
+          for (prerequisite_member p: group_prerequisite_members (act, bt))
+          {
+            if (p.is_a (*x_mod)) // Got to be there.
+            {
+              fail << "failed to correctly guess module name from " << p <<
+                info << "guessed: " << in <<
+                info << "actual:  " << mn <<
+                info << "consider adjusting module interface file names or" <<
+                info << "consider explicitly specifying module name with @@ MOD";
+            }
+          }
+        }
+
+        // Determine the position of the first re-exported bmi{}.
+        //
+        if (m.exported && ex_start == n)
+          ex_start = i;
+
+        // Copy over re-exported bmi{} from our prerequisites weeding out
+        // duplicates.
+        //
+        if (size_t j = bt.data<match_data> ().mod_pos.ex_start)
+        {
+          // Hard to say whether we should reserve or not. We will probably
+          // get quite a bit of duplications.
+          //
+          for (size_t m (bt.prerequisite_targets.size ()); j != m; ++j)
+          {
+            const target* et (bt.prerequisite_targets[j]);
+            const string& mn (cast<string> (et->vars[c_module_name]));
+
+            if (find_if (imports.begin (), imports.end (),
+                         [&mn] (const module_import& i)
+                         {
+                           return i.name == mn;
+                         }) == imports.end ())
+            {
+              pts.push_back (et);
+
+              // Add to the list of imports for further duplicate suppression.
+              // We could have probably stored reference to the name (e.g., in
+              // score) but it's probably not worth it if we have a small
+              // string optimization.
+              //
+              imports.push_back (module_import {mn, true, 0});
+            }
+          }
+        }
+      }
+
+      if (ex_tail == pts.size ()) // No copied tail.
+        ex_tail = 0;
+
+      if (ex_start == n) // No (own) re-exported imports.
+        ex_start = ex_tail;
+      else
+        ex_start += start; // Rebase.
+
+      return modules_positions {ex_start, ex_tail};
     }
 
     // Filter cl.exe noise (msvc.cxx).
@@ -2410,7 +2713,7 @@ namespace build2
         case compiler_id::gcc:
           {
             s.insert (0, 1, '=');
-            s.insert (0, cast<string> ((*f)[c_module_name]));
+            s.insert (0, cast<string> (f->vars[c_module_name]));
             s.insert (0, "-fmodule-map=");
             break;
           }
@@ -2452,7 +2755,10 @@ namespace build2
       //
       auto pr (
         execute_prerequisites<file> (
-          (mod ? *x_mod : x_src), act, t, md.mt));
+          (mod ? *x_mod : x_src),
+          act, t,
+          md.mt, nullptr,
+          md.mod_pos.ex_tail)); // See search_modules() for details.
 
       if (pr.first)
       {
diff --git a/build2/cc/compile.hxx b/build2/cc/compile.hxx
index 596245d..c98e407 100644
--- a/build2/cc/compile.hxx
+++ b/build2/cc/compile.hxx
@@ -27,6 +27,15 @@ namespace build2
     //
     enum class preprocessed: uint8_t {none, includes, modules, all};
 
+    // Positions of the re-exported bmi{}s. See search_modules() for
+    // details.
+    //
+    struct modules_positions
+    {
+      size_t ex_start;
+      size_t ex_tail;
+    };
+
     class compile: public rule, virtual common
     {
     public:
@@ -93,14 +102,14 @@ namespace build2
                        const file&, const match_data&,
                        depdb&, bool&) const;
       void
-      extract_modules (action, file&, lorder,
-                       const file&, auto_rmfile&, const match_data&,
+      extract_modules (action, file&, lorder, const compile_target_types&,
+                       const file&, auto_rmfile&, match_data&,
                        depdb&, bool&) const;
 
-      void
+      modules_positions
       search_modules (const scope&,
-                      action, file&, lorder,
-                      const target_type&) const;
+                      action, file&, lorder, const target_type&,
+                      module_imports&&) const;
 
       void
       append_modules (cstrings&, strings&, const file&) const;
diff --git a/build2/cc/parser.cxx b/build2/cc/parser.cxx
index c3c1324..3b7951d 100644
--- a/build2/cc/parser.cxx
+++ b/build2/cc/parser.cxx
@@ -74,7 +74,7 @@ namespace build2
             {
               if      (id == "import")
               {
-                parse_import (t);
+                parse_import (t, false);
               }
               else if (id == "module")
               {
@@ -90,7 +90,7 @@ namespace build2
                     if      (id == "module")
                       parse_module (t, true);
                     else if (id == "import")
-                      parse_import (t);
+                      parse_import (t, true);
                     else
                       n = false; // Something else (e.g., export namespace).
 
@@ -110,7 +110,7 @@ namespace build2
             {
               if (id == "import")
               {
-                parse_import (t);
+                parse_import (t, true);
               }
             }
             continue;
@@ -128,7 +128,7 @@ namespace build2
     }
 
     void parser::
-    parse_import (token& t)
+    parse_import (token& t, bool ex)
     {
       // enter: import keyword
       // leave: semi
@@ -143,13 +143,21 @@ namespace build2
       if (t.type != type::semi)
         fail (t) << "';' expected instead of " << t;
 
-      // Ignore duplicate imports. We don't expect large numbers of imports
-      // so vector/linear search is probably more efficient than a set.
+      // Ignore duplicates. We don't expect a large numbers of imports so
+      // vector/linear search is probably more efficient than a set.
       //
       auto& is (u_->module_imports);
 
-      if (find (is.begin (), is.end (), n) == is.end ())
-        is.push_back (move (n));
+      auto i (find_if (is.begin (), is.end (),
+                       [&n] (const module_import& i)
+                       {
+                         return i.name == n;
+                       }));
+
+      if (i == is.end ())
+        is.push_back (module_import {move (n), ex, 0});
+      else
+        i->exported = i->exported || ex;
     }
 
     void parser::
diff --git a/build2/cc/parser.hxx b/build2/cc/parser.hxx
index 00be190..8f327cd 100644
--- a/build2/cc/parser.hxx
+++ b/build2/cc/parser.hxx
@@ -10,20 +10,14 @@
 
 #include <build2/diagnostics.hxx>
 
+#include <build2/cc/types.hxx>
+
 namespace build2
 {
   namespace cc
   {
-    // Extract (currently module) information from a preprocessed C/C++
-    // source.
+    // Extract translation unit information from a preprocessed C/C++ source.
     //
-    struct translation_unit
-    {
-      string         module_name;      // If not empty, then a module unit.
-      bool           module_interface; // If true, then module interface unit.
-      vector<string> module_imports;   // Imported modules.
-    };
-
     struct token;
     class lexer;
 
@@ -35,7 +29,7 @@ namespace build2
 
     private:
       void
-      parse_import (token&);
+      parse_import (token&, bool);
 
       void
       parse_module (token&, bool);
diff --git a/build2/cc/types.hxx b/build2/cc/types.hxx
index 59ea67f..17f6b96 100644
--- a/build2/cc/types.hxx
+++ b/build2/cc/types.hxx
@@ -8,10 +8,30 @@
 #include <build2/types.hxx>
 #include <build2/utility.hxx>
 
+#include <build2/target-type.hxx>
+
 namespace build2
 {
   namespace cc
   {
+    // Translation unit information (currently modules).
+    //
+    struct module_import
+    {
+      string name;
+      bool   exported; // True if re-exported (export import M;).
+      size_t score;    // See compile::search_modules().
+    };
+
+    using module_imports = vector<module_import>;
+
+    struct translation_unit
+    {
+      string             module_name;      // Not empty if a module unit.
+      bool               module_interface; // True if a module interface unit.
+      cc::module_imports module_imports;   // Imported modules.
+    };
+
     // Compiler language.
     //
     enum class lang {c, cxx};
@@ -26,6 +46,14 @@ namespace build2
     //
     enum class otype {e, a, s};
 
+    // Compile target types.
+    //
+    struct compile_target_types
+    {
+      const target_type& obj;
+      const target_type& bmi;
+    };
+
     // Library link order.
     //
     enum class lorder {a, s, a_s, s_a};
diff --git a/build2/cc/utility.hxx b/build2/cc/utility.hxx
index 62104d9..895d9c5 100644
--- a/build2/cc/utility.hxx
+++ b/build2/cc/utility.hxx
@@ -24,14 +24,6 @@ namespace build2
     otype
     compile_type (const target&, bool module);
 
-    // Compile target types.
-    //
-    struct compile_target_types
-    {
-      const target_type& obj;
-      const target_type& bmi;
-    };
-
     compile_target_types
     compile_types (otype);
 
diff --git a/tests/cc/modules/testscript b/tests/cc/modules/testscript
index 71ae34d..38a3fde 100644
--- a/tests/cc/modules/testscript
+++ b/tests/cc/modules/testscript
@@ -41,22 +41,22 @@ if $modules
 # Common source files that are symlinked (@@ TODO: ln builtin) in the
 # test directories if used.
 #
-+cat <<EOI >=test.mxx
++cat <<EOI >=core.mxx
 #if __cpp_modules >= 201704
 export
 #endif
-module foo.test;
+module foo.core;
 
 export int f (int);
 EOI
 
-+cat <<EOI >=test.cxx
-module foo.test;
++cat <<EOI >=core.cxx
+module foo.core;
 int f (int i) {return i - 1;}
 EOI
 
 +cat <<EOI >=driver.cxx
-import foo.test;
+import foo.core;
 int main (int argc, char*[]) {return f (argc);}
 EOI
 
@@ -65,13 +65,13 @@ EOI
 : Test combined interface/implementation unit specified as bmi{}.
 :
 if ($cxx.id != "gcc")
-cp ../test.mxx ./ && cat >+test.mxx <<EOI #;
+cp ../core.mxx ./ && cat >+core.mxx <<EOI #;
   int f (int i) {return i - 1;}
   EOI
 cp ../driver.cxx ./ #;
 $* test clean <<EOI
-  exe{test}: cxx{driver} bmi{test}
-  bmi{test}: mxx{test}
+  exe{test}: cxx{driver} bmi{core}
+  bmi{core}: mxx{core}
   EOI
 end
 
@@ -80,12 +80,12 @@ end
 : Test combined interface/implementation unit specified as mxx{}.
 :
 if ($cxx.id != "gcc")
-cp ../test.mxx ./ && cat >+test.mxx <<EOI #;
+cp ../core.mxx ./ && cat >+core.mxx <<EOI #;
   int f (int i) {return i - 1;}
   EOI
 cp ../driver.cxx ./ #;
 $* test clean <<EOI
-  exe{test}: cxx{driver} mxx{test}
+  exe{test}: cxx{driver} mxx{core}
   EOI
 end
 
@@ -93,18 +93,142 @@ end
 :
 : Test separate interface/implementation unit specified as bmi{}.
 :
-cp ../test.mxx ../test.cxx ../driver.cxx ./;
+cp ../core.mxx ../core.cxx ../driver.cxx ./;
 $* test clean <<EOI
-  exe{test}: cxx{driver} {bmi cxx}{test}
-  bmi{test}: mxx{test}
+  exe{test}: cxx{driver} {bmi cxx}{core}
+  bmi{core}: mxx{core}
   EOI
 
 : mxx-separate
 :
 : Test separate interface/implementation unit specified as mxx{}.
 :
-cp ../test.mxx ../test.cxx ../driver.cxx ./;
+cp ../core.mxx ../core.cxx ../driver.cxx ./;
 $* test clean <<EOI
-  exe{test}: cxx{driver} {mxx cxx}{test}
+  exe{test}: cxx{driver} {mxx cxx}{core}
   EOI
+
+: name-match
+:
+: Test fuzzy match between module name and file name
+:
+{
+  # "Bad" match which we should better.
+  #
+  +cat <<EOI >=core.mxx
+    #if __cpp_modules >= 201704
+    export
+    #endif
+    module bar.core;
+    EOI
+
+  : separator
+  :
+  : Test separator equivalence.
+  :
+  cp ../../core.mxx foo-core.mxx;
+  cp ../core.mxx ../../core.cxx ../../driver.cxx ./;
+  $* test clean <'exe{test}: cxx{driver core} mxx{core foo-core}'
+
+  : case
+  :
+  : Test case-insensitivity and case-change as a separator.
+  :
+  cp ../../core.mxx FooCore.mxx;
+  cp ../core.mxx ../../core.cxx ../../driver.cxx ./;
+  $* test clean <'exe{test}: cxx{driver core} mxx{core FooCore}'
+
+  : dir
+  :
+  : Test subdirectory.
+  :
+  mkdir foo;
+  cp ../../core.mxx foo/core.mxx;
+  cp ../core.mxx ../../core.cxx ../../driver.cxx ./;
+  $* test clean <'exe{test}: cxx{driver core} mxx{core} foo/mxx{core}'
+}
+
+: unresolved
+:
+cp ../driver.cxx ./;
+$* test &*.d <'exe{test}: cxx{driver}' 2>>EOE != 0
+  error: unresolved import for module foo.core
+  EOE
+
+: misguessed
+:
+cp ../core.mxx ./;
+cat <'import bar.core;' >=driver.cxx;
+$* test &*.d <'exe{test}: cxx{driver} mxx{core}' 2>>EOE != 0
+  error: failed to correctly guess module name from mxx{core}
+    info: guessed: bar.core
+    info: actual:  foo.core
+    info: consider adjusting module interface file names or
+    info: consider explicitly specifying module name with @@ MOD
+  EOE
+
+
+: re-export
+:
+: Test module re-exporting (export import M;)
+:
+if ($cxx.id.type != "clang")
+{
+  +cat <<EOI >=base.mxx
+    #if __cpp_modules >= 201704
+      export
+    #endif
+    module foo.base;
+    export import foo.core;
+    EOI
+
+  +cat <<EOI >=extra.mxx
+    #if __cpp_modules >= 201704
+      export
+    #endif
+    module foo.extra;
+    export import foo.base;
+    EOI
+
+  +cat <<EOI >=foo.mxx
+    #if __cpp_modules >= 201704
+      export
+    #endif
+    module foo;
+    export
+    {
+      import foo.core;
+      import foo.base;
+      import foo.extra;
+    }
+    EOI
+
+  : basic
+  :
+  cp ../base.mxx ../../core.mxx ../../core.cxx ./;
+  cat <<EOI >=driver.cxx;
+    import foo.base;
+    int main (int argc, char*[]) {return f (argc);}
+    EOI
+  $* test clean <'exe{test}: cxx{driver core} {mxx}{core base}'
+
+  : recursive
+  :
+  cp ../base.mxx ../extra.mxx ../../core.mxx ../../core.cxx ./;
+  cat <<EOI >=driver.cxx;
+    import foo.extra;
+    int main (int argc, char*[]) {return f (argc);}
+    EOI
+  $* test clean <'exe{test}: cxx{driver core} {mxx}{core base extra}'
+
+  : duplicate
+  :
+  cp ../base.mxx ../extra.mxx ../foo.mxx ../../core.mxx ../../core.cxx ./;
+  cat <<EOI >=driver.cxx;
+    import foo;
+    int main (int argc, char*[]) {return f (argc);}
+    EOI
+  $* test clean <'exe{test}: cxx{driver core} {mxx}{core base extra foo}'
+}
+
 }
diff --git a/unit-tests/cc/parser/driver.cxx b/unit-tests/cc/parser/driver.cxx
index cdddaca..5798d9f 100644
--- a/unit-tests/cc/parser/driver.cxx
+++ b/unit-tests/cc/parser/driver.cxx
@@ -45,8 +45,9 @@ namespace build2
         parser p;
         translation_unit u (p.parse (*is, path (in)));
 
-        for (const string& n: u.module_imports)
-          cout << "import " << n << ';' << endl;
+        for (const module_import& m: u.module_imports)
+          cout << (m.exported ? "export " : "")
+               << "import " << m.name << ';' << endl;
 
         if (!u.module_name.empty ())
           cout << (u.module_interface ? "export " : "")
diff --git a/unit-tests/cc/parser/module.test b/unit-tests/cc/parser/module.test
index f2bbaf1..45e621c 100644
--- a/unit-tests/cc/parser/module.test
+++ b/unit-tests/cc/parser/module.test
@@ -30,12 +30,14 @@ EOI
 $* <<EOI >>EOO
 export import foo;
 EOI
-import foo;
+export import foo;
 EOO
 
 : export-imported-block
 :
 $* <<EOI >>EOO
+import bar;
+
 export {import foo;}
 
 export
@@ -50,8 +52,8 @@ export
   import bar;
 }
 EOI
-import foo;
-import bar;
+export import bar;
+export import foo;
 EOO
 
 : non-module