More header includes towards each file being self-contained (#4794)

hzeller · web-flow · commit 5435f14134eb · 2025-03-09T17:12:19.000-07:00
* Include `&lt;sstream&gt;` in files using `std::stringstream`

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;

* Include `&lt;exception&gt;` in files using exceptions

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;

* Include `&lt;unordered_map&gt;` in files using `std::unordered_map`

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;

* Include `&lt;unordered_set&gt;` in files using `std::unordered_set`

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;

* Include `&lt;memory&gt;` in files using `std::addressof`

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;

* Include `&lt;string_view&gt;` in files using `std::string_view`

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;

---------

Signed-off-by: Henner Zeller &lt;h.zeller@acm.org&gt;
diff --git a/runtime/Cpp/runtime/src/ANTLRErrorListener.h b/runtime/Cpp/runtime/src/ANTLRErrorListener.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
diff --git a/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h b/runtime/Cpp/runtime/src/ANTLRErrorStrategy.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include "antlr4-common.h"
 #include "Token.h"
 
diff --git a/runtime/Cpp/runtime/src/ANTLRInputStream.cpp b/runtime/Cpp/runtime/src/ANTLRInputStream.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <string_view>
 #include <cassert>
 #include <utility>
 #include <string>
diff --git a/runtime/Cpp/runtime/src/BailErrorStrategy.cpp b/runtime/Cpp/runtime/src/BailErrorStrategy.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include "Exceptions.h"
 #include "Token.h"
 #include "ParserRuleContext.h"
diff --git a/runtime/Cpp/runtime/src/BailErrorStrategy.h b/runtime/Cpp/runtime/src/BailErrorStrategy.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include "antlr4-common.h"
 #include "Token.h"
 #include "DefaultErrorStrategy.h"
diff --git a/runtime/Cpp/runtime/src/BaseErrorListener.cpp b/runtime/Cpp/runtime/src/BaseErrorListener.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "BaseErrorListener.h"
diff --git a/runtime/Cpp/runtime/src/BaseErrorListener.h b/runtime/Cpp/runtime/src/BaseErrorListener.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
diff --git a/runtime/Cpp/runtime/src/BufferedTokenStream.cpp b/runtime/Cpp/runtime/src/BufferedTokenStream.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <memory>
 #include <string>
 #include <utility>
diff --git a/runtime/Cpp/runtime/src/CommonToken.cpp b/runtime/Cpp/runtime/src/CommonToken.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <utility>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp b/runtime/Cpp/runtime/src/ConsoleErrorListener.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "Token.h"
diff --git a/runtime/Cpp/runtime/src/ConsoleErrorListener.h b/runtime/Cpp/runtime/src/ConsoleErrorListener.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "antlr4-common.h"
diff --git a/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp b/runtime/Cpp/runtime/src/DefaultErrorStrategy.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "NoViableAltException.h"
diff --git a/runtime/Cpp/runtime/src/DefaultErrorStrategy.h b/runtime/Cpp/runtime/src/DefaultErrorStrategy.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <memory>
 #include <vector>
 #include <string>
diff --git a/runtime/Cpp/runtime/src/Exceptions.cpp b/runtime/Cpp/runtime/src/Exceptions.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include <string>
 #include "Exceptions.h"
 
diff --git a/runtime/Cpp/runtime/src/Exceptions.h b/runtime/Cpp/runtime/src/Exceptions.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <string>
 #include "antlr4-common.h"
 
diff --git a/runtime/Cpp/runtime/src/Lexer.cpp b/runtime/Cpp/runtime/src/Lexer.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <memory>
 #include <utility>
 #include <vector>
diff --git a/runtime/Cpp/runtime/src/Parser.h b/runtime/Cpp/runtime/src/Parser.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <vector>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/ParserRuleContext.h b/runtime/Cpp/runtime/src/ParserRuleContext.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <vector>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/ProxyErrorListener.cpp b/runtime/Cpp/runtime/src/ProxyErrorListener.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "Token.h"
diff --git a/runtime/Cpp/runtime/src/ProxyErrorListener.h b/runtime/Cpp/runtime/src/ProxyErrorListener.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <exception>
 #include <string>
 #include <cstddef>
 #include "ANTLRErrorListener.h"
diff --git a/runtime/Cpp/runtime/src/Recognizer.cpp b/runtime/Cpp/runtime/src/Recognizer.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <string_view>
 #include <map>
 #include <vector>
 #include <string>
diff --git a/runtime/Cpp/runtime/src/Recognizer.h b/runtime/Cpp/runtime/src/Recognizer.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <string_view>
 #include <limits>
 #include <map>
 #include <vector>
diff --git a/runtime/Cpp/runtime/src/RuleContext.cpp b/runtime/Cpp/runtime/src/RuleContext.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <vector>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/TokenStreamRewriter.cpp b/runtime/Cpp/runtime/src/TokenStreamRewriter.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <unordered_map>
 #include <vector>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/TokenStreamRewriter.h b/runtime/Cpp/runtime/src/TokenStreamRewriter.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <unordered_map>
 #include <map>
 #include <vector>
 #include <string>
diff --git a/runtime/Cpp/runtime/src/UnbufferedCharStream.cpp b/runtime/Cpp/runtime/src/UnbufferedCharStream.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <exception>
 #include <string>
 #include <utility>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/UnbufferedTokenStream.cpp b/runtime/Cpp/runtime/src/UnbufferedTokenStream.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <memory>
 #include <utility>
 #include <string>
diff --git a/runtime/Cpp/runtime/src/Vocabulary.cpp b/runtime/Cpp/runtime/src/Vocabulary.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <string_view>
 #include <utility>
 #include <vector>
 #include <string>
diff --git a/runtime/Cpp/runtime/src/Vocabulary.h b/runtime/Cpp/runtime/src/Vocabulary.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <string_view>
 #include <vector>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/atn/ATN.cpp b/runtime/Cpp/runtime/src/atn/ATN.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <cstddef>
 #include "atn/LL1Analyzer.h"
 #include "atn/ATNState.h"
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfig.cpp b/runtime/Cpp/runtime/src/atn/ATNConfig.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <utility>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfig.h b/runtime/Cpp/runtime/src/atn/ATNConfig.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <unordered_set>
 #include <vector>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp b/runtime/Cpp/runtime/src/atn/ATNConfigSet.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <cassert>
 #include <utility>
 #include <vector>
diff --git a/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp b/runtime/Cpp/runtime/src/atn/ATNDeserializer.cpp
@@ -54,6 +54,7 @@
 
 #include "atn/ATNDeserializer.h"
 
+#include <string_view>
 #include <memory>
 #include <utility>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.cpp b/runtime/Cpp/runtime/src/atn/ArrayPredictionContext.cpp
@@ -5,6 +5,8 @@
 
 #include "atn/ArrayPredictionContext.h"
 
+#include <memory>
+#include <sstream>
 #include <cassert>
 #include <utility>
 #include <vector>
diff --git a/runtime/Cpp/runtime/src/atn/DecisionInfo.cpp b/runtime/Cpp/runtime/src/atn/DecisionInfo.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <sstream>
 #include <string>
 #include <cstddef>
 #include "atn/ErrorInfo.h"
diff --git a/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp b/runtime/Cpp/runtime/src/atn/LL1Analyzer.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <unordered_set>
 #include <vector>
 #include <cstddef>
 #include "atn/RuleStopState.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerChannelAction.cpp b/runtime/Cpp/runtime/src/atn/LexerChannelAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerCustomAction.cpp b/runtime/Cpp/runtime/src/atn/LexerCustomAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.cpp b/runtime/Cpp/runtime/src/atn/LexerIndexedCustomAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <utility>
 #include <string>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/atn/LexerModeAction.cpp b/runtime/Cpp/runtime/src/atn/LexerModeAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerMoreAction.cpp b/runtime/Cpp/runtime/src/atn/LexerMoreAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerPopModeAction.cpp b/runtime/Cpp/runtime/src/atn/LexerPopModeAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerPushModeAction.cpp b/runtime/Cpp/runtime/src/atn/LexerPushModeAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerSkipAction.cpp b/runtime/Cpp/runtime/src/atn/LexerSkipAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/LexerTypeAction.cpp b/runtime/Cpp/runtime/src/atn/LexerTypeAction.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <memory>
 #include <string>
 #include <cstddef>
 #include "misc/MurmurHash.h"
diff --git a/runtime/Cpp/runtime/src/atn/PredictionContext.cpp b/runtime/Cpp/runtime/src/atn/PredictionContext.cpp
@@ -3,6 +3,9 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <unordered_set>
+#include <unordered_map>
+#include <sstream>
 #include <cassert>
 #include <limits>
 #include <memory>
diff --git a/runtime/Cpp/runtime/src/atn/PredictionMode.cpp b/runtime/Cpp/runtime/src/atn/PredictionMode.cpp
@@ -3,6 +3,7 @@
  * can be found in the LICENSE.txt file in the project root.
  */
 
+#include <unordered_map>
 #include <memory>
 #include <vector>
 #include <cstddef>
diff --git a/runtime/Cpp/runtime/src/atn/PredictionMode.h b/runtime/Cpp/runtime/src/atn/PredictionMode.h
@@ -5,6 +5,7 @@
 
 #pragma once
 
+#include <unordered_map>
 #include <vector>
 #include <cstddef>
 #include "antlr4-common.h"
diff --git a/runtime/Cpp/runtime/src/atn/RuleTransition.cpp b/runtime/Cpp/runtime/src/atn/RuleTransition.cpp
diff --git a/runtime/Cpp/runtime/src/atn/Transition.cpp b/runtime/Cpp/runtime/src/atn/Transition.cpp
diff --git a/runtime/Cpp/runtime/src/dfa/DFA.h b/runtime/Cpp/runtime/src/dfa/DFA.h
diff --git a/runtime/Cpp/runtime/src/dfa/DFASerializer.cpp b/runtime/Cpp/runtime/src/dfa/DFASerializer.cpp
diff --git a/runtime/Cpp/runtime/src/dfa/DFAState.cpp b/runtime/Cpp/runtime/src/dfa/DFAState.cpp
diff --git a/runtime/Cpp/runtime/src/misc/InterpreterDataReader.cpp b/runtime/Cpp/runtime/src/misc/InterpreterDataReader.cpp
diff --git a/runtime/Cpp/runtime/src/misc/IntervalSet.cpp b/runtime/Cpp/runtime/src/misc/IntervalSet.cpp
diff --git a/runtime/Cpp/runtime/src/support/Arrays.cpp b/runtime/Cpp/runtime/src/support/Arrays.cpp
diff --git a/runtime/Cpp/runtime/src/support/BitSet.h b/runtime/Cpp/runtime/src/support/BitSet.h
diff --git a/runtime/Cpp/runtime/src/support/CPPUtils.cpp b/runtime/Cpp/runtime/src/support/CPPUtils.cpp
diff --git a/runtime/Cpp/runtime/src/support/CPPUtils.h b/runtime/Cpp/runtime/src/support/CPPUtils.h
diff --git a/runtime/Cpp/runtime/src/support/StringUtils.cpp b/runtime/Cpp/runtime/src/support/StringUtils.cpp
diff --git a/runtime/Cpp/runtime/src/support/StringUtils.h b/runtime/Cpp/runtime/src/support/StringUtils.h
diff --git a/runtime/Cpp/runtime/src/support/Utf8.cpp b/runtime/Cpp/runtime/src/support/Utf8.cpp
diff --git a/runtime/Cpp/runtime/src/tree/Trees.cpp b/runtime/Cpp/runtime/src/tree/Trees.cpp
diff --git a/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp b/runtime/Cpp/runtime/src/tree/pattern/ParseTreePatternMatcher.cpp
diff --git a/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp b/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.cpp
diff --git a/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h b/runtime/Cpp/runtime/src/tree/xpath/XPathLexerErrorListener.h
