diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-05-05 22:34:07 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-05-05 22:34:07 +0000 |
| commit | ce03732ec85296f942ee6644596056ce5e577f89 (patch) | |
| tree | 9558b898a22576ffb5b637e3195c635ac0c532f6 /clang | |
| parent | a49e7689779a30fbac7beb1ca7dcdc7e2730351b (diff) | |
| download | bcm5719-llvm-ce03732ec85296f942ee6644596056ce5e577f89.tar.gz bcm5719-llvm-ce03732ec85296f942ee6644596056ce5e577f89.zip | |
Permit keywords in module names in #pragma clang module *.
This is necessary to be able to build a libc++ module from preprocessed source
(due to the submodule std.new).
llvm-svn: 302312
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Lex/Pragma.cpp | 2 | ||||
| -rw-r--r-- | clang/test/Preprocessor/pragma_module.c | 9 |
2 files changed, 6 insertions, 5 deletions
diff --git a/clang/lib/Lex/Pragma.cpp b/clang/lib/Lex/Pragma.cpp index 51da2baac9e..99d56182c1b 100644 --- a/clang/lib/Lex/Pragma.cpp +++ b/clang/lib/Lex/Pragma.cpp @@ -1307,7 +1307,7 @@ static bool LexModuleName( &ModuleName) { while (true) { PP.LexUnexpandedToken(Tok); - if (Tok.isNot(tok::identifier)) { + if (Tok.isAnnotation() || !Tok.getIdentifierInfo()) { PP.Diag(Tok.getLocation(), diag::err_pp_expected_module_name) << ModuleName.empty(); return true; diff --git a/clang/test/Preprocessor/pragma_module.c b/clang/test/Preprocessor/pragma_module.c index 3763ca333c1..90aa9481fb1 100644 --- a/clang/test/Preprocessor/pragma_module.c +++ b/clang/test/Preprocessor/pragma_module.c @@ -1,13 +1,14 @@ // RUN: rm -rf %t // RUN: mkdir %t -// RUN: echo 'module foo { module a {} module b {} } module bar {}' > %t/module.map -// RUN: %clang -cc1 -E -fmodules %s -verify -fmodule-name=foo -fmodule-map-file=%t/module.map -// RUN: %clang -cc1 -E -fmodules %s -verify -fmodule-name=foo -fmodule-map-file=%t/module.map -fmodules-local-submodule-visibility -DLOCAL_VIS +// RUN: echo 'module foo { module a {} module b {} } module bar {} module if {}' > %t/module.map +// RUN: %clang -cc1 -fmodules -fmodule-name=if -x c %t/module.map -emit-module -o %t/if.pcm +// RUN: %clang -cc1 -E -fmodules %s -fmodule-file=%t/if.pcm -verify -fmodule-name=foo -fmodule-map-file=%t/module.map +// RUN: %clang -cc1 -E -fmodules %s -fmodule-file=%t/if.pcm -verify -fmodule-name=foo -fmodule-map-file=%t/module.map -fmodules-local-submodule-visibility -DLOCAL_VIS // Just checking the syntax here; the semantics are tested elsewhere. #pragma clang module import // expected-error {{expected module name}} #pragma clang module import ! // expected-error {{expected module name}} -#pragma clang module import if // expected-error {{expected module name}} +#pragma clang module import if // ok #pragma clang module import foo ? bar // expected-warning {{extra tokens at end of #pragma}} #pragma clang module import foo. // expected-error {{expected identifier after '.' in module name}} #pragma clang module import foo.bar.baz.quux // expected-error {{no submodule named 'bar' in module 'foo'}} |
