use vector fixes from LRA branch

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>

src/util/vector.h

@@ -117,6 +117,10 @@ public:
     }
 
     vector(SZ s) {
+        if (s == 0) {
+            m_data = 0;
+            return;
+        }
         SZ * mem = reinterpret_cast<SZ*>(memory::allocate(sizeof(T) * s + sizeof(SZ) * 2));
         *mem = s; 
         mem++;
@@ -184,6 +188,8 @@ public:
         }
     }
 
+    void clear() { reset(); }
+
     bool empty() const { 
         return m_data == 0 || reinterpret_cast<SZ *>(m_data)[SIZE_IDX] == 0; 
     }
@@ -218,6 +224,33 @@ public:
         return m_data + size(); 
     }
 
+    class reverse_iterator {
+        T* v;
+    public:
+        reverse_iterator(T* v):v(v) {}
+        
+        T operator*() { return *v; }
+        reverse_iterator operator++(int) {
+            reverse_iterator tmp = *this;
+            --v;
+            return tmp;
+        }
+        reverse_iterator& operator++() {
+            --v;
+            return *this;
+        }
+
+        bool operator==(reverse_iterator const& other) const {
+            return other.v == v;
+        }
+        bool operator!=(reverse_iterator const& other) const {
+            return other.v != v;
+        }
+    };
+
+    reverse_iterator rbegin() { return reverse_iterator(end() - 1); }
+    reverse_iterator rend() { return reverse_iterator(begin() - 1); }
+
     void set_end(iterator it) {
         if (m_data) {
             SZ new_sz = static_cast<SZ>(it - m_data);
@@ -362,8 +395,8 @@ public:
     void reverse() {
         SZ sz = size();
         for (SZ i = 0; i < sz/2; ++i) {
-           std::swap(m_data[i], m_data[sz-i-1]);
+            std::swap(m_data[i], m_data[sz-i-1]);
-       }
+        }
     }
 
     void fill(T const & elem) {
@@ -461,16 +494,23 @@ struct vector_hash : public vector_hash_tpl<Hash, vector<typename Hash::data> >
 template<typename Hash>
 struct svector_hash : public vector_hash_tpl<Hash, svector<typename Hash::data> > {};
 
-
+#include <vector>
-// Specialize vector<std::string> to be inaccessible.
+// Specialize vector<std::string> to be an instance of std::vector instead.
 // This will catch any regression of issue #564 and #420.
-// Use std::vector<std::string> instead.
+
 template <>
-class vector<std::string, true, unsigned> {
+class vector<std::string, true, unsigned> : public std::vector<std::string> {
-private:
+public:
-    vector<std::string, true, unsigned>();
+    vector(vector<std::string, true, unsigned> const& other): std::vector<std::string>(other) {}
+    vector(size_t sz, char const* s): std::vector<std::string>(sz, s) {}
+    vector() {}
+
+    void reset() { clear(); }
+   
+    
 };
 
 
+
 #endif /* VECTOR_H_ */