Make imports inside imported C++ modules invisible to the importing m…

…odule.

Semi-hack but needed to prevent conflicts between imported symbols, caused by the choice to name C++ modules after records.

dmd2/cpp/cppmodule.cpp

@@ -90,6 +90,17 @@ Module::Module(const char* filename, Identifier* ident, Identifiers *packages)
     arg = objfn;
 }
 
+Dsymbol *Module::search(Loc loc, Identifier *ident, int flags)
+{
+    auto result = ::Module::search(loc, ident, flags);
+
+    if ((flags & IgnorePrivateMembers) && result && result->isImport())
+        return nullptr; // semi-HACK? this makes the imports inside an imported module invisible to D code,
+                                // but also prevents conflicts caused by the choice to name C++ modules after record names.
+
+    return result;
+}
+
 void Module::addPreambule()
 {
     // Statically import object.d for object and size_t (used by buildXtoHash)

dmd2/cpp/cppmodule.h

@@ -34,6 +34,7 @@ class Module : public ::Module
     Module(const char *filename, Identifier *ident, Identifiers *packages);
 
     static Module *load(Loc loc, Identifiers *packages, Identifier *ident);
+    Dsymbol *search(Loc loc, Identifier *ident, int flags = IgnoreNone) override;
     void addPreambule() override;
     const char *manglePrefix() override { return "_Cpp"; }
 };

dmd2/module.h

@@ -162,7 +162,7 @@ class Module : public Package
     void gensymfile();
 #endif
     int needModuleInfo();
-    Dsymbol *search(Loc loc, Identifier *ident, int flags = IgnoreNone);
+    virtual Dsymbol *search(Loc loc, Identifier *ident, int flags = IgnoreNone); // CALYPSO
     Dsymbol *symtabInsert(Dsymbol *s);
     void deleteObjFile();
     static void addDeferredSemantic(Dsymbol *s);