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

Eliminate some unnecessary header inclusions in headers in Scanner.h and SourceReferenceFormatter.h

Browse Source
This commit is contained in:
Christian Parpart 2021-08-03 15:20:00 +02:00
parent ac0c749a32
commit af18b8afc2
6 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
liblangutil/Scanner.h
View File

@ -55,8 +55,6 @@
#include <liblangutil/Token.h> #include <liblangutil/Token.h>
#include <liblangutil/CharStream.h> #include <liblangutil/CharStream.h>
#include <liblangutil/SourceLocation.h> #include <liblangutil/SourceLocation.h>
#include <libsolutil/Common.h>
#include <libsolutil/CommonData.h>
#include <optional> #include <optional>
#include <iosfwd> #include <iosfwd>

10
liblangutil/SourceReferenceFormatter.cpp
View File

@ -21,6 +21,8 @@
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
#include <liblangutil/CharStream.h>
#include <liblangutil/CharStreamProvider.h>
#include <libsolutil/UTF8.h> #include <libsolutil/UTF8.h>
#include <iomanip> #include <iomanip>
#include <string_view> #include <string_view>
@ -45,6 +47,14 @@ std::string replaceNonTabs(std::string_view _utf8Input, char _filler)
} }
std::string SourceReferenceFormatter::formatErrorInformation(Error const& _error, CharStream const& _charStream)
{
return formatErrorInformation(
_error,
SingletonCharStreamProvider(_charStream)
);
}
AnsiColorized SourceReferenceFormatter::normalColored() const AnsiColorized SourceReferenceFormatter::normalColored() const
{ {
return AnsiColorized(m_stream, m_colored, {WHITE}); return AnsiColorized(m_stream, m_colored, {WHITE});

12
liblangutil/SourceReferenceFormatter.h
View File

@ -23,7 +23,6 @@
#include <liblangutil/Exceptions.h> #include <liblangutil/Exceptions.h>
#include <liblangutil/SourceReferenceExtractor.h> #include <liblangutil/SourceReferenceExtractor.h>
#include <liblangutil/CharStreamProvider.h>
#include <libsolutil/AnsiColorized.h> #include <libsolutil/AnsiColorized.h>
@ -33,6 +32,9 @@
namespace solidity::langutil namespace solidity::langutil
{ {
class CharStream;
class CharStreamProvider;
struct SourceLocation; struct SourceLocation;
class SourceReferenceFormatter class SourceReferenceFormatter
@ -80,13 +82,7 @@ public:
); );
} }
static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream) static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream);
{
return formatErrorInformation(
_error,
SingletonCharStreamProvider(_charStream)
);
}
private: private:
util::AnsiColorized normalColored() const; util::AnsiColorized normalColored() const;

1
libyul/AsmParser.h
View File

@ -31,6 +31,7 @@
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>
#include <liblangutil/ParserBase.h> #include <liblangutil/ParserBase.h>
#include <map>
#include <memory> #include <memory>
#include <variant> #include <variant>
#include <vector> #include <vector>

1
test/libyul/YulOptimizerTest.cpp
View File

@ -27,6 +27,7 @@
#include <libyul/optimiser/ReasoningBasedSimplifier.h> #include <libyul/optimiser/ReasoningBasedSimplifier.h>
#include <libyul/AsmPrinter.h> #include <libyul/AsmPrinter.h>
#include <liblangutil/CharStreamProvider.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>

1
tools/yulPhaser/Phaser.cpp
View File

@ -27,6 +27,7 @@
#include <tools/yulPhaser/SimulationRNG.h> #include <tools/yulPhaser/SimulationRNG.h>
#include <liblangutil/CharStream.h> #include <liblangutil/CharStream.h>
#include <liblangutil/CharStreamProvider.h>
#include <liblangutil/SourceReferenceFormatter.h> #include <liblangutil/SourceReferenceFormatter.h>
#include <liblangutil/Scanner.h> #include <liblangutil/Scanner.h>