Avoid include recursion

Author: flagarde

cpp-terminal/terminal.cpp

@@ -19,5 +19,3 @@ std::array<char, sizeof(Term::Terminal)> terminal_buffer;  //NOLINT(fuchsia-stat
 Term::Terminal& Term::terminal = reinterpret_cast<Term::Terminal&>(::terminal_buffer);  //NOLINT(cppcoreguidelines-pro-type-reinterpret-cast)
 
 std::string Term::terminal_title(const std::string& title) { return "\u001b]0;" + title + '\a'; }
-
-std::string Term::clear_buffer() { return "\u001b[3J"; }

cpp-terminal/terminal.hpp

@@ -22,7 +22,5 @@ extern Term::Terminal&           terminal;
 
 // change the title of the terminal, only supported by a few terminals
 std::string terminal_title(const std::string& title);
-// clear the screen and the scroll-back buffer
-std::string clear_buffer();
 
 }  // namespace Term

cpp-terminal/terminal_impl.cpp

@@ -15,7 +15,8 @@
 #include "cpp-terminal/private/file.hpp"
 #include "cpp-terminal/screen.hpp"
 #include "cpp-terminal/style.hpp"
-#include "cpp-terminal/terminal.hpp"  //FIXME avoid recursion
+
+std::string Term::Terminal::clear() const noexcept { return "\u001b[3J"; }
 
 Term::Options Term::Terminal::getOptions() const noexcept { return m_options; }
 
@@ -36,7 +37,7 @@ void Term::Terminal::clean()
   unsetFocusEvents();
   unsetMouseEvents();
   if(getOptions().has(Option::NoCursor)) { Term::Private::out.write(cursor_on()); }
-  if(getOptions().has(Option::ClearScreen)) { Term::Private::out.write(clear_buffer() + style(Style::Reset) + cursor_move(1, 1) + screen_load()); }
+  if(getOptions().has(Option::ClearScreen)) { Term::Private::out.write(clear() + style(Style::Reset) + cursor_move(1, 1) + screen_load()); }
   set_unset_utf8();
   store_and_restore();
 }
@@ -53,7 +54,7 @@ catch(...)
 
 void Term::Terminal::applyOptions() const
 {
-  if(getOptions().has(Option::ClearScreen)) { Term::Private::out.write(screen_save() + clear_buffer() + style(Style::Reset) + cursor_move(1, 1)); }
+  if(getOptions().has(Option::ClearScreen)) { Term::Private::out.write(screen_save() + clear() + style(Style::Reset) + cursor_move(1, 1)); }
   if(getOptions().has(Option::NoCursor)) { Term::Private::out.write(cursor_off()); }
   setMode();
 }

cpp-terminal/terminal_impl.hpp

@@ -14,6 +14,7 @@
 #include "cpp-terminal/terminal_initializer.hpp"
 
 #include <cstddef>
+#include <string>
 
 namespace Term
 {
@@ -34,6 +35,8 @@ class Terminal
     applyOptions();
   }
   Term::Options getOptions() const noexcept;
+  // clear the screen and the scroll-back buffer
+  std::string   clear() const noexcept;
 
 private:
   ///