Change method names, so we can inherit Galleys from Stamp later

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit 2d3bd10e5eef · 2021-10-24T02:05:13.000+03:00
diff --git a/blobstamper/galley.cpp b/blobstamper/galley.cpp
@@ -49,7 +49,7 @@ GalleyVectorBase::minSize()
 
 
 std::vector<std::string>
-GalleyVectorStr::ExtractStr(Blob &blob)
+GalleyVectorStr::ExtractStrVector(Blob &blob)
 {
   std::vector<Blob> blobs = extract_internal(blob);
   std::vector<std::string> res(blobs.size());
@@ -62,7 +62,7 @@ GalleyVectorStr::ExtractStr(Blob &blob)
 }
 
 std::vector<std::vector<char>>
-GalleyVectorBin::ExtractBin(Blob &blob)
+GalleyVectorBin::ExtractBinVector(Blob &blob)
 {
   std::vector<Blob> blobs = extract_internal(blob);
   std::vector<std::vector<char>> res(blobs.size());
@@ -348,7 +348,7 @@ GalleySetBase::extract_internal(Blob &blob)
 }
 
 std::vector<std::string>
-GalleySetStr::ExtractStr(Blob &blob)
+GalleySetStr::ExtractStrSet(Blob &blob)
 {
     std::vector<std::string> res;
     std::vector<Blob> blobs = extract_internal(blob);
@@ -363,7 +363,7 @@ GalleySetStr::ExtractStr(Blob &blob)
 }
 
 std::vector<std::vector<char>>
-GalleySetBin::ExtractBin(Blob &blob)
+GalleySetBin::ExtractBinSet(Blob &blob)
 {
     std::vector<std::vector<char>> res;
     std::vector<Blob> blobs = extract_internal(blob);
diff --git a/blobstamper/galley.h b/blobstamper/galley.h
@@ -56,15 +56,15 @@ class GalleyVectorStr: public GalleyVectorBase
     StampBaseStr & s_stamp;
   public:
     GalleyVectorStr(StampBaseStr & stamp_arg): GalleyVectorBase(stamp_arg), s_stamp(stamp_arg)  {};
-    std::vector<std::string> ExtractStr(Blob &blob);
+    std::vector<std::string> ExtractStrVector(Blob &blob);
 };
 
 class GalleyVectorBin: public GalleyVectorBase
 {
     StampBaseBin & b_stamp;
   public:
     GalleyVectorBin(StampBaseBin & stamp_arg): GalleyVectorBase(stamp_arg), b_stamp(stamp_arg)  {};
-    std::vector<std::vector<char>> ExtractBin(Blob &blob);
+    std::vector<std::vector<char>> ExtractBinVector(Blob &blob);
 };
 
 
@@ -73,12 +73,12 @@ template<class T> class GalleyVectorV: public GalleyVectorBase
     StampBaseV<T>& v_stamp;
   public:
     GalleyVectorV(StampBaseV<T> & stamp_arg): GalleyVectorBase(stamp_arg), v_stamp(stamp_arg)  {};
-    std::vector<T> ExtractValues(Blob &blob);
+    std::vector<T> ExtractValuesVector(Blob &blob);
 };
 
 
 template<class T> std::vector<T>
