X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=TextStorage.h;h=6294c6bda9484e37aac9bad6e3e9ac3f96bfda50;hb=89dc22aee980ba16f757cd9a7f77478c2da50051;hp=fcd66e58f3e0dcf4915c2c870a55392a8e711e3f;hpb=54d7f377217134290545df4c3f7c254478dc1f88;p=SXSI%2FTextCollection.git

diff --git a/TextStorage.h b/TextStorage.h
index fcd66e5..6294c6b 100644
--- a/TextStorage.h
+++ b/TextStorage.h
@@ -23,7 +23,16 @@
 
 #include "TextCollection.h"
 #include "Tools.h"
+
 #include "incbwt/bits/deltavector.h"
+// Re-define word size to ulong:
+#undef W
+#if __WORDSIZE == 64
+#   define W 64
+#else
+#   define W 32
+#endif
+
 #include <cassert>
 #include <stdexcept>
 
@@ -104,11 +113,6 @@ protected:
         
 
         offsets_ = new CSA::DeltaVector(encoder, n_);
-
-/*        for (ulong i = 0; i < n_-1; ++i)
-            if ((text[i] == '\0') != IsEndmarker(i))
-                std::cout << "misplaced endmarker at i = " << i << std::endl;
-*/
         numberOfTexts_ = offsets_->rank(n_ - 1);
     }
     
@@ -182,7 +186,7 @@ private:
 /******************************************************************
  * LZ-index text collection.
  */
-struct LzTriePimpl; // Pimpl, declared in .cpp
+struct LzTriePimpl; // Using Pimpl idiom to hide LzTrie implementation.
 
 class TextStorageLzIndex : public TextStorage
 {
@@ -252,7 +256,7 @@ public:
 
 private:
     TextPosition n_;
-    uchar *text_; // FIXME Replace with a succinct representation.
+    uchar *text_;
     bool freeText;
 }; // class TextStorageBuilder