Changeset 987:87f7c54892df in lemon-0.x for src/work/klao

Timestamp:

11/13/04 18:07:10 (19 years ago)

Author:

Alpar Juttner

Branch:

default

Phase:

public

Convert:

svn:c9d7d8f5-90d6-0310-b91f-818b3a526b0e/lemon/trunk@1377

Message:

Naming changes:

• ValueType? -> Value
• KeyType? -> Key
• ReferenceType? ->Reference
• PointerType? -> Pointer

File:

• src/work/klao/iter_map.h (modified) (7 diffs)

src/work/klao/iter_map.h

@@ -26 +26 @@
   public:
 
-    typedef typename KeyIntMap::KeyType KeyType;
-    typedef Val ValueType;
+    typedef typename KeyIntMap::Key Key;
+    typedef Val Value;
 
-    typedef typename std::vector<KeyType>::const_iterator iterator;
+    typedef typename std::vector<Key>::const_iterator iterator;
 
   protected:
     KeyIntMap &base;
-    std::vector<KeyType> data;
+    std::vector<Key> data;
     size_t bounds[N];
     Val def_val;
@@ -56 +56 @@
       if(m != n) {
         size_t orig_a = a;
-        KeyType orig_key = data[a];
+        Key orig_key = data[a];
         while(m > n) {
           --m;
@@ -81 +81 @@
     }
 
-    Val operator[](const KeyType& k) const {
+    Val operator[](const Key& k) const {
       return find(base[k]);
     }
 
-    void set(const KeyType& k, Val n) {
+    void set(const Key& k, Val n) {
       // FIXME: range check?
       size_t a = base[k];
@@ -96 +96 @@
     }
 
-    void insert(const KeyType& k, Val n) {
+    void insert(const Key& k, Val n) {
       data.push_back(k);
       base.set(k, move(bounds[N-1]++, N-1, n));
@@ -103 +103 @@
     /// This func is not very usable, but necessary to implement 
     /// dynamic map behaviour.
-    void remove(const KeyType& k) {
+    void remove(const Key& k) {
       size_t a = base[k];
       if(a < bounds[N-1]) {
@@ -131 +131 @@
 
     /// For use as an iterator...
-    KeyType& first(KeyType &k, Val n) {
+    Key& first(Key &k, Val n) {
       size_t i = (n ? bounds[n-1] : 0);
       if( i < bounds[n] ) {
@@ -143 +143 @@
 
     /// For use as an iterator...
-    KeyType& next(KeyType &k) {
+    Key& next(Key &k) {
       size_t i = base[k];
       uint8_t n = find(i);