- Changes to make it more ANSI-conformant. Stuff detected while trying

[ginac.git] / ginac / remember.cpp

diff --git a/ginac/remember.cpp b/ginac/remember.cpp
index 9b06a464d8d9e33e8b5672fe6705d9d1637a73f1..404c7c81bf0c1823c821521ac3a3f5885648b1e1 100644 (file)
--- a/ginac/remember.cpp
+++ b/ginac/remember.cpp
@@ -24,7 +24,7 @@
 #include <stdexcept>
 
 #include "function.h"
-#include "utils.h" // for log_2
+#include "utils.h"
 #include "remember.h"
 
 #ifndef NO_NAMESPACE_GINAC
@@ -38,18 +38,17 @@ namespace GiNaC {
 remember_table_entry::remember_table_entry(function const & f, ex const & r)
   : hashvalue(f.gethash()), seq(f.seq), result(r)
 {
-       ++last_access=access_counter;
-       successful_hits=0;
+       ++last_access = access_counter;
+       successful_hits = 0;
 }
 
 bool remember_table_entry::is_equal(function const & f) const
 {
        GINAC_ASSERT(f.seq.size()==seq.size());
        if (f.gethash()!=hashvalue) return false;
-       for (unsigned i=0; i<seq.size(); ++i) {
+       for (unsigned i=0; i<seq.size(); ++i)
                if (!seq[i].is_equal(f.seq[i])) return false;
-       }
-       ++last_access=access_counter;
+       ++last_access = access_counter;
        ++successful_hits;
        return true;
 }
@@ -62,8 +61,8 @@ unsigned long remember_table_entry::access_counter=0;
 
 remember_table_list::remember_table_list(unsigned as, unsigned strat)
 {
-       max_assoc_size=as;
-       remember_strategy=strat;
+       max_assoc_size = as;
+       remember_strategy = strat;
 }
 
 
@@ -74,59 +73,58 @@ void remember_table_list::add_entry(function const & f, ex const & result)
                (size()>=max_assoc_size)) {
                // table is full, we must delete an older entry
                GINAC_ASSERT(size()>0); // there must be at least one entry
- 
+               
                switch (remember_strategy) {
-               case remember_strategies::delete_cyclic:
+               case remember_strategies::delete_cyclic: {
                        // delete oldest entry (first in list)
                        erase(begin());
                        break;
-               case remember_strategies::delete_lru:
-                       {
-                               // delete least recently used entry
-                               iterator it=begin();
-                               iterator lowest_access_it=it;
-                               unsigned long lowest_access=it->get_last_access();
-                               ++it;
-                               while (it!=end()) {
-                                       if (it->get_last_access()<lowest_access) {
-                                               lowest_access=it->get_last_access();
-                                               lowest_access_it=it;
-                                       }
-                                       ++it;
+               }
+               case remember_strategies::delete_lru: {
+                       // delete least recently used entry
+                       iterator it = begin();
+                       iterator lowest_access_it = it;
+                       unsigned long lowest_access = (*it).get_last_access();
+                       ++it;
+                       while (it!=end()) {
+                               if ((*it).get_last_access()<lowest_access) {
+                                       lowest_access = (*it).get_last_access();
+                                       lowest_access_it = it;
                                }
-                               erase(lowest_access_it);
+                               ++it;
                        }
+                       erase(lowest_access_it);
                        break;
-               case remember_strategies::delete_lfu:
-                       {
-                               // delete least frequently used entry
-                               iterator it=begin();
-                               iterator lowest_hits_it=it;
-                               unsigned lowest_hits=it->get_successful_hits();
-                               ++it;
-                               while (it!=end()) {
-                                       if (it->get_successful_hits()<lowest_hits) {
-                                               lowest_hits=it->get_successful_hits();
-                                               lowest_hits_it=it;
-                                       }
-                                       ++it;
+               }
+               case remember_strategies::delete_lfu: {
+                       // delete least frequently used entry
+                       iterator it = begin();
+                       iterator lowest_hits_it = it;
+                       unsigned lowest_hits = (*it).get_successful_hits();
+                       ++it;
+                       while (it!=end()) {
+                               if ((*it).get_successful_hits()<lowest_hits) {
+                                       lowest_hits = (*it).get_successful_hits();
+                                       lowest_hits_it = it;
                                }
-                               erase(lowest_hits_it);
+                               ++it;
                        }
+                       erase(lowest_hits_it);
                        break;
+               }
                default:
                        throw(std::logic_error("remember_table_list::add_entry(): invalid remember_strategy"));
-               }
+        }
                GINAC_ASSERT(size()==max_assoc_size-1);
        }
        push_back(remember_table_entry(f,result));
-}        
+}
 
 bool remember_table_list::lookup_entry(function const & f, ex & result) const
 {
        for (const_iterator cit=begin(); cit!=end(); ++cit) {
-               if (cit->is_equal(f)) {
-                       result=cit->get_result();
+               if ((*cit).is_equal(f)) {
+                       result = (*cit).get_result();
                        return true;
                }
        }
@@ -151,20 +149,20 @@ remember_table::remember_table(unsigned s, unsigned as, unsigned strat)
        // all entries
 
        // use some power of 2 next to s
-       table_size=1 << log2(s);
+       table_size = 1 << log2(s);
        init_table();
 }
 
 bool remember_table::lookup_entry(function const & f, ex & result) const
 {
-       unsigned entry=f.gethash() & (table_size-1);
+       unsigned entry = f.gethash() & (table_size-1);
        GINAC_ASSERT(entry<size());
        return operator[](entry).lookup_entry(f,result);
 }
 
 void remember_table::add_entry(function const & f, ex const & result)
 {
-       unsigned entry=f.gethash() & (table_size-1);
+       unsigned entry = f.gethash() & (table_size-1);
        GINAC_ASSERT(entry<size());
        operator[](entry).add_entry(f,result);
 }        
@@ -178,9 +176,8 @@ void remember_table::clear_all_entries(void)
 void remember_table::init_table(void)
 {
        reserve(table_size);
-       for (unsigned i=0; i<table_size; ++i) {
+       for (unsigned i=0; i<table_size; ++i)
                push_back(remember_table_list(max_assoc_size,remember_strategy));
-       }
 }
 
 std::vector<remember_table> & remember_table::remember_tables(void)