hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-28 10:15:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup DiagnosticError classes

Browse Source
This commit is contained in:
Tamas Vajk
2021-04-23 13:37:42 +02:00
parent 1a708affbf
commit e3f10c0e32
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
csharp/ql/src/Diagnostics/DiagnosticExtractionErrors.ql
View File

@@ -14,12 +14,16 @@ private newtype TDiagnosticError =
TExtractorError(ExtractorError e)
abstract private class DiagnosticError extends TDiagnosticError {
string getMessage() { none() }
abstract string getMessage();
string toString() { none() }
abstract string toString();
string getLocation(Location l) {
if l.getFile().fromSource() then result = " in " + l.getFile() else result = ""
abstract Location getLocation();
string getLocationMessage() {
if getLocation().getFile().fromSource()
then result = " in " + getLocation().getFile()
else result = ""
}
}
@@ -29,10 +33,12 @@ private class DiagnosticCompilerError extends DiagnosticError {
DiagnosticCompilerError() { this = TCompilerError(c) }
override string getMessage() {
result = "Compiler error" + getLocation(c.getLocation()) + ": " + c.getMessage()
result = "Compiler error" + this.getLocationMessage() + ": " + c.getMessage()
}
override string toString() { result = c.toString() }
override Location getLocation() { result = c.getLocation() }
}
private class DiagnosticExtractorError extends DiagnosticError {
@@ -45,10 +51,12 @@ private class DiagnosticExtractorError extends DiagnosticError {
override string getMessage() {
result =
"Unexpected " + e.getOrigin() + " error" + getLocation(e.getLocation()) + ": " + e.getText()
"Unexpected " + e.getOrigin() + " error" + this.getLocationMessage() + ": " + e.getText()
}
override string toString() { result = e.toString() }
override Location getLocation() { result = e.getLocation() }
}
from DiagnosticError error