Mark classes non copyable

visuve · Apr 13, 2024 · d6da8fb · d6da8fb
1 parent 01308f8
commit d6da8fb
Show file tree

Hide file tree

Showing 13 changed files with 49 additions and 0 deletions.
diff --git a/PystykorvaLib/EncodingDetector.cpp b/PystykorvaLib/EncodingDetector.cpp
@@ -21,6 +21,8 @@ class EncodingDetectorImpl
 		}
 	}
 
+	NonCopyable(EncodingDetectorImpl);
+
 	bool DetectEncoding(std::string_view sample, Pystykorva::EncodingGuess& encoding)
 	{
 		ucsdet_setText(

diff --git a/PystykorvaLib/EncodingDetector.hpp b/PystykorvaLib/EncodingDetector.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "NonCopyable.hpp"
 #include "Pystykorva.hpp"
 
 class EncodingDetectorImpl;
@@ -17,6 +18,7 @@ class EncodingDetector
 public:
 	EncodingDetector();
 	~EncodingDetector();
+	NonCopyable(EncodingDetector);
 
 	bool DetectEncoding(std::string_view sample, Pystykorva::EncodingGuess& encoding);
 

diff --git a/PystykorvaLib/LineAnalyzer.cpp b/PystykorvaLib/LineAnalyzer.cpp
@@ -21,6 +21,8 @@ class LineAnalyzerImpl
 		}
 	}
 
+	NonCopyable(LineAnalyzerImpl);
+
 	std::vector<Pystykorva::Position> Boundaries(std::u16string_view sample)
 	{
 		std::vector<Pystykorva::Position> result;

diff --git a/PystykorvaLib/LineAnalyzer.hpp b/PystykorvaLib/LineAnalyzer.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "NonCopyable.hpp"
 #include "Pystykorva.hpp"
 
 class LineAnalyzerImpl;
@@ -17,6 +18,7 @@ class LineAnalyzer
 public:
 	LineAnalyzer();
 	~LineAnalyzer();
+	NonCopyable(LineAnalyzer);
 
 	std::vector<Pystykorva::Position> Boundaries(std::u16string_view sample);
 

diff --git a/PystykorvaLib/MemoryMappedFile.cpp b/PystykorvaLib/MemoryMappedFile.cpp
@@ -68,6 +68,8 @@ class MemoryMappedFileImpl
 		}
 	}
 
+	NonCopyable(MemoryMappedFileImpl);
+
 	std::string_view Data() const
 	{
 		return { reinterpret_cast<char*>(_view), _size };
@@ -120,6 +122,8 @@ class MemoryMappedFileImpl
 		}
 	}
 
