mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-28 19:24:53 +01:00
Richard Smith
6e9e871b74
Inject the name of a macro rather than its contents when computing its expansion. If the macro refers to itself, it will not expand within its own body, rather than expanding once. Switching from `EnterTokenStream` to `EnterToken` exposed that our Clang preprocessing environment was a little broken -- we reached the end of the primary source file and starting tearing stuff down before we actually finished parsing, which we were mostly getting away with before but aren't any more. Enabled Clang's incremental processing mode to fix this. This causes Clang to remain in the main source file when it reaches EOF instead of popping it. This also causes the diagnostics for invalid `module;` declarations to change, but in a way that seems not really any worse than before. Also slightly changes the diagnostics produced from macro expansion failures. The new diagnostics are a bit more precise -- they now capture the outermost level of macro expansion -- but we don't do a good job of rendering the Clang snippet attached to the "in macro expansion" context note yet, so the context looks a bit weird: we get two different snippets attached to the same diagnostic.
106 lines
4.6 KiB
Plaintext
106 lines
4.6 KiB
Plaintext
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/none.carbon
|
|
// EXTRA-ARGS: --clang-arg=--std=c++20
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/interop/cpp/basics/inline/modules.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/interop/cpp/basics/inline/modules.carbon
|
|
|
|
// --- fail_export_module_in_inline_cpp.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// TODO: This diagnostic isn't very good.
|
|
import Cpp inline '''
|
|
// CHECK:STDERR: fail_export_module_in_inline_cpp.carbon:[[@LINE+11]]:8: error: module declaration must not come from an #include directive [CppInteropParseError]
|
|
// CHECK:STDERR: 17 | export module Foo;
|
|
// CHECK:STDERR: | ^~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_export_module_in_inline_cpp.carbon:[[@LINE+7]]:8: error: module declaration must occur at the start of the translation unit [CppInteropParseError]
|
|
// CHECK:STDERR: 17 | export module Foo;
|
|
// CHECK:STDERR: | ^
|
|
// CHECK:STDERR: <carbon Cpp imports>:1:1: note: add 'module;' to the start of the file to introduce a global module fragment [CppInteropParseNote]
|
|
// CHECK:STDERR: 1 | ;
|
|
// CHECK:STDERR: | ^
|
|
// CHECK:STDERR:
|
|
export module Foo;
|
|
''';
|
|
|
|
// --- fail_module_in_inline_cpp.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// TODO: This diagnostic isn't very good.
|
|
import Cpp inline '''
|
|
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+15]]:1: error: module declaration must not come from an #include directive [CppInteropParseError]
|
|
// CHECK:STDERR: 21 | module Foo;
|
|
// CHECK:STDERR: | ^~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+11]]:1: error: module declaration must occur at the start of the translation unit [CppInteropParseError]
|
|
// CHECK:STDERR: 21 | module Foo;
|
|
// CHECK:STDERR: | ^
|
|
// CHECK:STDERR: <carbon Cpp imports>:1:1: note: add 'module;' to the start of the file to introduce a global module fragment [CppInteropParseNote]
|
|
// CHECK:STDERR: 1 | ;
|
|
// CHECK:STDERR: | ^
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_module_in_inline_cpp.carbon:[[@LINE+4]]:8: error: module 'Foo' not found [CppInteropParseError]
|
|
// CHECK:STDERR: 21 | module Foo;
|
|
// CHECK:STDERR: | ^~~~
|
|
// CHECK:STDERR:
|
|
module Foo;
|
|
''';
|
|
|
|
// --- fail_global_module_in_inline_cpp.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// TODO: This diagnostic isn't very good.
|
|
import Cpp inline '''
|
|
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+8]]:1: error: module declaration must not come from an #include directive [CppInteropParseError]
|
|
// CHECK:STDERR: 14 | module;
|
|
// CHECK:STDERR: | ^~~~~~~
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+4]]:1: error: 'module;' introducing a global module fragment can appear only at the start of the translation unit [CppInteropParseError]
|
|
// CHECK:STDERR: 14 | module;
|
|
// CHECK:STDERR: | ^~~~~~~
|
|
// CHECK:STDERR:
|
|
module;
|
|
|
|
int n;
|
|
|
|
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+15]]:1: error: module declaration must not come from an #include directive [CppInteropParseError]
|
|
// CHECK:STDERR: 33 | module Foo;
|
|
// CHECK:STDERR: | ^~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+11]]:1: error: module declaration must occur at the start of the translation unit [CppInteropParseError]
|
|
// CHECK:STDERR: 33 | module Foo;
|
|
// CHECK:STDERR: | ^
|
|
// CHECK:STDERR: <carbon Cpp imports>:1:1: note: add 'module;' to the start of the file to introduce a global module fragment [CppInteropParseNote]
|
|
// CHECK:STDERR: 1 | ;
|
|
// CHECK:STDERR: | ^
|
|
// CHECK:STDERR:
|
|
// CHECK:STDERR: fail_global_module_in_inline_cpp.carbon:[[@LINE+4]]:8: error: module 'Foo' not found [CppInteropParseError]
|
|
// CHECK:STDERR: 33 | module Foo;
|
|
// CHECK:STDERR: | ^~~~
|
|
// CHECK:STDERR:
|
|
module Foo;
|
|
''';
|
|
|
|
// --- fail_import_in_inline_cpp.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// TODO: Also test that a valid module import works.
|
|
import Cpp inline '''
|
|
// CHECK:STDERR: fail_import_in_inline_cpp.carbon:[[@LINE+4]]:8: error: 'file_that_does_not_exist.h' file not found [CppInteropParseError]
|
|
// CHECK:STDERR: 10 | import "file_that_does_not_exist.h";
|
|
// CHECK:STDERR: | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
import "file_that_does_not_exist.h";
|
|
''';
|