dayly work

diff --git a/rplcore/rplcharptrmap.cpp b/rplcore/rplcharptrmap.cpp
index bcaf414011351973aaedcc81c19f26484a0d34a8..a995536b1b94c5de0f432a161dea8c97551d60ab 100644 (file)
--- 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 61f4c47da0114788eedf5dbc6307a3185cf1d6e7..830b9550a94b49547afe6cde4565ca0cfb57ebf7 100644 (file)
--- 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 2cb655542a141ee8654e904731bc1e54ed0598ba..fb909fc6e8d08d6cdfc944e11c39edd239ba466f 100644 (file)
--- 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 1dede45125a7afe466f3dfd9da596c46150b79cc..0104a977fab436d2f2523ee438831b1de69fc2ce 100644 (file)
--- 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