diff options
Diffstat (limited to 'build2')
| -rw-r--r-- | build2/cc/compile-rule.cxx | 34 | ||||
| -rw-r--r-- | build2/cc/parser.cxx | 15 | ||||
| -rw-r--r-- | build2/cc/parser.hxx | 1 | ||||
| -rw-r--r-- | build2/cxx/init.cxx | 6 |
4 files changed, 10 insertions, 46 deletions
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx index e77ef08..1e1d45d 100644 --- a/build2/cc/compile-rule.cxx +++ b/build2/cc/compile-rule.cxx @@ -2991,41 +2991,15 @@ namespace build2 if (ps) psrc.active = true; // Re-arm. - // Prior to 15u5 VC was not using the 'export module' syntax so we - // use the preprequisite type to distinguish between interface and - // implementation units. + // Prior to 15u5 (19.12) VC was not using the 'export module M;' + // syntax so we use the preprequisite type to distinguish between + // interface and implementation units. // if (cid == compiler_id::msvc && cmaj == 19 && cmin <= 11 && x_mod != nullptr && src.is_a (*x_mod)) { - // It's quite painful to guard the export with an #if/#endif so - // if it is present, "fixup" the (temporary) preprocessed output - // by getting rid of the keyword. - // - // Note: when removing this also remember to remove the test. - // - if (tu.mod.iface) - { - // We can only fixup a temporary file. - // - if (!ps) - fail (relative (src)) << "fixup requires preprocessor"; - - // Stomp out the export keyword with spaces. We are using - // std::fstream since our fdstream does not yet support - // seeking. - // - fstream os (psrc.path.string (), fstream::out | fstream::in); - auto pos (static_cast<fstream::pos_type> (p.export_pos)); - - if (!os.is_open () || - !os.seekp (pos) || - !os.write (" ", 6)) - fail << "unable to overwrite preprocessor output"; - } - else - tu.mod.iface = true; + tu.mod.iface = true; } return pair<translation_unit, string> (move (tu), p.checksum); diff --git a/build2/cc/parser.cxx b/build2/cc/parser.cxx index fcb6265..c8fcf4b 100644 --- a/build2/cc/parser.cxx +++ b/build2/cc/parser.cxx @@ -82,23 +82,14 @@ namespace build2 } else if (id == "export") { - uint64_t pos (t.position); - switch (l_->next (t)) { case type::lcbrace: ++bb; ex = true; break; case type::identifier: { - if (id == "module") - { - export_pos = pos; - parse_module (t, true); - } - else if (id == "import") - parse_import (t, true); - else - n = false; // Something else (e.g., export namespace). - + if (id == "module") parse_module (t, true); + else if (id == "import") parse_import (t, true); + else n = false; // Something else (e.g., export namespace). break; } default: n = false; break; diff --git a/build2/cc/parser.hxx b/build2/cc/parser.hxx index bec67bd..a4fd5f8 100644 --- a/build2/cc/parser.hxx +++ b/build2/cc/parser.hxx @@ -39,7 +39,6 @@ namespace build2 public: string checksum; // Translation unit checksum. - uint64_t export_pos; // Temporary hack, see parse_unit(). private: lexer* l_; diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx index ff97f5b..826d2b0 100644 --- a/build2/cxx/init.cxx +++ b/build2/cxx/init.cxx @@ -163,10 +163,10 @@ namespace build2 // While modules are supported in VC15u0 (19.10), there is a // bug in separate interface/implementation unit support which // makes them pretty much unusable. This has been fixed in - // VC15u3 (19.11). And VC15u5 supports the 'export module M;' - // syntax. + // VC15u3 (19.11). And VC15u5 (19.12) supports the 'export + // module M;' syntax. // - if (mj > 19 || (mj == 19 && mi >= (l ? 10 : 11))) + if (mj > 19 || (mj == 19 && mi >= (l ? 10 : 12))) { r.push_back ( mj > 19 || mi > 11 |