From: Daniel Jasper Date: Fri, 6 Dec 2013 09:25:54 +0000 (+0000) Subject: Allow string literals as module names. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=69e46036a391a12d2eb3149569c335ce3634bf31;p=clang Allow string literals as module names. In order to make the migration to modules easier, it seems to be helpful to allow a 1:1 mapping between target names of a current build system and the corresponding C++ modules. As such targets commonly contain characters like "-". ":" and "/", allowing arbitrary quote-escaped strings seems to be a straightforward option. After several offline discussions, the precise mechanisms for C++ module names especially regarding submodules and import statements has yet to be determined. Thus, this patch only enables string literals as names inside the module map files which can be used by automatic module import (through #include). Also improve the error message on missing use-declarations. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@196573 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td index 871f5f6544..e9de4db036 100644 --- a/include/clang/Basic/DiagnosticLexKinds.td +++ b/include/clang/Basic/DiagnosticLexKinds.td @@ -614,7 +614,7 @@ def err_expected_id_building_module : Error< def error_use_of_private_header_outside_module : Error< "use of private header from outside its module: '%0'">; def error_undeclared_use_of_module : Error< - "use of a module not declared used: '%0'">; + "module %0 does not depend on a module exporting '%1'">; def warn_header_guard : Warning< "%0 is used as a header guard here, followed by #define of a different macro">, diff --git a/lib/Lex/ModuleMap.cpp b/lib/Lex/ModuleMap.cpp index f4dfa12854..3ce0def1d1 100644 --- a/lib/Lex/ModuleMap.cpp +++ b/lib/Lex/ModuleMap.cpp @@ -1066,7 +1066,7 @@ void ModuleMapParser::skipUntil(MMToken::TokenKind K) { bool ModuleMapParser::parseModuleId(ModuleId &Id) { Id.clear(); do { - if (Tok.is(MMToken::Identifier)) { + if (Tok.is(MMToken::Identifier) || Tok.is(MMToken::StringLiteral)) { Id.push_back(std::make_pair(Tok.getString(), Tok.getLocation())); consumeToken(); } else { @@ -1687,25 +1687,7 @@ void ModuleMapParser::parseUseDecl() { consumeToken(); // Parse the module-id. ModuleId ParsedModuleId; - - do { - if (Tok.is(MMToken::Identifier)) { - ParsedModuleId.push_back( - std::make_pair(Tok.getString(), Tok.getLocation())); - consumeToken(); - - if (Tok.is(MMToken::Period)) { - consumeToken(); - continue; - } - - break; - } - - Diags.Report(Tok.getLocation(), diag::err_mmap_module_id); - HadError = true; - return; - } while (true); + parseModuleId(ParsedModuleId); ActiveModule->UnresolvedDirectUses.push_back(ParsedModuleId); } diff --git a/lib/Lex/PPDirectives.cpp b/lib/Lex/PPDirectives.cpp index 7d4c788f66..70c32c3dc6 100644 --- a/lib/Lex/PPDirectives.cpp +++ b/lib/Lex/PPDirectives.cpp @@ -610,7 +610,7 @@ void Preprocessor::verifyModuleInclude(SourceLocation FilenameLoc, if (RequestingModule && getLangOpts().ModulesDeclUse && violatesUseDeclarations(RequestingModule, RequestedModule.getModule())) Diag(FilenameLoc, diag::error_undeclared_use_of_module) - << Filename; + << RequestingModule->getFullModuleName() << Filename; } const FileEntry *Preprocessor::LookupFile( diff --git a/test/Modules/Inputs/declare-use/h.h b/test/Modules/Inputs/declare-use/h.h index df99a6dd10..379e50180c 100644 --- a/test/Modules/Inputs/declare-use/h.h +++ b/test/Modules/Inputs/declare-use/h.h @@ -1,7 +1,7 @@ #ifndef H_H #define H_H #include "c.h" -#include "d.h" // expected-error {{use of a module not declared used}} +#include "d.h" // expected-error {{does not depend on a module exporting}} #include "h1.h" const int h1 = aux_h*c*7*d; #endif diff --git a/test/Modules/Inputs/string_names/a.h b/test/Modules/Inputs/string_names/a.h new file mode 100644 index 0000000000..a36dc1b59d --- /dev/null +++ b/test/Modules/Inputs/string_names/a.h @@ -0,0 +1,4 @@ +#ifndef A_H +#define A_H +const int a = 2; +#endif diff --git a/test/Modules/Inputs/string_names/b.h b/test/Modules/Inputs/string_names/b.h new file mode 100644 index 0000000000..55daf72868 --- /dev/null +++ b/test/Modules/Inputs/string_names/b.h @@ -0,0 +1,4 @@ +#ifndef B_H +#define B_H +const int b = 3; +#endif diff --git a/test/Modules/Inputs/string_names/c.h b/test/Modules/Inputs/string_names/c.h new file mode 100644 index 0000000000..38c278fc87 --- /dev/null +++ b/test/Modules/Inputs/string_names/c.h @@ -0,0 +1,4 @@ +#ifndef C_H +#define C_H +const int c = 2; +#endif diff --git a/test/Modules/Inputs/string_names/module.map b/test/Modules/Inputs/string_names/module.map new file mode 100644 index 0000000000..4e70eda399 --- /dev/null +++ b/test/Modules/Inputs/string_names/module.map @@ -0,0 +1,16 @@ +module "my/module-a" { + header "a.h" + use "my/module-c" + + module "Sub" { + header "sub.h" + } +} + +module "my/module-b" { + header "b.h" +} + +module "my/module-c" { + header "c.h" +} diff --git a/test/Modules/Inputs/string_names/sub.h b/test/Modules/Inputs/string_names/sub.h new file mode 100644 index 0000000000..64b9112d3e --- /dev/null +++ b/test/Modules/Inputs/string_names/sub.h @@ -0,0 +1,4 @@ +#ifndef SUB_H +#define SUB_H +const int sub = 2; +#endif diff --git a/test/Modules/declare-use1.cpp b/test/Modules/declare-use1.cpp index 4508017c12..5b344032d2 100644 --- a/test/Modules/declare-use1.cpp +++ b/test/Modules/declare-use1.cpp @@ -3,5 +3,5 @@ #include "g.h" #include "e.h" -#include "f.h" // expected-error {{use of a module not declared used}} +#include "f.h" // expected-error {{module XG does not depend on a module exporting 'f.h'}} const int g2 = g1+e+f; diff --git a/test/Modules/declare-use2.cpp b/test/Modules/declare-use2.cpp index a2ec55e5e5..15c57ca36d 100644 --- a/test/Modules/declare-use2.cpp +++ b/test/Modules/declare-use2.cpp @@ -3,5 +3,5 @@ #include "h.h" #include "e.h" -#include "f.h" // expected-error {{use of a module not declared used}} +#include "f.h" // expected-error {{does not depend on a module exporting}} const int h2 = h1+e+f; diff --git a/test/Modules/string_names.cpp b/test/Modules/string_names.cpp new file mode 100644 index 0000000000..ed65aa8a67 --- /dev/null +++ b/test/Modules/string_names.cpp @@ -0,0 +1,6 @@ +// RUN: rm -rf %t +// RUN: %clang_cc1 -fmodules-cache-path=%t -fmodules -fmodules-decluse -I %S/Inputs/string_names %s -fmodule-name="my/module-a" -verify + +#include "a.h" +#include "b.h" // expected-error {{does not depend on a module exporting}} +#include "c.h"