Skip to content

Commit 3eb2b1c

Browse files
committed
Fix error definition
1 parent 68ec09b commit 3eb2b1c

File tree

4 files changed

+4
-5
lines changed

4 files changed

+4
-5
lines changed

include/swift/AST/DiagnosticsParse.def

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,8 @@ ERROR(decl_expected_module_name,none,
312312
ERROR(expected_module_alias,none,
313313
"cannot refer to module as %0 because it has been aliased; use %1 "
314314
"instead", (Identifier, Identifier))
315+
ERROR(unexpected_operator_in_import_path,none,
316+
"cannot include postfix operator in import declaration",())
315317

316318
// Extension
317319
ERROR(expected_lbrace_extension,PointsToFirstBadToken,
@@ -1616,8 +1618,6 @@ ERROR(attr_private_import_expected_sourcefile_name,none,
16161618
"expected a source file name in @_private(sourceFile:)", ())
16171619
ERROR(attr_private_import_expected_colon,none,
16181620
"expected ':' after @_private(sourceFile", ())
1619-
ERROR(operator_in_import_path,none,
1620-
"Cannot include postfix operator in import declaration.",())
16211621

16221622
// opened
16231623
ERROR(opened_attribute_expected_lparen,none,

lib/Parse/ParseDecl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4874,7 +4874,7 @@ ParserResult<ImportDecl> Parser::parseDeclImport(ParseDeclOptions Flags,
48744874
diag::expected_identifier_in_decl, "import"))
48754875
return nullptr;
48764876
if (Tok.is(tok::oper_postfix)) {
4877-
diagnose(Tok, diag::operator_in_import_path)
4877+
diagnose(Tok, diag::unexpected_operator_in_import_path)
48784878
.fixItRemove(Tok.getLoc());
48794879
return nullptr;
48804880
}

lib/Parse/Parser.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,6 @@ bool Parser::parseAnyIdentifier(Identifier &Result, SourceLoc &Loc,
951951
return false;
952952
}
953953

954-
955954
// When we know we're supposed to get an identifier or operator, map the
956955
// postfix '!' to an operator name.
957956
if (Tok.is(tok::exclaim_postfix)) {

test/decl/import/import.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import func Swift.min
4949

5050
import var x // expected-error {{expected module name}}
5151
import struct Swift.nonexistent // expected-error {{struct 'nonexistent' does not exist in module 'Swift'}}
52-
import func SwiftUI.Text.++ // expected-error{{Cannot include postfix operator in import declaration.}}{{25-28=}}
52+
import func SwiftUI.Text.++ // expected-error{{cannot include postfix operator in import declaration}}{{25-28=}}
5353

5454
import Swift.import.abc // expected-error {{expected identifier in import declaration}}
5555
// expected-error @-1 {{keyword 'import' cannot be used as an identifier here}}

0 commit comments

Comments
 (0)