Skip to content
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

Include both locations in duplicate module name error messages #4499

Merged
merged 6 commits into from
Sep 5, 2023
Merged

Include both locations in duplicate module name error messages #4499

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c4f04f6
Tiny refactoring
keyboardDrummer Sep 1, 2023
e06a642
Improve error messages for duplicate module names, so both locations …
keyboardDrummer Sep 1, 2023
7570e7e
Update expect files
keyboardDrummer Sep 1, 2023
4af44c9
Merge branch 'master' into duplicateModuleNameImprove
keyboardDrummer Sep 3, 2023
48d08e9
Merge branch 'master' into duplicateModuleNameImprove
keyboardDrummer Sep 5, 2023
9970575
Merge branch 'master' into duplicateModuleNameImprove
keyboardDrummer Sep 5, 2023
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
3 changes: 2 additions & 1 deletion Source/DafnyCore/AST/Modules/LiteralModuleDecl.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,8 @@ public void BindModuleNames(ProgramResolver resolver, ModuleBindings parentBindi

var bindings = ModuleDef.BindModuleNames(resolver, parentBindings);
if (!parentBindings.BindName(Name, this, bindings)) {
resolver.Reporter.Error(MessageSource.Resolver, tok, "Duplicate module name: {0}", Name);
parentBindings.TryLookup(Name, out var otherModule);
resolver.Reporter.Error(MessageSource.Resolver, new NestedToken(tok, otherModule.tok), "Duplicate module name: {0}", Name);
}
}

Expand Down
12 changes: 6 additions & 6 deletions Source/DafnyCore/AST/Modules/ModuleBindings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,14 @@ public bool BindName(string name, ModuleDecl subModule, ModuleBindings b) {
}
}

