cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Moving SourceReferenceFormatter into langutil namespace.

Browse Source
This commit is contained in:
Christian Parpart 2018-11-24 12:33:36 +01:00
parent 2e861bf1a0
commit aeb66905de
No known key found for this signature in database
GPG Key ID: 19BC8DD20312C929
11 changed files with 20 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libsolidity/interface/SourceReferenceFormatter.cpp → liblangutil/SourceReferenceFormatter.cpp
View File

@ -20,18 +20,14 @@
* Formatting functions for errors referencing positions and locations in the source.
*/
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/Scanner.h>
#include <liblangutil/Exceptions.h>
using namespace std;
using namespace dev;
using namespace langutil;
namespace dev
{
namespace solidity
{
void SourceReferenceFormatter::printSourceLocation(SourceLocation const* _location)
{
if (!_location || !_location->sourceName)
@ -103,7 +99,7 @@ void SourceReferenceFormatter::printSourceName(SourceLocation const* _location)
}
void SourceReferenceFormatter::printExceptionInformation(
Exception const& _exception,
dev::Exception const& _exception,
string const& _name
)
{
@ -131,6 +127,3 @@ void SourceReferenceFormatter::printExceptionInformation(
m_stream << endl;
}
}
}
}

21
libsolidity/interface/SourceReferenceFormatter.h → liblangutil/SourceReferenceFormatter.h
View File

@ -26,21 +26,15 @@
#include <sstream>
#include <functional>
namespace dev
{
struct Exception; // forward
}
namespace langutil
{
struct SourceLocation;
class Scanner;
}
namespace dev
{
struct Exception; // forward
namespace solidity
{
class CompilerStack; // forward
class SourceReferenceFormatter
{
@ -57,10 +51,10 @@ public:
/// Prints source location if it is given.
void printSourceLocation(langutil::SourceLocation const* _location);
void printExceptionInformation(Exception const& _exception, std::string const& _name);
void printExceptionInformation(dev::Exception const& _exception, std::string const& _name);
static std::string formatExceptionInformation(
Exception const& _exception,
dev::Exception const& _exception,
std::string const& _name,
ScannerFromSourceNameFun const& _scannerFromSourceName
)
@ -80,4 +74,3 @@ private:
};
}
}

2
libsolidity/codegen/CompilerContext.cpp
View File

@ -25,7 +25,7 @@
#include <libsolidity/ast/AST.h>
#include <libsolidity/codegen/Compiler.h>
#include <libsolidity/interface/Version.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libyul/AsmParser.h>
#include <libyul/AsmCodeGen.h>
#include <libyul/AsmAnalysis.h>

2
libsolidity/interface/StandardCompiler.cpp
View File

@ -21,7 +21,7 @@
*/
#include <libsolidity/interface/StandardCompiler.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libsolidity/ast/ASTJsonConverter.h>
#include <libevmasm/Instruction.h>
#include <libdevcore/JSON.h>

2
solc/CommandLineInterface.cpp
View File

@ -34,7 +34,7 @@
#include <liblangutil/Exceptions.h>
#include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/StandardCompiler.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libsolidity/interface/GasEstimator.h>
#include <libsolidity/interface/AssemblyStack.h>

2
test/libsolidity/AnalysisFramework.cpp
View File

@ -23,7 +23,7 @@
#include <test/Options.h>
#include <libsolidity/interface/CompilerStack.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libsolidity/ast/AST.h>

2
test/libsolidity/GasMeter.cpp
View File

@ -26,7 +26,7 @@
#include <libevmasm/PathGasMeter.h>
#include <libsolidity/ast/AST.h>
#include <libsolidity/interface/GasEstimator.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
using namespace std;
using namespace langutil;

4
test/libsolidity/SolidityExecutionFramework.h
View File

@ -28,7 +28,7 @@
#include <libsolidity/interface/CompilerStack.h>
#include <liblangutil/Exceptions.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
namespace dev
{
@ -73,7 +73,7 @@ public:
if (!m_compiler.compile())
{
auto scannerFromSourceName = [&](std::string const& _sourceName) -> langutil::Scanner const& { return m_compiler.scanner(_sourceName); };
SourceReferenceFormatter formatter(std::cerr, scannerFromSourceName);
langutil::SourceReferenceFormatter formatter(std::cerr, scannerFromSourceName);
for (auto const& error: m_compiler.errors())
formatter.printExceptionInformation(

2
test/libyul/Common.cpp
View File

@ -23,7 +23,7 @@
#include <test/Options.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libyul/optimiser/Disambiguator.h>
#include <libyul/AsmParser.h>

2
test/libyul/YulOptimizerTest.cpp
View File

@ -43,7 +43,7 @@
#include <libyul/AsmPrinter.h>
#include <libyul/AsmParser.h>
#include <libyul/AsmAnalysis.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/ErrorReporter.h>
#include <liblangutil/Scanner.h>

2
test/tools/yulopti.cpp
View File

@ -27,7 +27,7 @@
#include <libyul/AsmData.h>
#include <libyul/AsmParser.h>
#include <libyul/AsmPrinter.h>
#include <libsolidity/interface/SourceReferenceFormatter.h>
#include <liblangutil/SourceReferenceFormatter.h>
#include <libyul/optimiser/BlockFlattener.h>
#include <libyul/optimiser/Disambiguator.h>