Skip to content

[flang] Fix #else with trailing text #138045

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
May 2, 2025
Merged

[flang] Fix #else with trailing text #138045

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3f856c
[flang] Fix #else with trailing text
eugeneepshteyn Apr 30, 2025
c7daada
Test
eugeneepshteyn Apr 30, 2025
17f057b
Removed the blank line
eugeneepshteyn Apr 30, 2025
3b8866e
Merge branch 'llvm:main' into fix-else
eugeneepshteyn May 1, 2025
8d13878
Merge branch 'llvm:main' into fix-else
eugeneepshteyn May 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion flang/lib/Parser/preprocessor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,9 @@ void Preprocessor::Directive(const TokenSequence &dir, Prescanner &prescanner) {
dir.GetIntervalProvenanceRange(j, tokens - j),
"#else: excess tokens at end of directive"_port_en_US);
}
} else if (ifStack_.empty()) {
}

if (ifStack_.empty()) {
prescanner.Say(dir.GetTokenProvenanceRange(dirOffset),
"#else: not nested within #if, #ifdef, or #ifndef"_err_en_US);
} else if (ifStack_.top() != CanDeadElseAppear::Yes) {
Expand Down
11 changes: 11 additions & 0 deletions flang/test/Preprocessing/pp048.F
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
! RUN: %flang -E %s 2>&1 | FileCheck %s
#ifndef XYZ42
PARAMETER(A=2)
#else Z
PARAMETER(A=3)
#endif
! Ensure that "PARAMETER(A" is printed only once
! CHECK: PARAMETER(A
! CHECK-NOT: PARAMETER(A
end

Loading