Add String Enumeratior stamp

nataraj-hates-MS-for-stealing-github · nataraj-hates-MS-for-stealing-github · commit a6d0eeff6840 · 2021-11-13T17:35:55.000+03:00
diff --git a/blobstamper/Makefile b/blobstamper/Makefile
@@ -1,21 +1,14 @@
 
-ALL_OBJS = blob.o \
-helpers.o \
-stamp.o \
-stamp_arithm.o \
-stamp_dict.o \
-galley.o \
-dict.o \
 
+BLOBSTAMPER_SRC := $(wildcard  ./*.cpp)
+BLOBSTAMPER_OBJ := $(addsuffix .o, $(basename $(BLOBSTAMPER_SRC)))
 
-%.o: %.cpp $(DEPS)
-	$(CXX) -c -g $(CXXFLAGS) $<
 
-%.o: %.c $(DEPS)
-	$(CC) -c -g $(CFLAGS) $<
+%.o: %.cpp
+	$(CXX) -c -g $(CXXFLAGS) -I .. $< -o $@
 
 
-all: $(ALL_OBJS)
+all: $(BLOBSTAMPER_OBJ)
 
 .PHONY: clean
 clean:
diff --git a/blobstamper/blobstamper.h b/blobstamper/blobstamper.h
@@ -22,5 +22,5 @@
 #include "stamp_dict.h"
 #include "dict.h"
 #include "galley.h"
-
+#include "stamp_enumerator.h"
 
diff --git a/blobstamper/galley.h b/blobstamper/galley.h
@@ -24,6 +24,10 @@
 #include <vector>
 #include <functional> // for std::reference_wrapper
 
+#include "stamp.h"
+#include "blob.h"
+
+
 #define ORACLE_TYPE unsigned short int
 #define ORACLE_STAMP StampArithm<ORACLE_TYPE>
 #define ORACLE_SIZE sizeof(ORACLE_TYPE)
@@ -33,6 +37,7 @@ class GalleyBase: public virtual StampBase
 /* Galley is a kind of stamp, somwhere deep inside. */
 /* You can inherit it, and make a stamp out of it*/
 {
+
 };
 
 class GalleyVectorBase : public GalleyBase
diff --git a/blobstamper/stamp.h b/blobstamper/stamp.h
@@ -25,6 +25,7 @@
 #include <memory>
 
 #include "helpers.h"
+#include "blob.h"
 
 
 class StampBase
diff --git a/examples/Makefile b/examples/Makefile
@@ -11,13 +11,6 @@ all: $(EXAMPLES_BIN)
 build-libtappp:
 	$(MAKE) -C ../libtappp
 
-../blobstamper-pg/%.o: ../blobstamper-pg/%.cpp
-	$(CXX) -c -g $(CXXFLAGS) -I .. $< -o $@
-
-../wrappers/%.o: ../wrappers/%.cpp
-	$(CXX) -c -g $(CXXFLAGS) -I .. $< -o $@
-
-
 %: %.cpp $(BLOBSTAMPER_OBJ) $(BLOBSTAMPER_PG_OBJ) $(WRAPPERS_OBJ)
 	$(CXX) $(CXXFLAGS) -I.. -o $@ $< $(BLOBSTAMPER_OBJ) 
 
diff --git a/examples/example08.cpp b/examples/example08.cpp
@@ -53,86 +53,25 @@ Point3D StampPoint3D::ExtractValue(Blob &blob)
 }
 
 
-class StampPolyLine3D:  public GalleyVectorStr, public StampBaseStr
+class StampPolyLine3D:  public StampStrEnumerator
 {
   protected:
     StampPoint3D * item_stamp_p;
   public:
-    StampPolyLine3D(): GalleyVectorStr(*(item_stamp_p = new StampPoint3D())) {};
+    StampPolyLine3D(): StampStrEnumerator(*(item_stamp_p = new StampPoint3D()), ",", "(",")") {};
     ~StampPolyLine3D() {delete item_stamp_p;};
-
-    virtual std::string ExtractStr(Blob &blob) override;
-};
-
-class StampStrEnumerator: public GalleyVectorStr, public StampBaseStr
-{
-  protected:
-    StampBaseStr & stamp_str;
-    const std::string separator;
-    const std::string left_bracket;
-    const std::string right_bracket;
-  public:
-    StampStrEnumerator(StampBaseStr &arg_stamp,
-                       const std::string arg_sep,
-                       const std::string arg_l,
-                       const std::string arg_r
-                      ):
-                    stamp_str(arg_stamp),
-                    separator(arg_sep),
-                    left_bracket(arg_l),
-                    right_bracket(arg_r),
-                    GalleyVectorStr(arg_stamp) {};
-
-    virtual std::string ExtractStr(Blob &blob) override;
-
 };
 
 
-std::string StampStrEnumerator::ExtractStr(Blob &blob)
-{
-  std::vector<std::string> data = ExtractStrVector(blob);
-  std::string res = "";
-
-  for(std::string s : data)
-  {
-    if (!res.empty())
-    {
-      res+= separator;
-    }
-    res+= s;
-  }
-  res = left_bracket + res + right_bracket;
-  return res;
-}
-
-
-
-std::string StampPolyLine3D::ExtractStr(Blob &blob)
-{
-  std::vector<std::string> data = ExtractStrVector(blob);
-  std::string res = "";
-
-  for(std::string s : data)
-  {
-    if (!res.empty())
-    {
-      res+=", ";
-    }
-    res+= s;
-  }
-  res = "(" + res + ")";
-  return res;
-}
 
 int main()
 {
   char data[] = "abcdef" "abcdef" "ABCDEF" "012345";
   Blob blob(data, strlen(data));
-  StampPoint3D stamp;
 
-  StampStrEnumerator stamp_e(stamp, " - ", "[", "]");
+  StampPolyLine3D stamp;
 
 
-  std::string s = stamp_e.ExtractStr(blob);
+  std::string s = stamp.ExtractStr(blob);
   std::cout << s <<"\n";
 }
