make cppast objects mutable

Author: SatyaRanjanDas-tomtom

cppast/include/cppast/cpp_asm_block.h

@@ -37,7 +37,7 @@ class CppAsmBlock : public CppEntity
   }
 
 private:
-  const std::string asm_;
+  std::string asm_;
 };
 
 } // namespace cppast

cppast/include/cppast/cpp_attribute_specifier_sequence_container.h

@@ -13,7 +13,7 @@ namespace cppast {
 
 class CppExpression;
 
-using CppAttributeSpecifierSequence = std::vector<std::unique_ptr<const CppExpression>>;
+using CppAttributeSpecifierSequence = std::vector<std::unique_ptr<CppExpression>>;
 
 /**
  * @brief A mixin class to allow objects to have attribute specifier sequence
@@ -43,6 +43,22 @@ class CppAttributeSpecifierSequenceContainer
    */
   bool visit(const std::function<bool(const CppExpression& attributeSpecifier)>& callback) const;
 
+  /**
+   * @brief Visits all attribute specifiers.
+   *
+   * @param callback The callback that is invoked once for each attribute specifier.
+   */
+  void visitAll(const std::function<void(CppExpression& attributeSpecifier)>& callback);
+
+  /**
+   * @brief Similar to visitAll() but interuptible.
+   *
+   * @param callback If the \a callback returns false then the visit is interrupted.
+   * @return true If all attribute specifiers were visited without interruption.
+   * @return false If the visit was interrupted.
+   */
+  bool visit(const std::function<bool(CppExpression& attributeSpecifier)>& callback);
+
 private:
   CppAttributeSpecifierSequence attribSpecifierSequence_;
 };

cppast/include/cppast/cpp_compound.h

