Fix: DepthCounter assignment operator/copy constructor

bruderstein · bruderstein · commit 7950e04118ce · 2014-03-23T11:43:42.000+01:00
diff --git a/PythonScript.Tests/tests/TestDepthCounter.cpp b/PythonScript.Tests/tests/TestDepthCounter.cpp
@@ -72,4 +72,23 @@ TEST_F(DepthCounterTest, testMultipleDepth) {
     EXPECT_EQ(outsideBlock1, 0);
 }
 
+
+TEST_F(DepthCounterTest, testAssignment) {
+    DepthCounter depthCounter;
+    int insideBlock, outsideBlock;
+    
+	// As the DepthLevel is declared outside the block, we should have the same depth inside and outside the block.
+    
+	DepthLevel depthLevel;
+	{
+        depthLevel = depthCounter.increase();
+        insideBlock = depthCounter.getDepth();
+	}
+
+    outsideBlock = depthCounter.getDepth();
+
+    ASSERT_EQ(insideBlock, 1);
+    ASSERT_EQ(outsideBlock, 1);
+}
+
 }
diff --git a/PythonScript/src/DepthCounter.cpp b/PythonScript/src/DepthCounter.cpp
@@ -10,4 +10,22 @@ DepthLevel::~DepthLevel() {
 	}
 }
 
+DepthLevel& DepthLevel::operator=(const DepthLevel& rhs) {
+    m_depthCounter = rhs.m_depthCounter;
+    if (NULL != m_depthCounter) {
+        m_depthCounter->increaseAsCopy();
+	}
+    return *this;
+}
+
+
+DepthLevel::DepthLevel(const DepthLevel& copy)
+	: m_depthCounter(copy.m_depthCounter)
+{
+    // The copy will also decrement the counter when destroyed, so we need to increase the counter to compensate
+    if (m_depthCounter) {
+        m_depthCounter->increaseAsCopy();
+    }
+}
+
 }
diff --git a/PythonScript/src/DepthCounter.h b/PythonScript/src/DepthCounter.h
@@ -13,9 +13,14 @@ namespace NppPythonScript
 		{}
 		
         ~DepthLevel();
+        
+		DepthLevel& operator=(const DepthLevel& rhs);
+		DepthLevel(const DepthLevel& copy);
+		
 
 	private:
         DepthCounter* m_depthCounter;
+        
 
         DepthLevel(DepthCounter* depthCounter)
 			: m_depthCounter(depthCounter)
@@ -36,6 +41,10 @@ namespace NppPythonScript
 		int getDepth() { return m_depth; }
 
 	protected:
+        void increaseAsCopy() {
+            ++m_depth;
+		}
+
         void decrease() {
             --m_depth;
 		}
