<div dir="ltr">Did Doug ever get a chance to look at this?<div><br></div><div>-- Sean Silva</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Oct 15, 2013 at 9:52 AM, John Thompson <span dir="ltr"><<a href="mailto:John.Thompson.JTSoftware@gmail.com" target="_blank">John.Thompson.JTSoftware@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: jtsoftware<br>
Date: Tue Oct 15 08:52:33 2013<br>
New Revision: 192703<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=192703&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=192703&view=rev</a><br>
Log:<br>
Added module map generation option.<br>
<br>
Added:<br>
clang-tools-extra/trunk/modularize/Modularize.h<br>
clang-tools-extra/trunk/modularize/ModuleAssistant.cpp<br>
clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/<br>
clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header1.h<br>
clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header2.h<br>
clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/<br>
clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header3.h<br>
clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header4.h<br>
clang-tools-extra/trunk/test/modularize/NoProblemsAssistant.modularize<br>
clang-tools-extra/trunk/test/modularize/SubModule2.h<br>
Modified:<br>
clang-tools-extra/trunk/modularize/CMakeLists.txt<br>
clang-tools-extra/trunk/modularize/Modularize.cpp<br>
<br>
Modified: clang-tools-extra/trunk/modularize/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/CMakeLists.txt?rev=192703&r1=192702&r2=192703&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/CMakeLists.txt?rev=192703&r1=192702&r2=192703&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/modularize/CMakeLists.txt (original)<br>
+++ clang-tools-extra/trunk/modularize/CMakeLists.txt Tue Oct 15 08:52:33 2013<br>
@@ -7,6 +7,7 @@ set(LLVM_LINK_COMPONENTS<br>
<br>
add_clang_executable(modularize<br>
Modularize.cpp<br>
+ ModuleAssistant.cpp<br>
PreprocessorTracker.cpp<br>
)<br>
<br>
<br>
Modified: clang-tools-extra/trunk/modularize/Modularize.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.cpp?rev=192703&r1=192702&r2=192703&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.cpp?rev=192703&r1=192702&r2=192703&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/modularize/Modularize.cpp (original)<br>
+++ clang-tools-extra/trunk/modularize/Modularize.cpp Tue Oct 15 08:52:33 2013<br>
@@ -90,6 +90,25 @@<br>
//<br>
// See PreprocessorTracker.cpp for additional details.<br>
//<br>
+// Modularize also has an option ("-module-map-path=module.map") that will<br>
+// skip the checks, and instead act as a module.map generation assistant,<br>
+// generating a module map file based on the header list. An optional<br>
+// "-root-module=(rootName)" argument can specify a root module to be<br>
+// created in the generated module.map file. Note that you will likely<br>
+// need to edit this file to suit the needs of your headers.<br>
+//<br>
+// An example command line for generating a module.map file:<br>
+//<br>
+// modularize -module-map-path=module.map -root-module=myroot headerlist.txt<br>
+//<br>
+// Note that if the headers in the header list have partial paths, sub-modules<br>
+// will be created for the subdirectires involved, assuming that the<br>
+// subdirectories contain headers to be grouped into a module, but still with<br>
+// individual modules for the headers in the subdirectory.<br>
+//<br>
+// See the ModuleAssistant.cpp file comments for additional details about the<br>
+// implementation of the assistant mode.<br>
+//<br>
// Future directions:<br>
//<br>
// Basically, we want to add new checks for whatever we can check with respect<br>
@@ -134,8 +153,6 @@<br>
#include "clang/Tooling/CompilationDatabase.h"<br>
#include "clang/Tooling/Tooling.h"<br>
#include "llvm/ADT/OwningPtr.h"<br>
-#include "llvm/ADT/StringRef.h"<br>
-#include "llvm/ADT/StringMap.h"<br>
#include "llvm/Config/config.h"<br>
#include "llvm/Option/Arg.h"<br>
#include "llvm/Option/ArgList.h"<br>
@@ -150,6 +167,7 @@<br>
#include <iterator><br>
#include <string><br>
#include <vector><br>
+#include "Modularize.h"<br>
#include "PreprocessorTracker.h"<br>
<br>
using namespace clang;<br>
@@ -178,8 +196,24 @@ cl::opt<std::string> HeaderPrefix(<br>
" If not specified,"<br>
" the files are considered to be relative to the header list file."));<br>
<br>
-typedef SmallVector<std::string, 4> DependentsVector;<br>
-typedef StringMap<DependentsVector> DependencyMap;<br>
+// Option for assistant mode, telling modularize to output a module map<br>
+// based on the headers list, and where to put it.<br>
+cl::opt<std::string> ModuleMapPath(<br>
+ "module-map-path", cl::init(""),<br>
+ cl::desc("Turn on module map output and specify output path or file name."<br>
+ " If no path is specified and if prefix option is specified,"<br>
+ " use prefix for file path."));<br>
+<br>
+// Option for assistant mode, telling modularize to output a module map<br>
+// based on the headers list, and where to put it.<br>
+cl::opt<std::string><br>
+RootModule("root-module", cl::init(""),<br>
+ cl::desc("Specify the name of the root module."));<br>
+<br>
+// Save the program name for error messages.<br>
+const char *Argv0;<br>
+// Save the command line for comments.<br>
+std::string CommandLine;<br>
<br>
// Read the header list file and collect the header file names and<br>
// optional dependencies.<br>
@@ -651,6 +685,16 @@ private:<br>
<br>
int main(int Argc, const char **Argv) {<br>
<br>
+ // Save program name for error messages.<br>
+ Argv0 = Argv[0];<br>
+<br>
+ // Save program arguments for use in module.map comment.<br>
+ CommandLine = sys::path::stem(sys::path::filename(Argv0));<br>
+ for (int ArgIndex = 1; ArgIndex < Argc; ArgIndex++) {<br>
+ CommandLine.append(" ");<br>
+ CommandLine.append(Argv[ArgIndex]);<br>
+ }<br>
+<br>
// This causes options to be parsed.<br>
cl::ParseCommandLineOptions(Argc, Argv, "modularize.\n");<br>
<br>
@@ -670,6 +714,14 @@ int main(int Argc, const char **Argv) {<br>
return 1;<br>
}<br>
<br>
+ // If we are in assistant mode, output the module map and quit.<br>
+ if (ModuleMapPath[0]) {<br>
+ if (!createModuleMap(ModuleMapPath, Headers, Dependencies, HeaderPrefix,<br>
+ RootModule))<br>
+ return 1; // Failed.<br>
+ return 0; // Success - Skip checks in assistant mode.<br>
+ }<br>
+<br>
// Create the compilation database.<br>
SmallString<256> PathBuf;<br>
sys::fs::current_path(PathBuf);<br>
<br>
Added: clang-tools-extra/trunk/modularize/Modularize.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.h?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/Modularize.h?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/modularize/Modularize.h (added)<br>
+++ clang-tools-extra/trunk/modularize/Modularize.h Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1,52 @@<br>
+//===--- Modularize.h - Common definitions for Modularize -*- C++ -*-----===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===--------------------------------------------------------------------===//<br>
+///<br>
+/// \file<br>
+/// \brief Common definitions for Modularize.<br>
+///<br>
+//===--------------------------------------------------------------------===//<br>
+<br>
+#ifndef MODULARIZE_H<br>
+#define MODULARIZE_H<br>
+<br>
+#include "llvm/ADT/ArrayRef.h"<br>
+#include "llvm/ADT/SmallString.h"<br>
+#include "llvm/ADT/SmallVector.h"<br>
+#include "llvm/ADT/StringMap.h"<br>
+#include "llvm/ADT/StringRef.h"<br>
+#include <string><br>
+#include <vector><br>
+<br>
+// Save the program name for error messages.<br>
+extern const char *Argv0;<br>
+// Save the command line for comments.<br>
+extern std::string CommandLine;<br>
+<br>
+// Dependency types.<br>
+typedef llvm::SmallVector<std::string, 4> DependentsVector;<br>
+typedef llvm::StringMap<DependentsVector> DependencyMap;<br>
+<br>
+// Global function declarations.<br>
+<br>
+/// Create the module map file.<br>
+/// \param ModuleMapPath The path to the module map file to be generated.<br>
+/// \param HeaderFileNames The list of header files, absolute native paths.<br>
+/// \param Dependencies Map of headers that depend on other headers.<br>
+/// \param HeaderPrefix Tells the code where the headers are, if they<br>
+/// aren's in the current directory, allowing the generator to strip<br>
+/// the leading, non-relative beginning of the header paths.<br>
+/// \brief RootModuleName If not empty, specifies that a root module<br>
+/// should be created with this name.<br>
+/// \returns True if successful.<br>
+bool createModuleMap(llvm::StringRef ModuleMapPath,<br>
+ llvm::ArrayRef<std::string> HeaderFileNames,<br>
+ DependencyMap &Dependencies, llvm::StringRef HeaderPrefix,<br>
+ llvm::StringRef RootModuleName);<br>
+<br>
+#endif // MODULARIZE_H<br>
<br>
Added: clang-tools-extra/trunk/modularize/ModuleAssistant.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/ModuleAssistant.cpp?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/modularize/ModuleAssistant.cpp?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/modularize/ModuleAssistant.cpp (added)<br>
+++ clang-tools-extra/trunk/modularize/ModuleAssistant.cpp Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1,287 @@<br>
+//===--- ModuleAssistant.cpp - Module map generation manager -*- C++ -*---===//<br>
+//<br>
+// The LLVM Compiler Infrastructure<br>
+//<br>
+// This file is distributed under the University of Illinois Open Source<br>
+// License. See LICENSE.TXT for details.<br>
+//<br>
+//===---------------------------------------------------------------------===//<br>
+//<br>
+// This file defines the module generation entry point function,<br>
+// createModuleMap, a Module class for representing a module,<br>
+// and various implementation functions for doing the underlying<br>
+// work, described below.<br>
+//<br>
+// The "Module" class represents a module, with members for storing the module<br>
+// name, associated header file names, and sub-modules, and an "output"<br>
+// function that recursively writes the module definitions.<br>
+//<br>
+// The "createModuleMap" function implements the top-level logic of the<br>
+// assistant mode. It calls a loadModuleDescriptions function to walk<br>
+// the header list passed to it and creates a tree of Module objects<br>
+// representing the module hierarchy, represented by a "Module" object,<br>
+// the "RootModule". This root module may or may not represent an actual<br>
+// module in the module map, depending on the "--root-module" option passed<br>
+// to modularize. It then calls a writeModuleMap function to set up the<br>
+// module map file output and walk the module tree, outputting the module<br>
+// map file using a stream obtained and managed by an<br>
+// llvm::tool_output_file object.<br>
+//<br>
+//===---------------------------------------------------------------------===//<br>
+<br>
+#include "Modularize.h"<br>
+#include "llvm/ADT/OwningPtr.h"<br>
+#include "llvm/ADT/SmallString.h"<br>
+#include "llvm/Support/FileSystem.h"<br>
+#include "llvm/Support/Path.h"<br>
+#include "llvm/Support/ToolOutputFile.h"<br>
+#include <vector><br>
+<br>
+// Local definitions:<br>
+<br>
+namespace {<br>
+<br>
+// Internal class definitions:<br>
+<br>
+// Represents a module.<br>
+class Module {<br>
+public:<br>
+ Module(llvm::StringRef Name);<br>
+ Module();<br>
+ ~Module();<br>
+ bool output(llvm::raw_fd_ostream &OS, int Indent);<br>
+ Module *findSubModule(llvm::StringRef SubName);<br>
+<br>
+public:<br>
+ std::string Name;<br>
+ std::vector<std::string> HeaderFileNames;<br>
+ std::vector<Module *> SubModules;<br>
+};<br>
+<br>
+} // end anonymous namespace.<br>
+<br>
+// Module functions:<br>
+<br>
+// Constructors.<br>
+Module::Module(llvm::StringRef Name) : Name(Name) {}<br>
+Module::Module() {}<br>
+<br>
+// Destructor.<br>
+Module::~Module() {<br>
+ // Free submodules.<br>
+ while (SubModules.size()) {<br>
+ Module *last = SubModules.back();<br>
+ SubModules.pop_back();<br>
+ delete last;<br>
+ }<br>
+}<br>
+<br>
+// Write a module hierarchy to the given output stream.<br>
+bool Module::output(llvm::raw_fd_ostream &OS, int Indent) {<br>
+ // If this is not the nameless root module, start a module definition.<br>
+ if (Name.size() != 0) {<br>
+ OS.indent(Indent);<br>
+ OS << "module " << Name << " {\n";<br>
+ Indent += 2;<br>
+ }<br>
+<br>
+ // Output submodules.<br>
+ for (std::vector<Module *>::iterator I = SubModules.begin(),<br>
+ E = SubModules.end();<br>
+ I != E; ++I) {<br>
+ if (!(*I)->output(OS, Indent))<br>
+ return false;<br>
+ }<br>
+<br>
+ // Output header files.<br>
+ for (std::vector<std::string>::iterator I = HeaderFileNames.begin(),<br>
+ E = HeaderFileNames.end();<br>
+ I != E; ++I) {<br>
+ OS.indent(Indent);<br>
+ OS << "header \"" << *I << "\"\n";<br>
+ }<br>
+<br>
+ // If this module has header files, output export directive.<br>
+ if (HeaderFileNames.size() != 0) {<br>
+ OS.indent(Indent);<br>
+ OS << "export *\n";<br>
+ }<br>
+<br>
+ // If this is not the nameless root module, close the module definition.<br>
+ if (Name.size() != 0) {<br>
+ Indent -= 2;<br>
+ OS.indent(Indent);<br>
+ OS << "}\n";<br>
+ }<br>
+<br>
+ return true;<br>
+}<br>
+<br>
+// Lookup a sub-module.<br>
+Module *Module::findSubModule(llvm::StringRef SubName) {<br>
+ for (std::vector<Module *>::iterator I = SubModules.begin(),<br>
+ E = SubModules.end();<br>
+ I != E; ++I) {<br>
+ if ((*I)->Name == SubName)<br>
+ return *I;<br>
+ }<br>
+ return 0;<br>
+}<br>
+<br>
+// Implementation functions:<br>
+<br>
+// Reserved keywords in module.map syntax.<br>
+// Keep in sync with keywords in module map parser in Lex/ModuleMap.cpp,<br>
+// such as in ModuleMapParser::consumeToken().<br>
+static const char *ReservedNames[] = {<br>
+ "config_macros", "export", "module", "conflict", "framework",<br>
+ "requires", "exclude", "header", "private", "explicit",<br>
+ "link", "umbrella", "extern", "use", 0 // Flag end.<br>
+};<br>
+<br>
+// Convert module name to a non keyword.<br>
+// Prepends a '_' to the name if and only if the name is a keyword.<br>
+static std::string<br>
+ensureNoCollisionWithReservedName(llvm::StringRef MightBeReservedName) {<br>
+ std::string SafeName = MightBeReservedName;<br>
+ for (int Index = 0; ReservedNames[Index] != 0; ++Index) {<br>
+ if (MightBeReservedName == ReservedNames[Index]) {<br>
+ SafeName.insert(0, "_");<br>
+ break;<br>
+ }<br>
+ }<br>
+ return SafeName;<br>
+}<br>
+<br>
+// Add one module, given a header file path.<br>
+static bool addModuleDescription(Module *RootModule,<br>
+ llvm::StringRef HeaderFilePath,<br>
+ llvm::StringRef HeaderPrefix,<br>
+ DependencyMap &Dependencies) {<br>
+ Module *CurrentModule = RootModule;<br>
+ DependentsVector &FileDependents = Dependencies[HeaderFilePath];<br>
+ std::string FilePath;<br>
+ // Strip prefix.<br>
+ if (HeaderFilePath.startswith(HeaderPrefix))<br>
+ FilePath = HeaderFilePath.substr(HeaderPrefix.size() + 1);<br>
+ else<br>
+ FilePath = HeaderFilePath;<br>
+ int Count = FileDependents.size();<br>
+ // Headers that go into modules must not depend on other files being<br>
+ // included first. If there are any dependents, warn user and omit.<br>
+ if (Count != 0) {<br>
+ llvm::errs() << "warning: " << FilePath<br>
+ << " depends on other headers being included first,"<br>
+ " meaning the module.map won't compile."<br>
+ " This header will be omitted from the module map.\n";<br>
+ return true;<br>
+ }<br>
+ // Make canonical.<br>
+ std::replace(FilePath.begin(), FilePath.end(), '\\', '/');<br>
+ // Insert module into tree, using subdirectories as submodules.<br>
+ for (llvm::sys::path::const_iterator I = llvm::sys::path::begin(FilePath),<br>
+ E = llvm::sys::path::end(FilePath);<br>
+ I != E; ++I) {<br>
+ if ((*I)[0] == '.')<br>
+ continue;<br>
+ std::string Stem = llvm::sys::path::stem(*I);<br>
+ Stem = ensureNoCollisionWithReservedName(Stem);<br>
+ Module *SubModule = CurrentModule->findSubModule(Stem);<br>
+ if (SubModule == 0) {<br>
+ SubModule = new Module(Stem);<br>
+ CurrentModule->SubModules.push_back(SubModule);<br>
+ }<br>
+ CurrentModule = SubModule;<br>
+ }<br>
+ // Add header file name to headers.<br>
+ CurrentModule->HeaderFileNames.push_back(FilePath);<br>
+ return true;<br>
+}<br>
+<br>
+// Create the internal module tree representation.<br>
+static Module *loadModuleDescriptions(<br>
+ llvm::StringRef RootModuleName, llvm::ArrayRef<std::string> HeaderFileNames,<br>
+ DependencyMap &Dependencies, llvm::StringRef HeaderPrefix) {<br>
+<br>
+ // Create root module.<br>
+ Module *RootModule = new Module(RootModuleName);<br>
+<br>
+ llvm::SmallString<256> CurrentDirectory;<br>
+ llvm::sys::fs::current_path(CurrentDirectory);<br>
+<br>
+ // If no header prefix, use current directory.<br>
+ if (HeaderPrefix.size() == 0)<br>
+ HeaderPrefix = CurrentDirectory;<br>
+<br>
+ // Walk the header file names and output the module map.<br>
+ for (llvm::ArrayRef<std::string>::iterator I = HeaderFileNames.begin(),<br>
+ E = HeaderFileNames.end();<br>
+ I != E; ++I) {<br>
+ // Add as a module.<br>
+ if (!addModuleDescription(RootModule, *I, HeaderPrefix, Dependencies))<br>
+ return false;<br>
+ }<br>
+<br>
+ return RootModule;<br>
+}<br>
+<br>
+// Kick off the writing of the module map.<br>
+static bool writeModuleMap(llvm::StringRef ModuleMapPath,<br>
+ llvm::StringRef HeaderPrefix, Module *RootModule) {<br>
+ llvm::SmallString<256> HeaderDirectory(ModuleMapPath);<br>
+ llvm::sys::path::remove_filename(HeaderDirectory);<br>
+ llvm::SmallString<256> FilePath;<br>
+<br>
+ // Get the module map file path to be used.<br>
+ if ((HeaderDirectory.size() == 0) && (HeaderPrefix.size() != 0)) {<br>
+ FilePath = HeaderPrefix;<br>
+ // Prepend header file name prefix if it's not absolute.<br>
+ llvm::sys::path::append(FilePath, ModuleMapPath);<br>
+ llvm::sys::path::native(FilePath);<br>
+ } else {<br>
+ FilePath = ModuleMapPath;<br>
+ llvm::sys::path::native(FilePath);<br>
+ }<br>
+<br>
+ // Set up module map output file.<br>
+ std::string Error;<br>
+ llvm::tool_output_file Out(FilePath.c_str(), Error);<br>
+ if (!Error.empty()) {<br>
+ llvm::errs() << Argv0 << ": error opening " << FilePath << ":" << Error<br>
+ << "\n";<br>
+ return false;<br>
+ }<br>
+<br>
+ // Get output stream from tool output buffer/manager.<br>
+ llvm::raw_fd_ostream &OS = Out.os();<br>
+<br>
+ // Output file comment.<br>
+ OS << "// " << ModuleMapPath << "\n";<br>
+ OS << "// Generated by: " << CommandLine << "\n\n";<br>
+<br>
+ // Write module hierarchy from internal representation.<br>
+ if (!RootModule->output(OS, 0))<br>
+ return false;<br>
+<br>
+ // Tell tool_output_file that we want to keep the file.<br>
+ Out.keep();<br>
+<br>
+ return true;<br>
+}<br>
+<br>
+// Global functions:<br>
+<br>
+// Module map generation entry point.<br>
+bool createModuleMap(llvm::StringRef ModuleMapPath,<br>
+ llvm::ArrayRef<std::string> HeaderFileNames,<br>
+ DependencyMap &Dependencies, llvm::StringRef HeaderPrefix,<br>
+ llvm::StringRef RootModuleName) {<br>
+ // Load internal representation of modules.<br>
+ llvm::OwningPtr<Module> RootModule(loadModuleDescriptions(<br>
+ RootModuleName, HeaderFileNames, Dependencies, HeaderPrefix));<br>
+ if (!RootModule.get())<br>
+ return false;<br>
+<br>
+ // Write module map file.<br>
+ return writeModuleMap(ModuleMapPath, HeaderPrefix, RootModule.get());<br>
+}<br>
<br>
Added: clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header1.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header1.h?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header1.h?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header1.h (added)<br>
+++ clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header1.h Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1 @@<br>
+// Header1.h - Empty.<br>
<br>
Added: clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header2.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header2.h?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header2.h?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header2.h (added)<br>
+++ clang-tools-extra/trunk/test/modularize/Inputs/SubModule1/Header2.h Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1 @@<br>
+// Header2.h - Empty.<br>
<br>
Added: clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header3.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header3.h?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header3.h?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header3.h (added)<br>
+++ clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header3.h Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1 @@<br>
+// Header3.h - Empty.<br>
<br>
Added: clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header4.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header4.h?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header4.h?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header4.h (added)<br>
+++ clang-tools-extra/trunk/test/modularize/Inputs/SubModule2/Header4.h Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1 @@<br>
+// Header4.h - Empty.<br>
<br>
Added: clang-tools-extra/trunk/test/modularize/NoProblemsAssistant.modularize<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/NoProblemsAssistant.modularize?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/NoProblemsAssistant.modularize?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/modularize/NoProblemsAssistant.modularize (added)<br>
+++ clang-tools-extra/trunk/test/modularize/NoProblemsAssistant.modularize Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1,45 @@<br>
+# RUN: modularize -module-map-path=Output/NoProblemsAssistant.txt -root-module=Root -prefix=%S/Input %s<br>
+# RUN: FileCheck --input-file=%T/NoProblemsAssistant.txt %s<br>
+<br>
+SomeTypes.h<br>
+SomeDecls.h<br>
+SubModule1/Header1.h<br>
+SubModule1/Header2.h<br>
+SubModule2/Header3.h<br>
+SubModule2/Header4.h<br>
+SubModule2.h<br>
+<br>
+# CHECK: // Output/NoProblemsAssistant.txt<br>
+# CHECK-NEXT: // Generated by: modularize -module-map-path=Output/NoProblemsAssistant.txt -root-module=Root -prefix={{.*}}{{[/\\]}}{{.*}} {{.*}}{{[/\\]}}NoProblemsAssistant.modularize<br>
+# CHECK: module Root {<br>
+# CHECK-NEXT: module SomeTypes {<br>
+# CHECK-NEXT: header "SomeTypes.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: module SomeDecls {<br>
+# CHECK-NEXT: header "SomeDecls.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: module SubModule1 {<br>
+# CHECK-NEXT: module Header1 {<br>
+# CHECK-NEXT: header "SubModule1/Header1.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: module Header2 {<br>
+# CHECK-NEXT: header "SubModule1/Header2.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: module SubModule2 {<br>
+# CHECK-NEXT: module Header3 {<br>
+# CHECK-NEXT: header "SubModule2/Header3.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: module Header4 {<br>
+# CHECK-NEXT: header "SubModule2/Header4.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: header "SubModule2.h"<br>
+# CHECK-NEXT: export *<br>
+# CHECK-NEXT: }<br>
+# CHECK-NEXT: }<br>
<br>
Added: clang-tools-extra/trunk/test/modularize/SubModule2.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/SubModule2.h?rev=192703&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/modularize/SubModule2.h?rev=192703&view=auto</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/modularize/SubModule2.h (added)<br>
+++ clang-tools-extra/trunk/test/modularize/SubModule2.h Tue Oct 15 08:52:33 2013<br>
@@ -0,0 +1,3 @@<br>
+// SubModule2.h - Master header with same name as directory.<br>
+#include "SubModule2/Header3.h"<br>
+#include "SubModule2/Header4.h"<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>