Skip to content

Add error message about double definition (#1589) #4064

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 11 commits into from
Mar 19, 2018
Merged

Add error message about double definition (#1589) #4064

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
03e4ab3
Add error message about double definition (#1589)
Mar 2, 2018
06c7a51
remove unused methods
Mar 3, 2018
d4455fd
fix error counts for tests/neg/singletonOrs
Mar 3, 2018
aa9ce63
WIP try to improve error messages
Mar 9, 2018
aa803ed
fix off by one error when printing line of previously declared symbol
Mar 11, 2018
68dcdec
don't show error about signatures when a var/val and a def are clashing
Mar 11, 2018
4df133e
call it declaration consistently
Mar 11, 2018
b6e1090
remove Signature.NoMatch from cases because it should not happen
Mar 11, 2018
5672fcf
remove redundant asTerm
Mar 11, 2018
c569c8a
fix grammar and wording
Mar 11, 2018
e4c64b7
remove double definition in singletonOr test
Mar 12, 2018
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
Prev Previous commit
Next Next commit
fix grammar and wording
  • Loading branch information
Jendrik Wenke committed Mar 11, 2018
commit c569c8aa978ff75f187ed0c5d5ed6ea60312b4ce
6 changes: 3 additions & 3 deletions compiler/src/dotty/tools/dotc/reporting/diagnostic/messages.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2087,11 +2087,11 @@ object messages {
// compare the signatures when both symbols represent methods
decl.signature.matchDegree(previousDecl.signature) match {
/* case Signature.NoMatch => // can't happen because decl.matches(previousDecl) is checked before reporting this error */
case Signature.ParamMatch => "\nOverloads with equal parameter types but different return types are not allowed."
case _ /* Signature.FullMatch */ => "\nThe definitions have the same signature after erasure."
case Signature.ParamMatch => "\nOverloads with matching parameter types are not allowed."
case _ /* Signature.FullMatch */ => "\nThe definitions have matching type signatures after erasure."
}
} else ""
hl"${decl.showLocated} is already defined as ${previousDecl.showDcl} in line ${previousDecl.pos.line + 1}." + details
hl"${decl.showLocated} is already defined as ${previousDecl.showDcl} at line ${previousDecl.pos.line + 1}." + details
}
val explanation = ""
}
Expand Down