Changeset 1402:1311dabc6a1f

Timestamp:

05/20/09 15:13:41 (3 years ago)

Author:

Christian Kamm <kamm incasoftware de>

branch:

default

Message:

Merged xfBuild patch for dependency tree generation. See #286.

Files:

• dmd/import.c (modified) (3 diffs)
• dmd/mars.h (modified) (2 diffs)
• gen/cl_options.cpp (modified) (1 diff)
• gen/cl_options.h (modified) (1 diff)
• gen/main.cpp (modified) (3 diffs)

dmd/import.c

@@ -117 +117 @@
-}
-
+char* escapePath(char* fname, char* buffer, int bufLen) {
+    char* res = buffer;
+    bufLen -= 2;    // for \0 and an occasional escape char
+    int dst = 0;
+    for (; dst < bufLen && *fname; ++dst, ++fname) {
+    switch (*fname) {
+        case '(':
+        case ')':
+        case '\\':
+            buffer[dst++] = '\\';
+            // fall through
+
+        default:
+            buffer[dst] = *fname;
+    }
+    }
+    buffer[dst] = '\0';
+    return buffer;
+}
-
-void Import::semantic(Scope *sc)
@@ -170 +189 @@
-    }
-    //printf("-Import::semantic('%s'), pkg = %p\n", toChars(), pkg);
+
+
+    if (global.params.moduleDeps != NULL) {
+    char fnameBuf[262];     // MAX_PATH+2
+
+    OutBuffer *const ob = global.params.moduleDeps;
+    ob->printf("%s (%s) : ",
+        sc->module->toPrettyChars(),
+        escapePath(sc->module->srcfile->toChars(), fnameBuf, sizeof(fnameBuf) / sizeof(*fnameBuf))
+    );
+
+    char* protStr = "";
+    switch (sc->protection) {
+        case PROTpublic: protStr = "public"; break;
+        case PROTprivate: protStr = "private"; break;
+        case PROTpackage: protStr = "package"; break;
+        default: break;
+    }
+    ob->writestring(protStr);
+    if (isstatic) {
+        ob->writestring(" static");
+    }
+    ob->writestring(" : ");
+
+    if (this->packages) {
+        for (size_t i = 0; i < this->packages->dim; i++) {
+        Identifier *pid = (Identifier *)this->packages->data[i];
+        ob->printf("%s.", pid->toChars());
+        }
+    }
+
+    ob->printf("%s (%s)",
+        this->id->toChars(),
+        mod ? escapePath(mod->srcfile->toChars(), fnameBuf, sizeof(fnameBuf) / sizeof(*fnameBuf)) : "???"
+    );
+
+    if (aliasId) {
+        ob->printf(" -> %s", aliasId->toChars());
+    } else {
+        if (names.dim > 0) {
+        ob->writestring(" : ");
+        for (size_t i = 0; i < names.dim; i++)
+        {
+            if (i > 0) {
+            ob->writebyte(',');
+            }
+
+            Identifier *name = (Identifier *)names.data[i];
+            Identifier *alias = (Identifier *)aliases.data[i];
+
+            if (!alias) {
+            ob->printf("%s", name->toChars());
+            alias = name;
+            } else {
+            ob->printf("%s=%s", alias->toChars(), name->toChars());
+            }
+        }
+        }
+    }
+
+    ob->writenl();
+    }
-}
-
@@ -261 +342 @@
-    }
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    buf->writenl();
-}

dmd/mars.h

@@ -118 +118 @@
-
-struct Array;
+struct OutBuffer;
-
-// LDC
@@ -205 +206 @@
-
-    const char *xmlname;    // filename for XML output
-
+
+
+
+
-    // Hidden debug switches
-    bool debuga;

gen/cl_options.cpp

@@ -201 +201 @@
-
-
+cl::opt<std::string> moduleDepsFile("deps",
+    cl::desc("Write module dependencies to filename"),
+    cl::value_desc("filename"));
+    
+
-cl::opt<const llvm::TargetMachineRegistry::entry*, false,
-        llvm::RegistryParser<llvm::TargetMachine> > mArch("march",

gen/cl_options.h

@@ -36 +36 @@
-#endif
-    extern cl::list<std::string> versions;
+    extern cl::opt<std::string> moduleDepsFile;
-
-    extern cl::opt<const llvm::TargetMachineRegistry::entry*, false,

gen/main.cpp

@@ -144 +144 @@
-    global.params.objfiles = new Array();
-    global.params.ddocfiles = new Array();
-
+
+
+
-
-    // Set predefined version identifiers
@@ -222 +224 @@
-        global.params.hdrdir || global.params.hdrname;
-#endif
+
+    initFromString(global.params.moduleDepsFile, moduleDepsFile);
+    if (global.params.moduleDepsFile != NULL) 
+    { 
+         global.params.moduleDeps = new OutBuffer; 
+    }
-
-    processVersions(debugArgs, "debug",
@@ -831 +839 @@
-        fatal();
-
+    // write module dependencies to file if requested
+    if (global.params.moduleDepsFile != NULL) 
+    { 
+        assert (global.params.moduleDepsFile != NULL);
+
+        File deps(global.params.moduleDepsFile);
+        OutBuffer* ob = global.params.moduleDeps; 
+        deps.setbuffer((void*)ob->data, ob->offset);
+        deps.write();
+    }
+
-    // collects llvm modules to be linked if singleobj is passed
-    std::vector<llvm::Module*> llvmModules;