Move arithmetics types stamps to a single template. Will call this template StampArythm for now

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit 0e3218560c58 · 2021-07-10T15:19:24.000+03:00
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ endif
 BLOB_STAMPER_OBJ = blobstamper/blob.o \
 blobstamper/helpers.o \
 blobstamper/stamp.o \
-blobstamper/stamp_atomic.o \
+blobstamper/stamp_arithm.o \
 blobstamper/stamp_dict.o \
 blobstamper/galley.o \
 blobstamper/dict.o \
diff --git a/blobstamper/Makefile b/blobstamper/Makefile
@@ -2,7 +2,7 @@
 ALL_OBJS = blob.o \
 helpers.o \
 stamp.o \
-stamp_atomic.o \
+stamp_arithm.o \
 stamp_dict.o \
 galley.o \
 dict.o \
diff --git a/blobstamper/blobstamper.h b/blobstamper/blobstamper.h
@@ -1,7 +1,7 @@
 
 #include "blob.h"
 #include "stamp.h"
-#include "stamp_atomic.h"
+#include "stamp_arithm.h"
 #include "stamp_dict.h"
 #include "dict.h"
 #include "galley.h"
diff --git a/blobstamper/galley.cpp b/blobstamper/galley.cpp
@@ -5,7 +5,7 @@
 
 #include "blob.h"
 #include "stamp.h"
-#include "stamp_atomic.h"
+#include "stamp_arithm.h"
 #include "galley.h"
 
 
diff --git a/blobstamper/galley.h b/blobstamper/galley.h
@@ -7,9 +7,8 @@
 #include <vector>
 #include <functional> // for std::reference_wrapper
 
-
-#define ORACLE_STAMP StampBinInt16
 #define ORACLE_TYPE unsigned short int
+#define ORACLE_STAMP StampArithm<ORACLE_TYPE>
 #define ORACLE_SIZE sizeof(ORACLE_TYPE)
 #define ORACLE_MAX USHRT_MAX
 
diff --git a/blobstamper/helpers.h b/blobstamper/helpers.h
@@ -1,3 +1,5 @@
+#ifndef HELPERS_H
+#define HELPERS_H
 
 void hexdump(void *pAddressIn, long  lSize);
 
@@ -74,3 +76,4 @@ max precision
 					   "%.999g", __val);
   }
 
+#endif  /*HELPERS_H*/
diff --git a/blobstamper/stamp_arithm.cpp b/blobstamper/stamp_arithm.cpp
@@ -0,0 +1,4 @@
+#include "blob.h"
+#include "stamp.h"
+#include "stamp_arithm.h"
+
diff --git a/blobstamper/stamp_arithm.h b/blobstamper/stamp_arithm.h
@@ -0,0 +1,26 @@
+#ifndef STAMP_ATOMIC_H
+#define STAMP_ATOMIC_H
+
+#include <string>
+#include "helpers.h"
+
+template<class T> class StampArithm: public StampFixed
+{
+  public:
+    StampArithm() { size = sizeof(T);};
+    std::string ExtractStr(Blob &blob) override;
+};
+
+template<class T> std::string
+StampArithm<T>::ExtractStr(Blob &blob)
+{
+    std::string res;
+    T *pT = (T *)this->ExtractBin(blob);
+    if (! pT)
+        return "";
+    res = to_string_precise(*pT);
+    free(pT);
+    return res;
+}
+
+#endif  /* STAMP_ATOMIC_H */
diff --git a/blobstamper/stamp_atomic.cpp b/blobstamper/stamp_atomic.cpp
diff --git a/blobstamper/stamp_atomic.h b/blobstamper/stamp_atomic.h
diff --git a/blobstamper/stamp_dict.cpp b/blobstamper/stamp_dict.cpp
@@ -1,7 +1,7 @@
 
 #include "blob.h"
 #include "stamp.h"
-#include "stamp_atomic.h"
+#include "stamp_arithm.h"
 #include "stamp_dict.h"
 
 StampFixed&
diff --git a/blobstamper/stamp_dict.h b/blobstamper/stamp_dict.h
@@ -6,16 +6,16 @@
 
 #include "blob.h"
 #include "stamp.h"
-#include "stamp_atomic.h"
+#include "stamp_arithm.h"
 #include "dict.h"
 
 class StampDict: public StampFixed
 {
   protected:
-    StampBinChar  stamp8;
-    StampBinInt16 stamp16;
-    StampBinInt32 stamp32;
-    StampBinInt64 stamp64;
+    StampArithm<char>  stamp8;
+    StampArithm<unsigned short int> stamp16;
+    StampArithm<unsigned int> stamp32;
+    StampArithm<unsigned long long> stamp64;
     StampFixed& stamp;
     DictBase& dict;
     unsigned long long stamp_max_value;
diff --git a/t/110-stamp-atomic.cpp b/t/110-stamp-atomic.cpp
diff --git a/t/300-galley.cpp b/t/300-galley.cpp
diff --git a/t/Makefile b/t/Makefile

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+#ifndef HELPERS_H`
	`2`	`+#define HELPERS_H`
`1`	`3`
`2`	`4`	`void hexdump(void *pAddressIn, long lSize);`
`3`	`5`
`@@ -74,3 +76,4 @@ max precision`
`74`	`76`	`"%.999g", __val);`
`75`	`77`	`}`
`76`	`78`
	`79`	`+#endif /HELPERS_H/`