-GalleyVectorV<T>::ExtractValues(Blob &blob)
+GalleyVectorV<T>::ExtractValuesVector(Blob &blob)
 {
   std::vector<Blob> blobs = extract_internal(blob);
   std::vector<T> res(blobs.size());
@@ -108,7 +108,7 @@ class GalleySetBin : public GalleySetBase
     std::vector<std::reference_wrapper<StampBaseBin>> b_stamps;
   public:
     GalleySetBin(std::vector<std::reference_wrapper<StampBaseBin>> arg) : GalleySetBase(cast_arg(arg)), b_stamps(arg) {};
-    std::vector<std::vector<char>> ExtractBin(Blob &blob);
+    std::vector<std::vector<char>> ExtractBinSet(Blob &blob);
 
     std::vector<std::reference_wrapper<StampBase>> cast_arg(std::vector<std::reference_wrapper<StampBaseBin>> in)
     {
@@ -127,7 +127,7 @@ class GalleySetStr : public GalleySetBase
     std::vector<std::reference_wrapper<StampBaseStr>> s_stamps;
   public:
     GalleySetStr(std::vector<std::reference_wrapper<StampBaseStr>> arg) : GalleySetBase(cast_arg(arg)), s_stamps(arg) {}; 
-    std::vector<std::string> ExtractStr(Blob &blob);
+    std::vector<std::string> ExtractStrSet(Blob &blob);
 
     std::vector<std::reference_wrapper<StampBase>> cast_arg(std::vector<std::reference_wrapper<StampBaseStr>> in)
     {
diff --git a/t/300-galley.cpp b/t/300-galley.cpp
@@ -47,7 +47,7 @@ main()
         StampTwoChars stamp;
         GalleyVectorStr galley(stamp);
         Blob blob(short_sample, strlen(short_sample));
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrVector(blob);
 
         is(res[0], expected1, "GalleyVector, fixed size string stamp: First element of shifted list is ok");
         is(res[1], expected2, "GalleyVector, fixed size string  stamp: Second element of shifted list is ok");
@@ -68,7 +68,7 @@ main()
         StampTwoCharsList stamp_charlist;
         GalleyVectorStr galley(stamp_charlist);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrVector(blob);
         std::string str;
 
         is(res[0], expected1, "GalleyVector, unlimited size string stamp: First element of shifted list is ok");
@@ -87,7 +87,7 @@ main()
         StampArithm<unsigned short int> stamp;
         GalleyVectorBin galley(stamp);
         Blob blob(short_sample, strlen(short_sample));
-        std::vector<std::vector<char>> res = galley.ExtractBin(blob);
+        std::vector<std::vector<char>> res = galley.ExtractBinVector(blob);
 
         std::vector<char> v;
         unsigned short int * data;
@@ -113,7 +113,7 @@ main()
         StampArithm<signed int> stamp;
         GalleyVectorV<signed int> galley(stamp);
         Blob blob((char*)sample, sizeof(sample));
-        std::vector<signed int> res = galley.ExtractValues(blob);
+        std::vector<signed int> res = galley.ExtractValuesVector(blob);
         ok(!memcmp((void*) &sample, (void *) &res[0], sizeof(sample)), "GalleyVectorV returns ok");
     }
 
@@ -133,7 +133,7 @@ main()
         StampSeveralChars stamp;
         GalleyVectorStr galley(stamp);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrVector(blob);
         std::string str;
 
         is(res[0], expected1, "GalleyVector, unlimited size string stamp: First element of shifted list is ok");
@@ -163,7 +163,7 @@ main()
 
         GalleySetStr galley(stamps);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrSet(blob);
         std::string str;
         str = res[0];
         is(str, expected1, "GalleySet, fixed size string stamps: First element of vector is ok");
@@ -196,7 +196,7 @@ main()
 
         GalleySetStr galley(stamps);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrSet(blob);
         std::string str;
 
         str = res[0];
@@ -230,7 +230,7 @@ main()
 
         GalleySetStr galley(stamps);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrSet(blob);
         std::string str;
 
         is(res[0], expected1, "GalleySet, unbounded size string stamp: First element of vector is ok");
@@ -275,7 +275,7 @@ main()
 
         GalleySetStr galley(stamps);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrSet(blob);
         std::string str;
 
         str = res[0];
@@ -326,7 +326,7 @@ main()
 
         GalleySetStr galley(stamps);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrSet(blob);
         std::string str;
 
         str = res[0];
@@ -374,7 +374,7 @@ main()
 
         GalleySetStr galley(stamps);
 
-        std::vector<std::string> res = galley.ExtractStr(blob);
+        std::vector<std::string> res = galley.ExtractStrSet(blob);
         std::string str;
 
         str = res[0];
@@ -424,7 +424,7 @@ main()
 
         GalleySetStr galley(stamps);
         try{
-          std::vector<std::string> res = galley.ExtractStr(blob);
+          std::vector<std::string> res = galley.ExtractStrSet(blob);
           ok(false, "GalleySet, not enough data");
         }
         catch (OutOfData)
diff --git a/t/test-chars-stamps.h b/t/test-chars-stamps.h
@@ -99,7 +99,7 @@ std::string
 StampTwoCharsList::ExtractStr(Blob &blob)
 {
     std::string res = "";
-    std::vector<std::string> list = galley.ExtractStr(blob);
+    std::vector<std::string> list = galley.ExtractStrVector(blob);
 
     for (std::string point : list)
     {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ GalleyVectorBase::minSize()`
`49`	`49`
`50`	`50`
`51`	`51`	`std::vector<std::string>`
`52`		`-GalleyVectorStr::ExtractStr(Blob &blob)`
	`52`	`+GalleyVectorStr::ExtractStrVector(Blob &blob)`
`53`	`53`	`{`
`54`	`54`	`std::vector<Blob> blobs = extract_internal(blob);`
`55`	`55`	`std::vector<std::string> res(blobs.size());`
`@@ -62,7 +62,7 @@ GalleyVectorStr::ExtractStr(Blob &blob)`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`std::vector<std::vector<char>>`
`65`		`-GalleyVectorBin::ExtractBin(Blob &blob)`
	`65`	`+GalleyVectorBin::ExtractBinVector(Blob &blob)`
`66`	`66`	`{`
`67`	`67`	`std::vector<Blob> blobs = extract_internal(blob);`
`68`	`68`	`std::vector<std::vector<char>> res(blobs.size());`
`@@ -348,7 +348,7 @@ GalleySetBase::extract_internal(Blob &blob)`
`348`	`348`	`}`
`349`	`349`
`350`	`350`	`std::vector<std::string>`
`351`		`-GalleySetStr::ExtractStr(Blob &blob)`
	`351`	`+GalleySetStr::ExtractStrSet(Blob &blob)`
`352`	`352`	`{`
`353`	`353`	`std::vector<std::string> res;`
`354`	`354`	`std::vector<Blob> blobs = extract_internal(blob);`
`@@ -363,7 +363,7 @@ GalleySetStr::ExtractStr(Blob &blob)`
`363`	`363`	`}`
`364`	`364`
`365`	`365`	`std::vector<std::vector<char>>`
`366`		`-GalleySetBin::ExtractBin(Blob &blob)`
	`366`	`+GalleySetBin::ExtractBinSet(Blob &blob)`
`367`	`367`	`{`
`368`	`368`	`std::vector<std::vector<char>> res;`
`369`	`369`	`std::vector<Blob> blobs = extract_internal(blob);`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ std::string`
`99`	`99`	`StampTwoCharsList::ExtractStr(Blob &blob)`
`100`	`100`	`{`
`101`	`101`	`std::string res = "";`
`102`		`- std::vector<std::string> list = galley.ExtractStr(blob);`
	`102`	`+ std::vector<std::string> list = galley.ExtractStrVector(blob);`
`103`	`103`
`104`	`104`	`for (std::string point : list)`
`105`	`105`	`{`