aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-03-06 05:51:53 +0800
committerGitHub <noreply@github.com>2018-03-06 05:51:53 +0800
commit9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115 (patch)
tree1baae073942dc6cdf0fb7855d01ed58006699b7f
parentbe797cb796f058c65452531755687da42867050f (diff)
parent174c46d5afd8be4e6b23804bbdd8245d5a78cc0e (diff)
downloaddexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.tar
dexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.tar.gz
dexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.tar.bz2
dexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.tar.lz
dexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.tar.xz
dexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.tar.zst
dexon-solidity-9d67e9b4fc1b04a1e2d837a30ffb4ebee8863115.zip
Merge pull request #3640 from AnthonyBroadCrawford/spanning-multiline-message-fix
moved spanning multi lines message to appear on some lane vs new lineā€¦
-rw-r--r--Changelog.md1
-rw-r--r--libsolidity/interface/SourceReferenceFormatter.cpp4
2 files changed, 3 insertions, 2 deletions
diff --git a/Changelog.md b/Changelog.md
index 529fb181..bea9dd5b 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -13,6 +13,7 @@ Features:
* Syntax Checker: Mark ``throw`` as an error as experimental 0.5.0 feature.
* Syntax Checker: Issue error if no visibility is specified on contract functions as experimental 0.5.0 feature.
* Type Checker: disallow combining hex numbers and unit denominations as experimental 0.5.0 feature.
+ * Improved messaging when error spans multiple lines of a sourcefile
Bugfixes:
* Assembly: Raise error on oversized number literals in assembly.
diff --git a/libsolidity/interface/SourceReferenceFormatter.cpp b/libsolidity/interface/SourceReferenceFormatter.cpp
index 9d02c498..0f014372 100644
--- a/libsolidity/interface/SourceReferenceFormatter.cpp
+++ b/libsolidity/interface/SourceReferenceFormatter.cpp
@@ -79,8 +79,8 @@ void SourceReferenceFormatter::printSourceLocation(SourceLocation const* _locati
scanner.lineAtPosition(_location->start) <<
endl <<
string(startColumn, ' ') <<
- "^\n" <<
- "Spanning multiple lines.\n";
+ "^ (Relevant source part starts here and spans across multiple lines)." <<
+ endl;
}
void SourceReferenceFormatter::printSourceName(SourceLocation const* _location)