From bd546bfddbc9441f3f8a70e7c2ea9c5d4662750b Mon Sep 17 00:00:00 2001
From: hama <hama@siduction.net>
Date: Sun, 24 Aug 2014 15:54:14 +0200
Subject: [PATCH] dayly work

---
 rplcore/rplcharptrmap.cpp |  2 ++
 rplexpr/rplsource.hpp     |  2 +-
 unittests/main.cpp        | 11 ++++++++---
 unittests/unittests.pro   |  3 ++-
 4 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/rplcore/rplcharptrmap.cpp b/rplcore/rplcharptrmap.cpp
index bcaf414..a995536 100644
--- a/rplcore/rplcharptrmap.cpp
+++ b/rplcore/rplcharptrmap.cpp
@@ -25,6 +25,8 @@
  * @brief Constructor.
  *
  * @param ptr   the key used in the map.
+ *              @note the pointer will be stored in the map as a key,
+ *              not the content
  */
 RplKeyCharPtr::RplKeyCharPtr(const char* ptr) :
     m_ptr(ptr)
diff --git a/rplexpr/rplsource.hpp b/rplexpr/rplsource.hpp
index 61f4c47..830b955 100644
--- a/rplexpr/rplsource.hpp
+++ b/rplexpr/rplsource.hpp
@@ -65,7 +65,7 @@ private:
 
 class RplReader {
 public:
-    typedef QMap<RplSourceUnitName, RplSourceUnit*> UnitMap;
+    typedef RplCharPtrMap<RplSourceUnit*> UnitMap;
 public:
     RplReader(RplSource& source);
     ~RplReader();
diff --git a/unittests/main.cpp b/unittests/main.cpp
index 2cb6555..fb909fc 100644
--- a/unittests/main.cpp
+++ b/unittests/main.cpp
@@ -38,17 +38,22 @@ void testExpr(){
     extern void testRplVM();
     //testRplVM();
 
+    extern void testRplSource();
+    testRplSource();
+
+    extern void testRplLexer();
+    testRplLexer();
+
     extern void testRplMFParser();
     testRplMFParser();
 
     extern void testRplASTree();
     testRplASTree();
-    extern void testRplLexer();
-    testRplLexer();
+
 }
 
 void testStandard(){
-    //testExpr();
+    testExpr();
     testCore();
     extern void testRplMatrix();
     testRplMatrix();
diff --git a/unittests/unittests.pro b/unittests/unittests.pro
index 1dede45..0104a97 100644
--- a/unittests/unittests.pro
+++ b/unittests/unittests.pro
@@ -44,5 +44,6 @@ SOURCES += main.cpp \
     rplbytestorage_test.cpp \
     rplwriter_test.cpp \
     rplbench.cpp \
-    rplcharptrmap_test.cpp
+    rplcharptrmap_test.cpp \
+    ../rplcore/rplcharptrmap.cpp
 
-- 
2.39.5