(Issue #66) Map numerical constant and empty macros into the _ module…

…, if their headers aren't part of a Clang module.
Syniurge · Jan 20, 2018 · d6341da · d6341da
1 parent 514e59f
commit d6341da
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 14 deletions.
diff --git a/ddmd/cpp/calypso.cpp b/ddmd/cpp/calypso.cpp
@@ -468,8 +468,8 @@ Loc fromLoc(clang::SourceLocation L)
 
     auto S = SrcMgr.getFilename(L);
     loc.filename = S.data();
-    assert(*(S.data() + S.size()) == '\0'); // TEMPORARY assert to confirm that StringRef isn't needed anymore
-    loc.linnum = ast()->getSourceManager().getSpellingLineNumber(L);
+    assert(!S.data() || *(S.data() + S.size()) == '\0'); // TEMPORARY assert to confirm that StringRef isn't needed anymore
+    loc.linnum = SrcMgr.getSpellingLineNumber(L);
 
     return loc;
 }
@@ -957,9 +957,6 @@ void LangPlugin::buildMacroMap()
             if (FoundHeader) break;
         }
 
-        if (!FoundHeader)
-            continue;
-
         auto& MacroMapEntry = MacroMap[FoundHeader];
         if (!MacroMapEntry)
             MacroMapEntry = new MacroMapEntryTy;

diff --git a/ddmd/cpp/cppmodule.cpp b/ddmd/cpp/cppmodule.cpp
@@ -1502,6 +1502,17 @@ static inline bool isTopLevelInNamespaceModule (const clang::Decl *D)
     return true;
 }
 
+void mapMacros(DeclMapper &mapper, clang::Module::Header* Header, Dsymbols *members)
+{
+    auto MacroMapEntry = calypso.MacroMap[Header];
+    if (!MacroMapEntry)
+        return;
+
+    for (auto& P: *MacroMapEntry)
+        if (auto s = mapper.VisitMacro(P.first, P.second))
+            members->push(s);   
+}
+
 static void mapNamespace(DeclMapper &mapper,
                              const clang::DeclContext *DC,
                              Dsymbols *members,
@@ -1540,6 +1551,9 @@ static void mapNamespace(DeclMapper &mapper,
         if (auto s = mapper.VisitDecl(*D))
             members->append(s);
     }
+
+    if (DC->isTranslationUnit())
+        mapMacros(mapper, nullptr, members);
 }
 
 static void mapClangModule(DeclMapper &mapper,
@@ -1641,15 +1655,7 @@ static void mapClangModule(DeclMapper &mapper,
     {
         // Map the macros contained in the module headers (currently limited to numerical constants)
         for (auto& Header: M->Headers[clang::Module::HK_Normal])
-        {
-            auto MacroMapEntry = calypso.MacroMap[&Header];
-            if (!MacroMapEntry)
-                continue;
-
-            for (auto& P: *MacroMapEntry)
-                if (auto s = mapper.VisitMacro(P.first, P.second))
-                    members->push(s);
-        }
+            mapMacros(mapper, &Header, members);
 
         for (auto D: RegionDecls)
             if (isa<clang::TranslationUnitDecl>(D->getDeclContext()))

diff --git a/tests/calypso/macro.d b/tests/calypso/macro.d
@@ -0,0 +1,17 @@
+// RUN: %ldc -cpp-args -std=c++11 -cpp-cachedir=%t.cache -of %t %s
+// RUN: %t > %t.out
+// RUN: FileCheck %s < %t.out
+
+modmap (C++) "macro.h";
+
+import (C++) _;
+import std.stdio : writeln;
+
+void main()
+{
+    writeln("my_macro = ", my_macro);
+    // CHECK: my_macro = 42
+
+    writeln("empty_macro = ", empty_macro);
+    // CHECK: empty_macro = true
+}
diff --git a/tests/calypso/macro.h b/tests/calypso/macro.h
@@ -0,0 +1,4 @@
+#pragma once
+
+#define my_macro 42
+#define empty_macro