Copy and move semantics have been disabled for scope types.

These types are only intended for scope-like usage (ctor-dtor pair matters), not the relocation of data.
Ericsson · Mar 7, 2024 · e77d2cd · e77d2cd
1 parent f9bddaa
commit e77d2cd
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/plugins/cpp/parser/src/clangastvisitor.h b/plugins/cpp/parser/src/clangastvisitor.h
@@ -144,6 +144,8 @@ class ClangASTVisitor : public clang::RecursiveASTVisitor<ClangASTVisitor>
 
   class TypeScope final
   {
+    DECLARE_SCOPED_TYPE(TypeScope)
+
   private:
     ClangASTVisitor* _visitor;
     model::CppRecordPtr _type;
@@ -170,6 +172,8 @@ class ClangASTVisitor : public clang::RecursiveASTVisitor<ClangASTVisitor>
 
   class EnumScope final
   {
+    DECLARE_SCOPED_TYPE(EnumScope)
+
   private:
     ClangASTVisitor* _visitor;
     model::CppEnumPtr _enum;
@@ -196,6 +200,8 @@ class ClangASTVisitor : public clang::RecursiveASTVisitor<ClangASTVisitor>
 
   class FunctionScope final
   {
+    DECLARE_SCOPED_TYPE(FunctionScope)
+
   private:
     ClangASTVisitor* _visitor;
     model::CppFunctionPtr _curFun;
@@ -321,6 +327,8 @@ class ClangASTVisitor : public clang::RecursiveASTVisitor<ClangASTVisitor>
 
   class CtxStmtScope final
   {
+    DECLARE_SCOPED_TYPE(CtxStmtScope)
+
   private:
     ClangASTVisitor* _visitor;
 

diff --git a/plugins/cpp/parser/src/nestedscope.h b/plugins/cpp/parser/src/nestedscope.h
@@ -3,6 +3,8 @@
 
 #include <clang/AST/Stmt.h>
 
+#include <util/scopedvalue.h>
+
 namespace cc
 {
 namespace parser
@@ -12,6 +14,8 @@ namespace parser
 
   class StatementStack final
   {
+    DECLARE_SCOPED_TYPE(StatementStack)
+
     friend class StatementScope;
 
   private:
@@ -26,6 +30,8 @@ namespace parser
 
   class StatementScope final
   {
+    DECLARE_SCOPED_TYPE(StatementScope)
+
     friend class StatementStack;
 
   private:

diff --git a/util/include/util/scopedvalue.h b/util/include/util/scopedvalue.h
@@ -3,6 +3,14 @@
 
 #include <memory>
 
+#define DECLARE_SCOPED_TYPE(type) \
+private: \
+  type(const type&) = delete; \
+  type(type&&) = delete; \
+  type& operator=(const type&) = delete; \
+  type& operator=(type&&) = delete; \
+
+
 namespace cc
 {
 namespace util
@@ -19,6 +27,8 @@ namespace util
   template<typename TValue>
   class ScopedValue final
   {
+    DECLARE_SCOPED_TYPE(ScopedValue)
+
   private:
     TValue& _storage;
     TValue _oldValue;