changed dict in stamp constructor from reference to shared ptr (#1)

kostyafip · Григорьев Костя · nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit 53cc471dab82 · 2023-07-11T20:10:13.000+03:00
* changed dict in stamp constructor from reference to shared ptr

---------

Co-authored-by: Григорьев Костя &lt;kostyafip@mail.ru&gt;
Co-authored-by: nataraj-hates-MS-for-stealing-github &lt;48326335+nataraj-hates-MS-for-stealing-github@users.noreply.github.com&gt;
diff --git a/blobstamper/stamp_dict.cpp b/blobstamper/stamp_dict.cpp
@@ -22,19 +22,19 @@
 #include "stamp_dict.h"
 
 int
-StampDict::ChooseStampSize(DictBase & dict)
+StampDict::ChooseStampSize(std::shared_ptr<DictBase> dict)
 {
-    if (dict.size()<= UCHAR_MAX+1)
+    if (dict->size() <= UCHAR_MAX+1)
     {
         stamp_max_value = UCHAR_MAX;
         return 1;
     }
-    if (dict.size()<= USHRT_MAX+1)
+    if (dict->size() <= USHRT_MAX+1)
     {
         stamp_max_value = USHRT_MAX;
         return 2;
     }
-    if (dict.size()<= UINT_MAX+1)
+    if (dict->size() <= UINT_MAX+1)
     {
         stamp_max_value = UINT_MAX;
         return 4;
@@ -75,7 +75,7 @@ StampDict::ExtractStr(Blob &blob)
          printf("StampDict::ExtractStr: Something is really wrong\n"); // FIXME better to throw something here :-)
          exit(1);
     }
-    long long actual_index = ((double) index_oracle) / stamp_max_value * dict.size();
-    if ( actual_index == dict.size())  actual_index--; /* If we hit the boundary step inside a bit*/
-    return dict.get(actual_index);
+    long long actual_index = ((double) index_oracle) / stamp_max_value * dict->size();
+    if ( actual_index == dict->size())  actual_index--; /* If we hit the boundary step inside a bit*/
+    return dict->get(actual_index);
 }
diff --git a/blobstamper/stamp_dict.h b/blobstamper/stamp_dict.h
@@ -25,6 +25,7 @@
 #include "stamp.h"
 #include "stamp_arithm.h"
 #include "dict.h"
+#include <memory>
 
 class StampDict: public StampBaseStr
 {
@@ -34,13 +35,13 @@ class StampDict: public StampBaseStr
     StampArithm<unsigned int> stamp32;
     StampArithm<unsigned long long> stamp64;
     int stamp_size;
-    DictBase& dict;
+    std::shared_ptr<DictBase> dict;
     unsigned long long stamp_max_value;
 
-    int ChooseStampSize(DictBase & dict);
+    int ChooseStampSize(std::shared_ptr<DictBase> dict);
 
   public:
-    StampDict(DictBase & dict_arg) : dict{dict_arg},  stamp_size{ChooseStampSize(dict_arg)} {};
+    StampDict(std::shared_ptr<DictBase> dict_arg) : dict(dict_arg),  stamp_size(ChooseStampSize(dict_arg)) {};
     std::string ExtractStr(Blob &blob) override;
     int  minSize() override {return stamp_size;}
     int  maxSize() override {return stamp_size;}
diff --git a/examples/exampleZZ.cpp b/examples/exampleZZ.cpp
@@ -54,7 +54,7 @@ char data[] =
 
   StampArithm<unsigned char> stampс;
 
-  DictLCAlphaSmall dict;
+  auto dict = std::make_shared<DictLCAlphaSmall>();
   StampDict stamp_dict(dict);
 
   StampLottery4Recursion<StampBaseStr> stamp_lot({stampс, stamp_dict});
diff --git a/t/120-stamp_dict.cpp b/t/120-stamp_dict.cpp
@@ -48,7 +48,7 @@ main()
 {
     TEST_START(4);
     { /* 1..4 */
-       DictTest dict;
+       auto dict = std::make_shared<DictTest>();
        StampDict stamp(dict);
        Blob blob((char *) sample, 4);
        std::string s;

Original file line number	Diff line number	Diff line change
`@@ -22,19 +22,19 @@`
`22`	`22`	`#include "stamp_dict.h"`
`23`	`23`
`24`	`24`	`int`
`25`		`-StampDict::ChooseStampSize(DictBase & dict)`
	`25`	`+StampDict::ChooseStampSize(std::shared_ptr<DictBase> dict)`
`26`	`26`	`{`
`27`		`- if (dict.size()<= UCHAR_MAX+1)`
	`27`	`+ if (dict->size() <= UCHAR_MAX+1)`
`28`	`28`	`{`
`29`	`29`	`stamp_max_value = UCHAR_MAX;`
`30`	`30`	`return 1;`
`31`	`31`	`}`
`32`		`- if (dict.size()<= USHRT_MAX+1)`
	`32`	`+ if (dict->size() <= USHRT_MAX+1)`
`33`	`33`	`{`
`34`	`34`	`stamp_max_value = USHRT_MAX;`
`35`	`35`	`return 2;`
`36`	`36`	`}`
`37`		`- if (dict.size()<= UINT_MAX+1)`
	`37`	`+ if (dict->size() <= UINT_MAX+1)`
`38`	`38`	`{`
`39`	`39`	`stamp_max_value = UINT_MAX;`
`40`	`40`	`return 4;`
`@@ -75,7 +75,7 @@ StampDict::ExtractStr(Blob &blob)`
`75`	`75`	`printf("StampDict::ExtractStr: Something is really wrong\n"); // FIXME better to throw something here :-)`
`76`	`76`	`exit(1);`
`77`	`77`	`}`
`78`		`- long long actual_index = ((double) index_oracle) / stamp_max_value * dict.size();`
`79`		`- if ( actual_index == dict.size()) actual_index--; /* If we hit the boundary step inside a bit*/`
`80`		`- return dict.get(actual_index);`
	`78`	`+ long long actual_index = ((double) index_oracle) / stamp_max_value * dict->size();`
	`79`	`+ if ( actual_index == dict->size()) actual_index--; /* If we hit the boundary step inside a bit*/`
	`80`	`+ return dict->get(actual_index);`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ main()`
`48`	`48`	`{`
`49`	`49`	`TEST_START(4);`
`50`	`50`	`{ /* 1..4 */`
`51`		`- DictTest dict;`
	`51`	`+ auto dict = std::make_shared<DictTest>();`
`52`	`52`	`StampDict stamp(dict);`
`53`	`53`	`Blob blob((char *) sample, 4);`
`54`	`54`	`std::string s;`