From 2127fa916bd6265a1b0f537cdff8f5d0e7edf1ee Mon Sep 17 00:00:00 2001
From: Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
Date: Fri, 18 Aug 2017 18:08:01 +0200
Subject: [PATCH] Inspector support for map<> with default sort.

* New: In Hurricane/Common.h, added inspector support for map<> using
    the default sort mechanism (less<>).
---
 hurricane/src/hurricane/hurricane/Commons.h   | 52 +++++++++++++++++++
 .../src/hurricane/hurricane/DebugSession.h    |  5 +-
 2 files changed, 55 insertions(+), 2 deletions(-)

diff --git a/hurricane/src/hurricane/hurricane/Commons.h b/hurricane/src/hurricane/hurricane/Commons.h
index eafed47a..7f257b30 100644
--- a/hurricane/src/hurricane/hurricane/Commons.h
+++ b/hurricane/src/hurricane/hurricane/Commons.h
@@ -539,6 +539,58 @@ inline Hurricane::Record* getRecord ( std::list<Element>* l )
 // Inspector Support for  :  "[const] std::map<Key,Element,Compare>*.
 
 
+template<typename Key, typename Element>
+inline std::string  getString ( std::map<Key,Element>* m )
+{
+  std::string name = "std::map<Element>:";
+  return name + getString<size_t>(m->size());
+}
+
+
+template<typename Key, typename Element>
+inline Hurricane::Record* getRecord ( std::map<Key,Element>* m )
+{
+  Hurricane::Record* record = NULL;
+  if ( !m->empty() ) {
+    record = new Hurricane::Record ( "std::map<Element>" );
+    typename std::map<Key,Element>::iterator iterator = m->begin();
+    while ( iterator != m->end() ) {
+      record->add ( getSlot<Element>(getString(iterator->first), iterator->second) );
+      ++iterator;
+    }
+  }
+  return record;
+}
+
+
+template<typename Key, typename Element>
+inline std::string  getString ( const std::map<Key,Element>* m )
+{
+  std::string name = "const std::map<Element>:";
+  return name + getString<size_t>(m->size());
+}
+
+
+template<typename Key, typename Element>
+inline Hurricane::Record* getRecord ( const std::map<Key,Element>* m )
+{
+  Hurricane::Record* record = NULL;
+  if ( !m->empty() ) {
+    record = new Hurricane::Record ( "const std::map<Element>" );
+    typename std::map<Key,Element>::const_iterator iterator = m->begin();
+    while ( iterator != m->end() ) {
+      record->add ( getSlot<const Element>(getString(iterator->first), iterator->second) );
+      ++iterator;
+    }
+  }
+  return record;
+}
+
+
+// -------------------------------------------------------------------
+// Inspector Support for  :  "[const] std::map<Key,Element,Compare>*.
+
+
 template<typename Key, typename Element, typename Compare>
 inline std::string  getString ( std::map<Key,Element,Compare>* m )
 {
diff --git a/hurricane/src/hurricane/hurricane/DebugSession.h b/hurricane/src/hurricane/hurricane/DebugSession.h
index c62b7131..dc43e468 100644
--- a/hurricane/src/hurricane/hurricane/DebugSession.h
+++ b/hurricane/src/hurricane/hurricane/DebugSession.h
@@ -109,10 +109,11 @@ namespace Hurricane {
     if (cdebug.getMinLevel() < minLevel) minLevel = cdebug.getMinLevel();
     if (cdebug.getMaxLevel() > maxLevel) maxLevel = cdebug.getMaxLevel();
 
-    if ( _singleton->_isTraced(symbol) )
+    if ( _singleton->_isTraced(symbol) ) {
       _singleton->_levels.push( make_pair( cdebug.setMinLevel(minLevel)
                                          , cdebug.setMaxLevel(maxLevel) ) );
-    else {
+    //cerr << "DebugSession::open() " << symbol << "min:" << minLevel << " max:" <<  maxLevel << endl; 
+    } else {
       _singleton->_levels.push ( make_pair( cdebug.getMinLevel()
                                           , cdebug.getMaxLevel() ) );
     }