public bool TryLookup(IToken name, out ModuleDecl m) {
public bool TryLookup(string name, out ModuleDecl m) {
Contract.Requires(name != null);
return TryLookupFilter(name, out m, l => true);
}

public bool TryLookupFilter(IToken name, out ModuleDecl m, Func<ModuleDecl, bool> filter) {
public bool TryLookupFilter(string name, out ModuleDecl m, Func<ModuleDecl, bool> filter) {
Contract.Requires(name != null);
if (modules.TryGetValue(name.val, out m) && filter(m)) {
if (modules.TryGetValue(name, out m) && filter(m)) {
return true;
} else if (parent != null) {
return parent.TryLookupFilter(name, out m, filter);
Expand All @@ -56,7 +56,7 @@ public bool ResolveQualifiedModuleIdRootAbstract(AbstractModuleDecl context, Mod
Contract.Assert(qid != null);
IToken root = qid.Path[0].StartToken;
result = null;
bool res = TryLookupFilter(root, out result,
bool res = TryLookupFilter(root.val, out result,
m => context != m && ((context.EnclosingModuleDefinition == m.EnclosingModuleDefinition && context.Exports.Count == 0) || m is LiteralModuleDecl));
return res;
}
Expand All @@ -72,7 +72,7 @@ public bool ResolveQualifiedModuleIdRootImport(AliasModuleDecl context, ModuleQu
Contract.Assert(qid != null);
IToken root = qid.Path[0].StartToken;
result = null;
bool res = TryLookupFilter(root, out result,
bool res = TryLookupFilter(root.val, out result,
m => context != m && ((context.EnclosingModuleDefinition == m.EnclosingModuleDefinition && context.Exports.Count == 0) || m is LiteralModuleDecl));
return res;
}
Expand All @@ -82,7 +82,7 @@ public bool ResolveQualifiedModuleIdRootRefines(ModuleDefinition context, Module
Contract.Assert(qid != null);
IToken root = qid.Path[0].StartToken;
result = null;
bool res = TryLookupFilter(root, out result, m => m.EnclosingModuleDefinition != context);
bool res = TryLookupFilter(root.val, out result, m => m.EnclosingModuleDefinition != context);
return res;
}
}
2 changes: 1 addition & 1 deletion Source/DafnyCore/AST/Modules/ModuleDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ public ModuleBindings BindModuleNames(ProgramResolver resolver, ModuleBindings p
// the add was successful
} else {
// there's already something with this name
var yes = bindings.TryLookup(subDecl.tok, out var prevDecl);
var yes = bindings.TryLookup(subDecl.tok.val, out var prevDecl);
Contract.Assert(yes);
if (prevDecl is AbstractModuleDecl || prevDecl is AliasModuleDecl) {
resolver.Reporter.Error(MessageSource.Resolver, subDecl.tok, "Duplicate name of import: {0}", subDecl.Name);
Expand Down
8 changes: 4 additions & 4 deletions Source/DafnyLanguageServer/Workspace/ProjectManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ public async Task<CompilationAfterParsing> GetLastDocumentAsync() {
return await CompilationManager.LastDocument;
}

public async Task<IdeState> GetSnapshotAfterParsingAsync() {
Copy link
Member Author

@keyboardDrummer keyboardDrummer Sep 1, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changes in this file are an unrelated tiny refactoring

public async Task<IdeState> GetStateAfterParsingAsync() {
try {
var parsedCompilation = await CompilationManager.ParsedCompilation;
logger.LogDebug($"GetSnapshotAfterParsingAsync returns compilation version {parsedCompilation.Version}");
Expand All @@ -237,13 +237,13 @@ public async Task<IdeState> GetStateAfterResolutionAsync() {
try {
var resolvedCompilation = await CompilationManager.ResolvedCompilation;
logger.LogDebug($"GetStateAfterResolutionAsync returns compilation version {resolvedCompilation.Version}");
logger.LogDebug($"GetStateAfterResolutionAsync returns state version {latestIdeState.Value.Version}");
return latestIdeState.Value;
} catch (OperationCanceledException) {
logger.LogDebug($"GetSnapshotAfterResolutionAsync caught OperationCanceledException for resolved compilation {Project.Uri}");
return await GetSnapshotAfterParsingAsync();
return await GetStateAfterParsingAsync();
}

logger.LogDebug($"GetStateAfterResolutionAsync returns state version {latestIdeState.Value.Version}");
return latestIdeState.Value;
}

public async Task<IdeState> GetIdeStateAfterVerificationAsync() {
Expand Down
6 changes: 3 additions & 3 deletions Test/dafny0/ModuleInsertionErrors.dfy.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ModuleInsertionErrors.dfy(23,11): Error: Duplicate module name: B
ModuleInsertionErrors.dfy(24,11): Error: Duplicate module name: N
ModuleInsertionErrors.dfy(30,17): Error: Duplicate module name: O
ModuleInsertionErrors.dfy(23,11): Error: Duplicate module name: B [Related location] ModuleInsertionErrors.dfy(21,11)
ModuleInsertionErrors.dfy(24,11): Error: Duplicate module name: N [Related location] ModuleInsertionErrors.dfy(26,11)
ModuleInsertionErrors.dfy(30,17): Error: Duplicate module name: O [Related location] ModuleInsertionErrors.dfy(29,17)
3 resolution/type errors detected in ModuleInsertionErrors.dfy
2 changes: 1 addition & 1 deletion Test/git-issues/git-issue-478-errors.dfy.expect
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
git-issue-478-errors.dfy(22,9): Error: Import declaration uses same name as a module in the same scope: LibW
git-issue-478-errors.dfy(26,9): Error: Import declaration uses same name as a module in the same scope: LibX
git-issue-478-errors.dfy(36,7): Error: Duplicate module name: M
git-issue-478-errors.dfy(36,7): Error: Duplicate module name: M [Related location] git-issue-478-errors.dfy(35,7)
git-issue-478-errors.dfy(7,7): Error: Import declaration uses same name as a module in the same scope: LibA
git-issue-478-errors.dfy(11,7): Error: Import declaration uses same name as a module in the same scope: LibB
git-issue-478-errors.dfy(37,7): Error: Import declaration uses same name as a module in the same scope: M
Expand Down