Merge branch 'feature/language' of /media/delpino/Transcend/repos/pugs into feature/language

src/language/ASTPrinter.cpp

@@ -46,7 +46,7 @@ ASTPrinter::_print(std::ostream& os, const ASTNode& node) const
     if (node.m_node_processor) {
       os << ':';
       os << rang::fgB::magenta;
-      os << node.m_node_processor->describe();
+      os << node.m_node_processor->typeIdName();
       os << rang::fg::reset;
     }
   }

src/language/node_processor/ASTNodeListProcessor.hpp

@@ -3,19 +3,12 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class ASTNodeListProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/AffectationProcessor.hpp

@@ -5,8 +5,6 @@
 
 #include <SymbolTable.hpp>
 
-#include <Demangle.hpp>
-
 template <typename Op>
 struct AffOp;
 
@@ -71,12 +69,6 @@ class AffectationProcessor final : public INodeProcessor
   }()};
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/AffectationToStringProcessor.hpp

@@ -5,8 +5,6 @@
 
 #include <SymbolTable.hpp>
 
-#include <Demangle.hpp>
-
 template <typename OperatorT, typename DataT>
 class AffectationToStringProcessor final : public INodeProcessor
 {
@@ -15,12 +13,6 @@ class AffectationToStringProcessor final : public INodeProcessor
   ASTNodeDataVariant* p_value{nullptr};
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/BinaryExpressionProcessor.hpp

@@ -3,10 +3,6 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
-#include <type_traits>
-
 template <typename Op>
 struct BinOp;
 
@@ -197,12 +193,6 @@ class BinaryExpressionProcessor final : public INodeProcessor
   }()};
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/BreakProcessor.hpp

@@ -3,17 +3,9 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class BreakProcessor final : public INodeProcessor
 {
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/ConcatExpressionProcessor.hpp

@@ -3,13 +3,10 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
-#include <type_traits>
-
 template <typename B_DataT>
 class ConcatExpressionProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
   PUGS_INLINE auto
@@ -23,12 +20,6 @@ class ConcatExpressionProcessor final : public INodeProcessor
   }
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/ContinueProcessor.hpp

@@ -3,17 +3,9 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class ContinueProcessor final : public INodeProcessor
 {
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/DoWhileProcessor.hpp

@@ -3,19 +3,12 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class DoWhileProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/FakeProcessor.hpp

@@ -3,19 +3,9 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-#include <PugsMacros.hpp>
-
 class FakeProcessor final : public INodeProcessor
 {
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
-  PUGS_INLINE
   void
   execute(ExecUntilBreakOrContinue&)
   {

src/language/node_processor/ForProcessor.hpp

@@ -3,19 +3,12 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class ForProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/INodeProcessor.hpp

 #ifndef I_NODE_PROCESSOR_HPP
 #define I_NODE_PROCESSOR_HPP
 
+#include <Demangle.hpp>
 #include <node_processor/ExecUntilBreakOrContinue.hpp>
 
 #include <string>
+#include <typeinfo>
 
 struct INodeProcessor
 {
   virtual void execute(ExecUntilBreakOrContinue& exec_policy) = 0;
 
-  virtual std::string describe() const = 0;
+  std::string
+  typeIdName() const
+  {
+    return demangle(typeid(*this).name());
+  }
 
   INodeProcessor(const INodeProcessor&) = delete;
 

src/language/node_processor/IfProcessor.hpp

@@ -3,19 +3,12 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class IfProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/IncDecExpressionProcessor.hpp

@@ -5,8 +5,6 @@
 
 #include <SymbolTable.hpp>
 
-#include <Demangle.hpp>
-
 template <typename Op>
 struct IncDecOp;
 
@@ -57,16 +55,11 @@ struct IncDecOp<language::post_plusplus>
 template <typename IncDecOpT, typename DataT>
 class IncDecExpressionProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
   ASTNodeDataVariant* p_value{nullptr};
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue&)
   {

src/language/node_processor/NameProcessor.hpp

@@ -3,23 +3,16 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 #include <ASTNode.hpp>
 #include <SymbolTable.hpp>
 
 class NameProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
   ASTNodeDataVariant* p_value{nullptr};
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue&)
   {

src/language/node_processor/OStreamProcessor.hpp

@@ -3,20 +3,13 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class OStreamProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
   std::ostream& m_os;
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/UnaryExpressionProcessor.hpp

@@ -5,8 +5,6 @@
 
 #include <SymbolTable.hpp>
 
-#include <Demangle.hpp>
-
 template <typename Op>
 struct UnaryOp;
 
@@ -35,6 +33,7 @@ struct UnaryOp<language::unary_not>
 template <typename UnaryOpT, typename ValueT, typename DataT>
 class UnaryExpressionProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
   PUGS_INLINE ValueT
@@ -44,12 +43,6 @@ class UnaryExpressionProcessor final : public INodeProcessor
   }
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

src/language/node_processor/WhileProcessor.hpp

@@ -3,19 +3,12 @@
 
 #include <node_processor/INodeProcessor.hpp>
 
-#include <Demangle.hpp>
-
 class WhileProcessor final : public INodeProcessor
 {
+ private:
   ASTNode& m_node;
 
  public:
-  std::string
-  describe() const
-  {
-    return demangle<decltype(*this)>();
-  }
-
   void
   execute(ExecUntilBreakOrContinue& exec_policy)
   {

tests/test_ASTNodeListProcessor.cpp

@@ -46,5 +46,5 @@ true;
   REQUIRE(ast->children[1]->id == typeid(language::true_kw));
   REQUIRE(ast->children[2]->id == typeid(language::real));
 
-  REQUIRE(ast->m_node_processor->describe() == demangle<ASTNodeListProcessor>());
+  REQUIRE(ast->m_node_processor->typeIdName() == demangle<ASTNodeListProcessor>());
 }

tests/test_FakeProcessor.cpp

@@ -10,7 +10,7 @@ TEST_CASE("FakeProcessor", "[language]")
   rang::setControlMode(rang::control::Off);
 
   FakeProcessor fake_processor;
-  REQUIRE(fake_processor.describe() == demangle<FakeProcessor>());
+  REQUIRE(fake_processor.typeIdName() == demangle<FakeProcessor>());
 
   ExecUntilBreakOrContinue exec_policy;
   REQUIRE_NOTHROW(fake_processor.execute(exec_policy));