+	NonCopyable(MemoryMappedFileImpl);
+
 	std::string_view Sample(size_t size)
 	{
 		return { reinterpret_cast<char*>(_view), std::min(_size, size) };

diff --git a/PystykorvaLib/MemoryMappedFile.hpp b/PystykorvaLib/MemoryMappedFile.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "NonCopyable.hpp"
 #include "Pystykorva.hpp"
 
 class MemoryMappedFileImpl;
@@ -11,6 +12,7 @@ class MemoryMappedFile : public Pystykorva::IFile
 public:
 	MemoryMappedFile(const std::filesystem::path&, uint64_t);
 	~MemoryMappedFile();
+	NonCopyable(MemoryMappedFile);
 
 	std::string_view Sample(size_t size = 0x400) const override;
 	std::string_view Data() const override;

diff --git a/PystykorvaLib/NonCopyable.hpp b/PystykorvaLib/NonCopyable.hpp
@@ -0,0 +1,23 @@
+#pragma once
+
+#define NonCopyConstructible(Class) \
+	Class(const Class &) = delete;
+
+#define NonMoveConstructible(Class) \
+	Class(Class&&) = delete;
+
+#define NonCopyAssignable(Class) \
+	Class& operator = (const Class&) = delete;
+
+#define NonMoveAssignable(Class) \
+	Class& operator = (Class&&) = delete;
+
+#define NonCopyable(Class) \
+	NonCopyConstructible(Class) \
+	NonMoveConstructible(Class) \
+	NonCopyAssignable(Class) \
+	NonMoveAssignable(Class)
+
+#define NonAssignable(Class) \
+	NonCopyAssignable(Class) \
+	NonMoveAssignable(Class)
diff --git a/PystykorvaLib/PystykorvaLib.vcxproj b/PystykorvaLib/PystykorvaLib.vcxproj
@@ -28,6 +28,7 @@
     <ClInclude Include="EncodingDetector.hpp" />
     <ClInclude Include="LineAnalyzer.hpp" />
     <ClInclude Include="MemoryMappedFile.hpp" />
+    <ClInclude Include="NonCopyable.hpp" />
     <ClInclude Include="TextProcessor.hpp" />
     <ClInclude Include="Pystykorva.hpp" />
     <ClInclude Include="PCH.hpp" />

diff --git a/PystykorvaLib/TextProcessor.hpp b/PystykorvaLib/TextProcessor.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "NonCopyable.hpp"
 #include "Pystykorva.hpp"
 #include "EncodingDetector.hpp"
 #include "UnicodeConverter.hpp"
@@ -11,6 +12,7 @@ class TextProcessor
 public:
 	TextProcessor(std::stop_token, const Pystykorva::Options&);
 	~TextProcessor();
+	NonCopyable(TextProcessor);
 
 	Pystykorva::Result ProcessFile(const std::filesystem::path&);
 	void FindAll(Pystykorva::IFile& file, std::vector<Pystykorva::Match>& matches, Pystykorva::EncodingGuess& encoding);

diff --git a/PystykorvaLib/TextSearcher.cpp b/PystykorvaLib/TextSearcher.cpp
@@ -47,6 +47,8 @@ class TextSearcherImpl
 		}
 	}
 
+	NonCopyable(TextSearcherImpl);
+
 	std::vector<Pystykorva::Position> FindIn(std::u16string_view sentence)
 	{
 		std::vector<Pystykorva::Position> result;

diff --git a/PystykorvaLib/TextSearcher.hpp b/PystykorvaLib/TextSearcher.hpp
@@ -1,5 +1,6 @@
 #pragma once
 
+#include "NonCopyable.hpp"
 #include "Pystykorva.hpp"
 
 struct SearchException : std::runtime_error
@@ -17,6 +18,7 @@ class TextSearcher
 public:
 	TextSearcher(std::u16string_view expression, Pystykorva::MatchMode mode);
 	~TextSearcher();
+	NonCopyable(TextSearcher);
 
 	std::vector<Pystykorva::Position> FindIn(std::u16string_view sentence);
 private:

diff --git a/PystykorvaLib/UnicodeConverter.cpp b/PystykorvaLib/UnicodeConverter.cpp
@@ -18,6 +18,8 @@ class UnicodeConverterImpl
 		}
 	}
 
+	NonCopyable(UnicodeConverterImpl);
+
 	uint8_t CharSize() const
 	{
 		int8_t minCharSize = ucnv_getMinCharSize(_converter);

diff --git a/PystykorvaLib/UnicodeConverter.hpp b/PystykorvaLib/UnicodeConverter.hpp
@@ -1,5 +1,7 @@
 #pragma once
 
+#include "NonCopyable.hpp"
+
 class UnicodeConverterImpl;
 
 struct ConversionException : std::runtime_error
@@ -15,6 +17,7 @@ class UnicodeConverter
 public:
 	UnicodeConverter(std::string_view encoding);
 	~UnicodeConverter();
+	NonCopyable(UnicodeConverter);
 
 	uint8_t CharSize() const;
 	void Convert(std::string_view sample, bool flush = true);
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ class EncodingDetectorImpl @@
     		}
     	}
+    	NonCopyable(EncodingDetectorImpl);
     	bool DetectEncoding(std::string_view sample, Pystykorva::EncodingGuess& encoding)
     	{
     		ucsdet_setText(
@@ Expand Down @@