aboutsummaryrefslogtreecommitdiffstats
path: root/libsolidity
diff options
context:
space:
mode:
authorchriseth <chris@ethereum.org>2018-02-20 00:34:07 +0800
committerGitHub <noreply@github.com>2018-02-20 00:34:07 +0800
commitabc23ac6086fe724b82eb8ca7f9805cf7ff5ba10 (patch)
tree31ebad3bbafe2fca6292989e7521ab0e8146f9d3 /libsolidity
parenta938e39a9d1784a91984c6959300f64734172864 (diff)
parent305d5f70c25d63d602477c6b576b2f62d388c032 (diff)
downloaddexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.gz
dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.tar.zst
dexon-solidity-abc23ac6086fe724b82eb8ca7f9805cf7ff5ba10.zip
Merge pull request #3135 from federicobond/formatter-instance
Convert static SourceReferenceFormatter functions to member ones
Diffstat (limited to 'libsolidity')
-rw-r--r--libsolidity/interface/SourceReferenceFormatter.cpp55
-rw-r--r--libsolidity/interface/SourceReferenceFormatter.h38
2 files changed, 43 insertions, 50 deletions
diff --git a/libsolidity/interface/SourceReferenceFormatter.cpp b/libsolidity/interface/SourceReferenceFormatter.cpp
index aeafaf2d..9d02c498 100644
--- a/libsolidity/interface/SourceReferenceFormatter.cpp
+++ b/libsolidity/interface/SourceReferenceFormatter.cpp
@@ -31,15 +31,11 @@ namespace dev
namespace solidity
{
-void SourceReferenceFormatter::printSourceLocation(
- ostream& _stream,
- SourceLocation const* _location,
- function<Scanner const&(string const&)> const& _scannerFromSourceName
-)
+void SourceReferenceFormatter::printSourceLocation(SourceLocation const* _location)
{
if (!_location || !_location->sourceName)
return; // Nothing we can print here
- auto const& scanner = _scannerFromSourceName(*_location->sourceName);
+ auto const& scanner = m_scannerFromSourceName(*_location->sourceName);
int startLine;
int startColumn;
tie(startLine, startColumn) = scanner.translatePositionToLineColumn(_location->start);
@@ -64,21 +60,22 @@ void SourceReferenceFormatter::printSourceLocation(
endColumn = startColumn + locationLength;
}
- _stream << line << endl;
+ m_stream << line << endl;
+
for_each(
line.cbegin(),
line.cbegin() + startColumn,
- [&_stream](char const& ch) { _stream << (ch == '\t' ? '\t' : ' '); }
+ [this](char const& ch) { m_stream << (ch == '\t' ? '\t' : ' '); }
);
- _stream << "^";
+ m_stream << "^";
if (endColumn > startColumn + 2)
- _stream << string(endColumn - startColumn - 2, '-');
+ m_stream << string(endColumn - startColumn - 2, '-');
if (endColumn > startColumn + 1)
- _stream << "^";
- _stream << endl;
+ m_stream << "^";
+ m_stream << endl;
}
else
- _stream <<
+ m_stream <<
scanner.lineAtPosition(_location->start) <<
endl <<
string(startColumn, ' ') <<
@@ -86,50 +83,44 @@ void SourceReferenceFormatter::printSourceLocation(
"Spanning multiple lines.\n";
}
-void SourceReferenceFormatter::printSourceName(
- ostream& _stream,
- SourceLocation const* _location,
- function<Scanner const&(string const&)> const& _scannerFromSourceName
-)
+void SourceReferenceFormatter::printSourceName(SourceLocation const* _location)
{
if (!_location || !_location->sourceName)
return; // Nothing we can print here
- auto const& scanner = _scannerFromSourceName(*_location->sourceName);
+ auto const& scanner = m_scannerFromSourceName(*_location->sourceName);
int startLine;
int startColumn;
tie(startLine, startColumn) = scanner.translatePositionToLineColumn(_location->start);
- _stream << *_location->sourceName << ":" << (startLine + 1) << ":" << (startColumn + 1) << ": ";
+ m_stream << *_location->sourceName << ":" << (startLine + 1) << ":" << (startColumn + 1) << ": ";
}
void SourceReferenceFormatter::printExceptionInformation(
- ostream& _stream,
Exception const& _exception,
- string const& _name,
- function<Scanner const&(string const&)> const& _scannerFromSourceName
+ string const& _name
)
{
SourceLocation const* location = boost::get_error_info<errinfo_sourceLocation>(_exception);
auto secondarylocation = boost::get_error_info<errinfo_secondarySourceLocation>(_exception);
- printSourceName(_stream, location, _scannerFromSourceName);
+ printSourceName(location);
- _stream << _name;
+ m_stream << _name;
if (string const* description = boost::get_error_info<errinfo_comment>(_exception))
- _stream << ": " << *description << endl;
+ m_stream << ": " << *description << endl;
else
- _stream << endl;
+ m_stream << endl;
- printSourceLocation(_stream, location, _scannerFromSourceName);
+ printSourceLocation(location);
if (secondarylocation && !secondarylocation->infos.empty())
{
for (auto info: secondarylocation->infos)
{
- printSourceName(_stream, &info.second, _scannerFromSourceName);
- _stream << info.first << endl;
- printSourceLocation(_stream, &info.second, _scannerFromSourceName);
+ printSourceName(&info.second);
+ m_stream << info.first << endl;
+ printSourceLocation(&info.second);
}
- _stream << endl;
+ m_stream << endl;
}
}
diff --git a/libsolidity/interface/SourceReferenceFormatter.h b/libsolidity/interface/SourceReferenceFormatter.h
index e8676d60..a32babdc 100644
--- a/libsolidity/interface/SourceReferenceFormatter.h
+++ b/libsolidity/interface/SourceReferenceFormatter.h
@@ -38,22 +38,23 @@ namespace solidity
class Scanner; // forward
class CompilerStack; // forward
-struct SourceReferenceFormatter
+class SourceReferenceFormatter
{
public:
using ScannerFromSourceNameFun = std::function<Scanner const&(std::string const&)>;
- /// Prints source location if it is given.
- static void printSourceLocation(
- std::ostream& _stream,
- SourceLocation const* _location,
- ScannerFromSourceNameFun const& _scannerFromSourceName
- );
- static void printExceptionInformation(
+
+ explicit SourceReferenceFormatter(
std::ostream& _stream,
- Exception const& _exception,
- std::string const& _name,
- ScannerFromSourceNameFun const& _scannerFromSourceName
- );
+ ScannerFromSourceNameFun _scannerFromSourceName
+ ):
+ m_stream(_stream),
+ m_scannerFromSourceName(std::move(_scannerFromSourceName))
+ {}
+
+ /// Prints source location if it is given.
+ void printSourceLocation(SourceLocation const* _location);
+ void printExceptionInformation(Exception const& _exception, std::string const& _name);
+
static std::string formatExceptionInformation(
Exception const& _exception,
std::string const& _name,
@@ -61,16 +62,17 @@ public:
)
{
std::ostringstream errorOutput;
- printExceptionInformation(errorOutput, _exception, _name, _scannerFromSourceName);
+
+ SourceReferenceFormatter formatter(errorOutput, _scannerFromSourceName);
+ formatter.printExceptionInformation(_exception, _name);
return errorOutput.str();
}
private:
/// Prints source name if location is given.
- static void printSourceName(
- std::ostream& _stream,
- SourceLocation const* _location,
- ScannerFromSourceNameFun const& _scannerFromSourceName
- );
+ void printSourceName(SourceLocation const* _location);
+
+ std::ostream& m_stream;
+ ScannerFromSourceNameFun m_scannerFromSourceName;
};
}