[flang] Add operator<< for parser::CharBlock

Original-commit: flang-compiler/f18@439326d Reviewed-on: flang-compiler/f18#630 Tree-same-pre-rewrite: false
llvm · Aug 7, 2019 · 8067868 · 8067868
1 parent d1d63f3
commit 8067868
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/flang/lib/parser/char-block.h b/flang/lib/parser/char-block.h
@@ -21,6 +21,7 @@
 #include <algorithm>
 #include <cstddef>
 #include <cstring>
+#include <iosfwd>
 #include <string>
 #include <utility>
 
@@ -138,6 +139,11 @@ inline bool operator>=(const char *left, const CharBlock &right) {
 inline bool operator>(const char *left, const CharBlock &right) {
   return right < left;
 }
+
+inline std::ostream &operator<<(std::ostream &os, const CharBlock &x) {
+  return os << x.ToString();
+}
+
 }
 
 // Specializations to enable std::unordered_map<CharBlock, ...> &c.

diff --git a/flang/lib/parser/parse-tree.cc b/flang/lib/parser/parse-tree.cc
@@ -244,9 +244,7 @@ CharBlock Variable::GetSource() const {
 std::ostream &operator<<(std::ostream &os, const Name &x) {
   return os << x.ToString();
 }
-std::ostream &operator<<(std::ostream &os, const CharBlock &x) {
-  return os << x.ToString();
-}
+
 }
 
 template class std::unique_ptr<Fortran::evaluate::GenericExprWrapper>;
diff --git a/flang/lib/semantics/symbol.cc b/flang/lib/semantics/symbol.cc
@@ -20,10 +20,6 @@
 
 namespace Fortran::semantics {
 
-std::ostream &operator<<(std::ostream &os, const parser::CharBlock &name) {
-  return os << name.ToString();
-}
-
 template<typename T>
 static void DumpOptional(std::ostream &os, const char *label, const T &x) {
   if (x) {