From af18b8afc2cec97c76a46e32e18be0d747b02610 Mon Sep 17 00:00:00 2001
From: Christian Parpart <christian@parpart.family>
Date: Tue, 3 Aug 2021 15:20:00 +0200
Subject: [PATCH] Eliminate some unnecessary header inclusions in headers in
 Scanner.h and SourceReferenceFormatter.h

---
 liblangutil/Scanner.h                    |  2 --
 liblangutil/SourceReferenceFormatter.cpp | 10 ++++++++++
 liblangutil/SourceReferenceFormatter.h   | 12 ++++--------
 libyul/AsmParser.h                       |  1 +
 test/libyul/YulOptimizerTest.cpp         |  1 +
 tools/yulPhaser/Phaser.cpp               |  1 +
 6 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/liblangutil/Scanner.h b/liblangutil/Scanner.h
index ef12703ef..347c75779 100644
--- a/liblangutil/Scanner.h
+++ b/liblangutil/Scanner.h
@@ -55,8 +55,6 @@
 #include <liblangutil/Token.h>
 #include <liblangutil/CharStream.h>
 #include <liblangutil/SourceLocation.h>
-#include <libsolutil/Common.h>
-#include <libsolutil/CommonData.h>
 
 #include <optional>
 #include <iosfwd>
diff --git a/liblangutil/SourceReferenceFormatter.cpp b/liblangutil/SourceReferenceFormatter.cpp
index 2a0799036..20d0f3306 100644
--- a/liblangutil/SourceReferenceFormatter.cpp
+++ b/liblangutil/SourceReferenceFormatter.cpp
@@ -21,6 +21,8 @@
 
 #include <liblangutil/SourceReferenceFormatter.h>
 #include <liblangutil/Exceptions.h>
+#include <liblangutil/CharStream.h>
+#include <liblangutil/CharStreamProvider.h>
 #include <libsolutil/UTF8.h>
 #include <iomanip>
 #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
 {
 	return AnsiColorized(m_stream, m_colored, {WHITE});
diff --git a/liblangutil/SourceReferenceFormatter.h b/liblangutil/SourceReferenceFormatter.h
index 630f00de5..fc1f418a2 100644
--- a/liblangutil/SourceReferenceFormatter.h
+++ b/liblangutil/SourceReferenceFormatter.h
@@ -23,7 +23,6 @@
 
 #include <liblangutil/Exceptions.h>
 #include <liblangutil/SourceReferenceExtractor.h>
-#include <liblangutil/CharStreamProvider.h>
 
 #include <libsolutil/AnsiColorized.h>
 
@@ -33,6 +32,9 @@
 
 namespace solidity::langutil
 {
+
+class CharStream;
+class CharStreamProvider;
 struct SourceLocation;
 
 class SourceReferenceFormatter
@@ -80,13 +82,7 @@ public:
 		);
 	}
 
-	static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream)
-	{
-		return formatErrorInformation(
-			_error,
-			SingletonCharStreamProvider(_charStream)
-		);
-	}
+	static std::string formatErrorInformation(Error const& _error, CharStream const& _charStream);
 
 private:
 	util::AnsiColorized normalColored() const;
diff --git a/libyul/AsmParser.h b/libyul/AsmParser.h
index cfde8bec4..3f1f30963 100644
--- a/libyul/AsmParser.h
+++ b/libyul/AsmParser.h
@@ -31,6 +31,7 @@
 #include <liblangutil/Scanner.h>
 #include <liblangutil/ParserBase.h>
 
+#include <map>
 #include <memory>
 #include <variant>
 #include <vector>
diff --git a/test/libyul/YulOptimizerTest.cpp b/test/libyul/YulOptimizerTest.cpp
index 3454f09ac..ada942152 100644
--- a/test/libyul/YulOptimizerTest.cpp
+++ b/test/libyul/YulOptimizerTest.cpp
@@ -27,6 +27,7 @@
 #include <libyul/optimiser/ReasoningBasedSimplifier.h>
 #include <libyul/AsmPrinter.h>
 
+#include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 #include <liblangutil/Scanner.h>
 
diff --git a/tools/yulPhaser/Phaser.cpp b/tools/yulPhaser/Phaser.cpp
index db7d79c31..30d3b8876 100644
--- a/tools/yulPhaser/Phaser.cpp
+++ b/tools/yulPhaser/Phaser.cpp
@@ -27,6 +27,7 @@
 #include <tools/yulPhaser/SimulationRNG.h>
 
 #include <liblangutil/CharStream.h>
+#include <liblangutil/CharStreamProvider.h>
 #include <liblangutil/SourceReferenceFormatter.h>
 #include <liblangutil/Scanner.h>