@@ -34,9 +34,9 @@ enum class CppCompoundType : std::uint8_t
 
 struct CppInheritanceInfo
 {
-  const std::string                  baseName;
-  const std::optional<CppAccessType> inhType;
-  const bool                         isVirtual {false};
+  std::string                  baseName;
+  std::optional<CppAccessType> inhType;
+  bool                         isVirtual {false};
 };
 
 /**
@@ -99,6 +99,16 @@ class CppCompound : public CppEntity, public CppTemplatableEntity
     });
   }
 
+  bool visitAll(const Visitor<CppEntity&>& callback);
+
+  template <typename _EntityClass>
+  bool visit(const Visitor<_EntityClass&>& callback)
+  {
+    return visitAll([&callback](CppEntity& entity) {
+      return (entity.entityType() != _EntityClass::EntityType()) || callback(static_cast<_EntityClass&>(entity));
+    });
+  }
+
   const std::string& name() const
   {
     return name_;

cppast/include/cppast/cpp_control_blocks.h

@@ -39,8 +39,8 @@ class CppControlBlockBase
   }
 
 private:
-  const std::unique_ptr<CppEntity> cond_;
-  const std::unique_ptr<CppEntity> body_;
+  std::unique_ptr<CppEntity> cond_;
+  std::unique_ptr<CppEntity> body_;
 };
 
 class CppIfBlock : public CppEntity, public CppControlBlockBase<CppEntityType::IF_BLOCK>
@@ -62,7 +62,7 @@ class CppIfBlock : public CppEntity, public CppControlBlockBase<CppEntityType::I
   }
 
 private:
-  const std::unique_ptr<CppEntity> else_;
+  std::unique_ptr<CppEntity> else_;
 };
 
 class CppWhileBlock : public CppEntity, public CppControlBlockBase<CppEntityType::WHILE_BLOCK>
@@ -85,8 +85,6 @@ class CppDoWhileBlock : public CppEntity, public CppControlBlockBase<CppEntityTy
   }
 };
 
-using CppExpressions = std::vector<std::unique_ptr<const CppExpression>>;
-
 class CppForBlock : public CppEntity
 {
 public:
@@ -97,8 +95,8 @@ class CppForBlock : public CppEntity
 
 public:
   CppForBlock(std::unique_ptr<CppEntity>           start,
-              std::unique_ptr<const CppExpression> stop,
-              std::unique_ptr<const CppExpression> step,
+              std::unique_ptr<CppExpression> stop,
+              std::unique_ptr<CppExpression> step,
               std::unique_ptr<CppEntity>           body)
     : CppEntity(EntityType())
     , start_(std::move(start))
@@ -129,10 +127,10 @@ class CppForBlock : public CppEntity
   }
 
 private:
-  const std::unique_ptr<CppEntity>           start_;
-  const std::unique_ptr<const CppExpression> stop_;
-  const std::unique_ptr<const CppExpression> step_;
-  const std::unique_ptr<CppEntity>           body_;
+  std::unique_ptr<CppEntity>           start_;
+  std::unique_ptr<CppExpression> stop_;
+  std::unique_ptr<CppExpression> step_;
+  std::unique_ptr<CppEntity>           body_;
 };
 
 class CppRangeForBlock : public CppEntity
@@ -169,9 +167,9 @@ class CppRangeForBlock : public CppEntity
   }
 
 private:
-  const std::unique_ptr<CppVar>        var_;
-  const std::unique_ptr<CppExpression> expr_;
-  const std::unique_ptr<CppEntity>     body_;
+  std::unique_ptr<CppVar>        var_;
+  std::unique_ptr<CppExpression> expr_;
+  std::unique_ptr<CppEntity>     body_;
 };
 
 class CppCase
@@ -227,8 +225,8 @@ class CppSwitchBlock : public CppEntity
   }
 
 private:
-  const std::unique_ptr<CppExpression> cond_;
-  const std::vector<CppCase>           body_;
+  std::unique_ptr<CppExpression> cond_;
+  std::vector<CppCase>           body_;
 };
 
 } // namespace cppast

cppast/include/cppast/cpp_documentation_comment.h

@@ -33,7 +33,7 @@ class CppDocumentationComment : public CppEntity
   }
 
 private:
-  const std::string doc_; ///< Entire comment text
+  std::string doc_; ///< Entire comment text
 };
 
 } // namespace cppast

cppast/include/cppast/cpp_enum.h

@@ -111,10 +111,10 @@ class CppEnum : public CppEntity
   }
 
 private:
-  const std::string            name_;     // Can be empty for anonymous enum.
-  const std::list<CppEnumItem> itemList_; // Can be nullptr for forward declared enum.
-  const bool                   isClass_;
-  const std::string            underlyingType_;
+  std::string            name_;     // Can be empty for anonymous enum.
+  std::list<CppEnumItem> itemList_; // Can be nullptr for forward declared enum.
+  bool                   isClass_;
+  std::string            underlyingType_;
 };
 
 } // namespace cppast

cppast/include/cppast/cpp_expression.h

@@ -173,7 +173,7 @@ class CppNameExpr : public CppAtomicExpr, public CppCommonAtomicExprImplBase<Cpp
 class CppVartypeExpr : public CppAtomicExpr, public CppAtomicExprImplBase<CppAtomicExprType::VARTYPE>
 {
 public:
-  CppVartypeExpr(std::unique_ptr<const CppVarType> atom)
+  CppVartypeExpr(std::unique_ptr<CppVarType> atom)
     : CppAtomicExpr(AtomicExprType())
     , atom_(std::move(atom))
   {
@@ -185,14 +185,14 @@ class CppVartypeExpr : public CppAtomicExpr, public CppAtomicExprImplBase<CppAto
   }
 
 private:
-  std::unique_ptr<const CppVarType> atom_;
+  std::unique_ptr<CppVarType> atom_;
 };
 
 // TODO: Eliminate CppLambda by merging to CppLambdaExpr.
 class CppLambdaExpr : public CppAtomicExpr, public CppAtomicExprImplBase<CppAtomicExprType::LAMBDA>
 {
 public:
-  CppLambdaExpr(std::unique_ptr<const CppLambda> lambda)
+  CppLambdaExpr(std::unique_ptr<CppLambda> lambda)
     : CppAtomicExpr(AtomicExprType())
     , lambda_(std::move(lambda))
   {
@@ -205,7 +205,7 @@ class CppLambdaExpr : public CppAtomicExpr, public CppAtomicExprImplBase<CppAtom
   }
 
 private:
-  const std::unique_ptr<const CppLambda> lambda_;
+  std::unique_ptr<CppLambda> lambda_;
 };
 
 class CppMonomialExpr : public CppExpression
@@ -236,8 +236,8 @@ class CppMonomialExpr : public CppExpression
   }
 
 private:
-  const CppUnaryOperator               oper_;
-  const std::unique_ptr<CppExpression> term_;
+  CppUnaryOperator               oper_;
+  std::unique_ptr<CppExpression> term_;
 };
 
 class CppBinomialExpr : public CppExpression
@@ -250,8 +250,8 @@ class CppBinomialExpr : public CppExpression
 
 public:
   CppBinomialExpr(CppBinaryOperator                    oper,
-                  std::unique_ptr<const CppExpression> term1,
-                  std::unique_ptr<const CppExpression> term2)
+                  std::unique_ptr<CppExpression> term1,
+                  std::unique_ptr<CppExpression> term2)
     : CppExpression(ExpressionType())
     , oper_(oper)
     , term1_(std::move(term1))
@@ -276,9 +276,9 @@ class CppBinomialExpr : public CppExpression
   }
 
 private:
-  const CppBinaryOperator                    oper_;
-  const std::unique_ptr<const CppExpression> term1_;
-  const std::unique_ptr<const CppExpression> term2_;
+  CppBinaryOperator                    oper_;
+  std::unique_ptr<CppExpression> term1_;
+  std::unique_ptr<CppExpression> term2_;
 };
 
 class CppTrinomialExpr : public CppExpression
@@ -324,10 +324,10 @@ class CppTrinomialExpr : public CppExpression
   }
 
 private:
-  const CppTernaryOperator             oper_;
-  const std::unique_ptr<CppExpression> term1_;
-  const std::unique_ptr<CppExpression> term2_;
-  const std::unique_ptr<CppExpression> term3_;
+  CppTernaryOperator             oper_;
+  std::unique_ptr<CppExpression> term1_;
+  std::unique_ptr<CppExpression> term2_;
+  std::unique_ptr<CppExpression> term3_;
 };
 
 class CppFunctionCallExpr : public CppExpression
@@ -339,7 +339,7 @@ class CppFunctionCallExpr : public CppExpression
   }
 
 public:
-  CppFunctionCallExpr(std::unique_ptr<const CppExpression> func, std::vector<std::unique_ptr<const CppExpression>> args)
+  CppFunctionCallExpr(std::unique_ptr<CppExpression> func, std::vector<std::unique_ptr<CppExpression>> args)
     : CppExpression(ExpressionType())
     , function_(std::move(func))
     , arguments_(std::move(args))
@@ -363,8 +363,8 @@ class CppFunctionCallExpr : public CppExpression
   }
 
 private:
-  const std::unique_ptr<const CppExpression>              function_;
-  const std::vector<std::unique_ptr<const CppExpression>> arguments_;
+  std::unique_ptr<CppExpression>              function_;
+  std::vector<std::unique_ptr<CppExpression>> arguments_;
 };
 
 class CppUniformInitializerExpr : public CppExpression
@@ -376,7 +376,7 @@ class CppUniformInitializerExpr : public CppExpression
   }
 
 public:
-  CppUniformInitializerExpr(std::string name, std::vector<std::unique_ptr<const CppExpression>> args)
+  CppUniformInitializerExpr(std::string name, std::vector<std::unique_ptr<CppExpression>> args)
     : CppExpression(ExpressionType())
     , name_(std::move(name))
     , arguments_(std::move(args))
@@ -400,8 +400,8 @@ class CppUniformInitializerExpr : public CppExpression
   }
 
 private:
-  const std::string                                       name_;
-  const std::vector<std::unique_ptr<const CppExpression>> arguments_;
+  std::string                                       name_;
+  std::vector<std::unique_ptr<CppExpression>> arguments_;
 };
 
 class CppInitializerListExpr : public CppExpression
@@ -413,7 +413,7 @@ class CppInitializerListExpr : public CppExpression
   }
 
 public:
-  CppInitializerListExpr(std::vector<std::unique_ptr<const CppExpression>> exprList)
+  CppInitializerListExpr(std::vector<std::unique_ptr<CppExpression>> exprList)
     : CppExpression(ExpressionType())
     , exprList_(std::move(exprList))
   {
@@ -431,7 +431,7 @@ class CppInitializerListExpr : public CppExpression
   }
 
 private:
-  const std::vector<std::unique_ptr<const CppExpression>> exprList_;
+  std::vector<std::unique_ptr<CppExpression>> exprList_;
 };
 
 class CppTypecastExpr : public CppExpression
@@ -461,8 +461,8 @@ class CppTypecastExpr : public CppExpression
 
 protected:
   CppTypecastExpr(CppTypecastType                      typecastType,
-                  std::unique_ptr<const CppVarType>    targetType,
-                  std::unique_ptr<const CppExpression> expr)
+                  std::unique_ptr<CppVarType>    targetType,
+                  std::unique_ptr<CppExpression> expr)
     : CppExpression(ExpressionType())
     , castType_(typecastType)
     , targetType_(std::move(targetType))
@@ -471,9 +471,9 @@ class CppTypecastExpr : public CppExpression
   }
 
 private:
-  const CppTypecastType                      castType_;
-  const std::unique_ptr<const CppVarType>    targetType_;
-  const std::unique_ptr<const CppExpression> expr_;
+  CppTypecastType                      castType_;
+  std::unique_ptr<CppVarType>    targetType_;
+  std::unique_ptr<CppExpression> expr_;
 };
 
 template <CppTypecastType _TypecastType>
@@ -491,7 +491,7 @@ class CppTypecastExprImplBase
 class CppCStyleTypecastExpr : public CppTypecastExpr, public CppTypecastExprImplBase<CppTypecastType::C_STYLE>
 {
 public:
-  CppCStyleTypecastExpr(std::unique_ptr<const CppVarType> targetType, std::unique_ptr<const CppExpression> expr)
+  CppCStyleTypecastExpr(std::unique_ptr<CppVarType> targetType, std::unique_ptr<CppExpression> expr)
     : CppTypecastExpr(TypecastType(), std::move(targetType), std::move(expr))
   {
   }
@@ -501,7 +501,7 @@ class CppFunctionStyleTypecastExpr : public CppTypecastExpr,
                                      public CppTypecastExprImplBase<CppTypecastType::FUNCTION_STYLE>
 {
 public:
-  CppFunctionStyleTypecastExpr(std::unique_ptr<const CppVarType> targetType, std::unique_ptr<const CppExpression> expr)
+  CppFunctionStyleTypecastExpr(std::unique_ptr<CppVarType> targetType, std::unique_ptr<CppExpression> expr)
     : CppTypecastExpr(TypecastType(), std::move(targetType), std::move(expr))
   {
   }
@@ -510,7 +510,7 @@ class CppFunctionStyleTypecastExpr : public CppTypecastExpr,
 class CppStaticCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase<CppTypecastType::STATIC>
 {
 public:
-  CppStaticCastExpr(std::unique_ptr<const CppVarType> targetType, std::unique_ptr<const CppExpression> expr)
+  CppStaticCastExpr(std::unique_ptr<CppVarType> targetType, std::unique_ptr<CppExpression> expr)
     : CppTypecastExpr(TypecastType(), std::move(targetType), std::move(expr))
   {
   }
@@ -519,7 +519,7 @@ class CppStaticCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase
 class CppConstCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase<CppTypecastType::CONST>
 {
 public:
-  CppConstCastExpr(std::unique_ptr<const CppVarType> targetType, std::unique_ptr<const CppExpression> expr)
+  CppConstCastExpr(std::unique_ptr<CppVarType> targetType, std::unique_ptr<CppExpression> expr)
     : CppTypecastExpr(TypecastType(), std::move(targetType), std::move(expr))
   {
   }
@@ -528,7 +528,7 @@ class CppConstCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase<
 class CppDynamiCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase<CppTypecastType::DYNAMIC>
 {
 public:
-  CppDynamiCastExpr(std::unique_ptr<const CppVarType> targetType, std::unique_ptr<const CppExpression> expr)
+  CppDynamiCastExpr(std::unique_ptr<CppVarType> targetType, std::unique_ptr<CppExpression> expr)
     : CppTypecastExpr(TypecastType(), std::move(targetType), std::move(expr))
   {
   }
@@ -537,7 +537,7 @@ class CppDynamiCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase
 class CppReinterpretCastExpr : public CppTypecastExpr, public CppTypecastExprImplBase<CppTypecastType::REINTERPRET>
 {
 public:
-  CppReinterpretCastExpr(std::unique_ptr<const CppVarType> targetType, std::unique_ptr<const CppExpression> expr)
+  CppReinterpretCastExpr(std::unique_ptr<CppVarType> targetType, std::unique_ptr<CppExpression> expr)
     : CppTypecastExpr(TypecastType(), std::move(targetType), std::move(expr))
   {
   }