Changeset 1203 for to-imperative/trunk/libp++/pxx_vector.ih

Timestamp:

Aug 14, 2003, 9:24:47 AM (17 years ago)

Author:

sveta

Message:

• Old version (with decrease and expand).

File:

• to-imperative/trunk/libp++/pxx_vector.ih (modified) (2 diffs)

to-imperative/trunk/libp++/pxx_vector.ih

@@ -68 +68 @@
 
 template <typename type_t>
+void Vector<type_t>::decrease (size_t _extra)
+{ 
+  size_t i;
+  if (_extra > length) {
+    for ( i = 0; i < length; i++)
+      (data + i)-> ~type_t();
+    length = 0;
+  } else {
+    for ( i = length - _extra; i < length; i++)
+      (data + i)-> ~type_t();
+    length -= _extra;
+  }
+}
+
+template <typename type_t>
 void Vector<type_t>::expand (size_t _extra)
 {
@@ -99 +114 @@
 type_t& Vector<type_t>::operator [] (size_t _index)
 {
-  if (_index >= length) expand(_index - length + 1);
-  return data[_index];
+  if (_index < length) {
+    return data[_index];
+  } else {
+    throw OutOfRange();
+  }
 }