Partial Rename of Signature into Block

Author: Azzaare

include/block.hpp

@@ -21,7 +21,7 @@ template <class T, class D> class Component; // Required for the friendship
 template <class T, class D>
 class CompressedStack;                         // Required for the friendship
 template <class T, class D> class ClassicStack; // Required for the friendship
-template <class T, class D> class Signature {
+template <class T, class D> class Block {
   friend class Component<T, D>;
   friend class CompressedStack<T, D>;
   friend class ClassicStack<T, D>;
@@ -32,10 +32,10 @@ template <class T, class D> class Signature {
 
 private:
   // Constructors
-  Signature<T, D>(int index, std::streampos position,
+  Block<T, D>(int index, std::streampos position,
                   std::shared_ptr<T> context, Buffer<T, D> buffer);
-  Signature<T, D>(std::vector<Signature<T, D>> level);
-  Signature<T, D>();
+  Block<T, D>(std::vector<Block<T, D>> level);
+  Block<T, D>();
 
   // Getters
   bool single();
@@ -49,18 +49,18 @@ template <class T, class D> class Signature {
 
 /* Derived types: Level and LevelVector */
 // A Partially Compressed Level is composed of its blocks
-template <class T, class D> using Level = std::vector<Signature<T, D>>;
+template <class T, class D> using Level = std::vector<Block<T, D>>;
 template <class T, class D> Level<T, D> initLevel(int space);
 
 // Each level of compressed Levels (first and second) are stored in LevelVector
 template <class T, class D> using LevelVector = std::vector<Level<T, D>>;
 template <class T, class D> LevelVector<T, D> initLevelVector(int space, int depth);
 
 /*==============================================================================
-  Constructors : Signature, initLevel, initLevelVector
+  Constructors : Block, initLevel, initLevelVector
 ==============================================================================*/
 template <class T, class D>
-Signature<T, D>::Signature(int index, std::streampos position,
+Block<T, D>::Block(int index, std::streampos position,
                            std::shared_ptr<T> context, Buffer<T, D> buffer) {
   mFirst = index;
   mLast = index;
@@ -69,17 +69,17 @@ Signature<T, D>::Signature(int index, std::streampos position,
   mBuffer = buffer;
 }
 
-template <class T, class D> Signature<T, D>::Signature(Level<T, D> level) {
-  Signature<T, D> frontSign = level.front();
-  Signature<T, D> backSign = level.back();
-  mFirst = frontSign.mFirst;
-  mLast = backSign.mLast;
-  mPosition = frontSign.mPosition;
-  mContext = frontSign.mContext;
-  mBuffer = frontSign.mBuffer;
+template <class T, class D> Block<T, D>::Block(Level<T, D> level) {
+  Block<T, D> frontBlock = level.front();
+  Block<T, D> backBlock = level.back();
+  mFirst = frontBlock.mFirst;
+  mLast = backBlock.mLast;
+  mPosition = frontBlock.mPosition;
+  mContext = frontBlock.mContext;
+  mBuffer = frontBlock.mBuffer;
 }
 
-template <class T, class D> Signature<T, D>::Signature() {
+template <class T, class D> Block<T, D>::Block() {
   mFirst = 0;
   mLast = 0;
   mPosition = std::streampos(0);
@@ -107,14 +107,14 @@ template <class T, class D> LevelVector<T, D> initLevelVector(int space, int dep
 /*==============================================================================
   Getters : single
 ==============================================================================*/
-template <class T, class D> bool Signature<T, D>::single() {
+template <class T, class D> bool Block<T, D>::single() {
   return (mLast == mFirst);
 }
 
 /*==============================================================================
   IO : toString, levelToString
 ==============================================================================*/
-template <class T, class D> std::string Signature<T, D>::toString() {
+template <class T, class D> std::string Block<T, D>::toString() {
   std::string str;
   str = "(" + std::to_string(mFirst) + ",";
   str += std::to_string(mLast) + ")";

include/buffer.hpp

@@ -19,13 +19,13 @@
 ==============================================================================*/
 template <class T, class D>
 class CompressedStack;                         // Required for the friendship
-template <class T, class D> class Signature;   // Required for the friendship
+template <class T, class D> class Block;   // Required for the friendship
 template <class T, class D> class Component;   // Required for the friendship
 template <class T, class D> class ClassicStack; // Required for the friendship
 template <class T, class D> class Buffer {
   friend class CompressedStack<T, D>;
   friend class ClassicStack<T, D>;
-  friend class Signature<T, D>;
+  friend class Block<T, D>;
   friend class Component<T, D>;
 
 private:

include/classicStack.hpp

@@ -51,7 +51,7 @@ template <class T, class D> class ClassicStack : public Stack<T, D> {
   Level<T, D> getFirstPartial(int lvl);
   Level<T, D> getCompressed();
   ExplicitPointer<T, D> getFirstExplicit();
-  Signature<T, D> getFirstSign();
+  Block<T, D> getFirstBlock();
   int getBufferSize ();
 };
 
@@ -118,10 +118,10 @@ int ClassicStack<T, D>::getBufferSize() {
   return 0;
 }
 
-template <class T, class D> Signature<T, D> ClassicStack<T, D>::getFirstSign() {
-  Signature<T, D> sign(0, std::streampos(0), std::shared_ptr<T>(nullptr),
+template <class T, class D> Block<T, D> ClassicStack<T, D>::getFirstBlock() {
+  Block<T, D> block(0, std::streampos(0), std::shared_ptr<T>(nullptr),
                        Buffer<T, D>(0));
-  return sign;
+  return block;
 }
 
 /*==============================================================================

include/component.hpp

@@ -14,7 +14,7 @@
   Extensions :
   Aliases    :
   Friends   -> CompressedStack
-            <- Data, Signature
+            <- Data, Block
 ==============================================================================*/
 template <class T, class D>
 class CompressedStack; // Required for the friendship
@@ -29,9 +29,9 @@ template <class T, class D> class Component {
 
   // Push and pop
   void pushExplicit(SPData<T, D> elt);
-  void push(Signature<T, D> sign, int lvl);
+  void push(Block<T, D> block, int lvl);
   Data<T, D> top();
-  Signature<T, D> top(int lvl);
+  Block<T, D> top(int lvl);
   int topIndex(int lvl = 0);
 
   // IO
@@ -42,15 +42,15 @@ template <class T, class D> class Component {
 
   LevelVector<T, D> mPartial;
   ExplicitPointer<T, D> mExplicit;
-  Signature<T, D> mSign;
+  Block<T, D> mBlock;
 };
 
 /*==============================================================================
   Constructors
 ==============================================================================*/
 template <class T, class D>
 Component<T, D>::Component(int space, int depth)
-    : mSign(0, std::streampos(0), std::shared_ptr<T>(nullptr),
+    : mBlock(0, std::streampos(0), std::shared_ptr<T>(nullptr),
             Buffer<T, D>(0)) {
 
   LevelVector<T, D> partial = initLevelVector<T, D>(space, depth);
@@ -82,8 +82,8 @@ template <class T, class D> std::string Component<T, D>::toString() {
   str = levelsToString(mPartial);
   str += "\t\t\tExplicit  -> ";
   str += explicitPointerToString(mExplicit);
-  str += "\n\t\t\tSignature -> ";
-  str += mSign.toString() + "\n";
+  str += "\n\t\t\tBlock -> ";
+  str += mBlock.toString() + "\n";
   return str;
 }
 
@@ -95,14 +95,14 @@ void Component<T, D>::pushExplicit(SPData<T, D> elt) {
   mExplicit.push_back(elt);
 }
 template <class T, class D>
-void Component<T, D>::push(Signature<T, D> sign, int lvl) {
-  mPartial[lvl - 1].push_back(sign);
+void Component<T, D>::push(Block<T, D> block, int lvl) {
+  mPartial[lvl - 1].push_back(block);
 }
 
 template <class T, class D> Data<T, D> Component<T, D>::top() {
   return *(mExplicit.back());
 }
-template <class T, class D> Signature<T, D> Component<T, D>::top(int lvl) {
+template <class T, class D> Block<T, D> Component<T, D>::top(int lvl) {
   return mPartial[lvl - 1].back();
 }
 

include/stack.hpp

@@ -35,7 +35,7 @@ template <class T, class D> class Stack {
   virtual Level<T, D> getFirstPartial(int lvl) = 0;
   virtual Level<T, D> getCompressed() = 0;
   virtual ExplicitPointer<T, D> getFirstExplicit() = 0;
-  virtual Signature<T, D> getFirstSign() = 0;
+  virtual Block<T, D> getFirstBlock() = 0;
   virtual int getBufferSize() = 0;
 
   // Setters