Redesign WsjcppDiffTextRow

Author: sea5kg

src.wsjcpp/CMakeLists.txt

@@ -1,7 +1,7 @@
 # Automaticly generated by [email protected]
 cmake_minimum_required(VERSION 3.0)
 
-add_definitions(-DWSJCPP_VERSION="v0.1.0")
+add_definitions(-DWSJCPP_VERSION="v0.1.2")
 add_definitions(-DWSJCPP_NAME="wsjcpp-diff-text")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

src/main.cpp

@@ -41,9 +41,8 @@ int main(int argc, const char* argv[]) {
     WsjcppDiffText::compare(sFileContent1, sFileContent2, vResult);
     for (int i = 0; i < vResult.size(); i++) {
         std::cout << 
-            vResult[i]->key << " => line (" << vResult[i]->getNumberOfLine() << "): " 
-            << vResult[i]->line << std::endl;
-        
+            vResult[i]->getKey() << " => line (" << vResult[i]->getNumberOfLine() << "): " 
+            << vResult[i]->getLine() << std::endl;
     }
     return 0;
 }

src/wsjcpp_diff_text.cpp

@@ -5,10 +5,14 @@
 // ---------------------------------------------------------------------
 // WsjcppDiffTextRow
 
-WsjcppDiffTextRow::WsjcppDiffTextRow(int nNumberOfLine, std::string key, std::string line) {
+WsjcppDiffTextRow::WsjcppDiffTextRow(
+    int nNumberOfLine,
+    const std::string &sKey,
+    const std::string &sLine
+) {
     m_nNumberOfLine = nNumberOfLine;
-    this->key = key; 
-    this->line = line;
+    m_sKey = sKey; 
+    m_sLine = sLine;
 }
 
 // ---------------------------------------------------------------------
@@ -17,6 +21,18 @@ int WsjcppDiffTextRow::getNumberOfLine() {
     return m_nNumberOfLine;
 }
 
+// ---------------------------------------------------------------------
+
+std::string WsjcppDiffTextRow::getKey() {
+    return m_sKey;
+}
+
+// ---------------------------------------------------------------------
+
+std::string WsjcppDiffTextRow::getLine() {
+    return m_sLine;
+}
+
 // ---------------------------------------------------------------------
 // WsjcppDiffText
 
@@ -99,10 +115,10 @@ void WsjcppDiffText::merge(
     for (unsigned int i=0;i<arr2.size();++i) {
         for (unsigned int j=0;j<arr1.size();++j) {
             //delete of matches and 'del'/'add' overlays from the first vector
-            bool bLinesEqual = arr2.at(i)->line==arr1.at(j)->line;
-            bool bKeysEqual = arr2.at(i)->key==arr1.at(j)->line;
-            std::string sKey1 = arr1.at(j)->key;
-            std::string sKey2 = arr2.at(i)->key;
+            bool bLinesEqual = arr2.at(i)->getLine() == arr1.at(j)->getLine();
+            bool bKeysEqual = arr2.at(i)->getKey() == arr1.at(j)->getLine(); // TODO why comparing key and line ???
+            std::string sKey1 = arr1.at(j)->getKey();
+            std::string sKey2 = arr2.at(i)->getKey();
             if ((bLinesEqual && (sKey1 == sKey2 || sKey1 == "!add"))
                     || (bKeysEqual && (sKey1 == "!del")))
             {
@@ -111,12 +127,12 @@ void WsjcppDiffText::merge(
             }
         }
     }
-    for (unsigned int i=0;i<arr1.size();++i) {
-        for (unsigned int j=0;j<arr2.size();++j) {
+    for (unsigned int i = 0; i < arr1.size(); ++i) {
+        for (unsigned int j = 0; j < arr2.size(); ++j) {
             //delete of del overlays from the second vector and update of priority
-            bool bLinesEqual = arr1.at(i)->key==arr2.at(j)->line;
-            bool bKeysEqual = arr1.at(i)->key==arr2.at(j)->key;
-            std::string sKey = arr2.at(j)->key;
+            bool bLinesEqual = arr1.at(i)->getKey() == arr2.at(j)->getLine(); // TODO check why comparing key and line here ?
+            bool bKeysEqual = arr1.at(i)->getKey() == arr2.at(j)->getKey();
+            std::string sKey = arr2.at(j)->getKey();
             if ((bLinesEqual && (sKey == "!del"))
                     || (bKeysEqual && (sKey != "!add") && (sKey != "!del")))
             {

src/wsjcpp_diff_text.h

@@ -9,15 +9,17 @@ class WsjcppDiffTextRow {
     public:
         WsjcppDiffTextRow(
             int nNumberOfLine, 
-            std::string key, 
-            std::string line
+            const std::string &sKey,
+            const std::string &sLine
         );
         int getNumberOfLine();
+        std::string getKey();
+        std::string getLine();
 
-        std::string key;
-        std::string line;
     private:
         int m_nNumberOfLine;
+        std::string m_sKey;
+        std::string m_sLine;
 };
 
 class WsjcppDiffText {

unit-tests.wsjcpp/CMakeLists.txt

@@ -2,7 +2,7 @@
 cmake_minimum_required(VERSION 3.0)
 
 project(unit-tests C CXX)
-add_definitions(-DWSJCPP_VERSION="ut-v0.1.0")
+add_definitions(-DWSJCPP_VERSION="ut-v0.1.2")
 add_definitions(-DWSJCPP_NAME="unit-tests-wsjcpp-diff-text")
 
 if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
@@ -27,7 +27,7 @@ list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.cpp")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests.h")
 list (APPEND WSJCPP_SOURCES "../src.wsjcpp/wsjcpp_core/wsjcpp_unit_tests_main.cpp")
 
-# wsjcpp-diff-text:v0.1.0
+# wsjcpp-diff-text:v0.1.2
 list (APPEND WSJCPP_INCLUDE_DIRS "../src")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_diff_text.cpp")
 list (APPEND WSJCPP_SOURCES "../src/wsjcpp_diff_text.h")

unit-tests.wsjcpp/src/unit_test_basic.cpp

@@ -168,10 +168,10 @@ bool UnitTestBasic::run() {
     for (int i = 0; i < 8; ++i) {
         int id1 = arr1.at(i)->getNumberOfLine();
         int id2 = arr3.at(i)->getNumberOfLine();
-        std::string key1 = arr1.at(i)->key;
-        std::string key2 = arr3.at(i)->key;
-        std::string line1 = arr1.at(i)->line;
-        std::string line2 = arr3.at(i)->line;
+        std::string key1 = arr1.at(i)->getKey();
+        std::string key2 = arr3.at(i)->getKey();
+        std::string line1 = arr1.at(i)->getLine();
+        std::string line2 = arr3.at(i)->getLine();
         if (id1==id2 && key1==key2 && line1==line2) {
             Success+=1;
         } else {

wsjcpp.yml

@@ -1,5 +1,5 @@
 name: "wsjcpp-diff-text"
-version: "v0.1.0"
+version: "v0.1.2"
 cmake_minimum_required: "3.0"
 cmake_cxx_standard: "11"
 description: "Diff texts"