From 2f97def4bf8e750a5c6c342120ef677041b854a5 Mon Sep 17 00:00:00 2001
From: dismine <dismine@gmail.com>
Date: Fri, 25 Apr 2014 18:10:56 +0300
Subject: [PATCH] Use Q_ASSERT marcros instead MUP_ASSERT and MUP_FAIL.

--HG--
branch : feature
---
 src/libs/qmuparser/qmuparserbase.cpp | 22 ++++++++++-----------
 src/libs/qmuparser/qmuparserdef.h    | 29 ----------------------------
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/src/libs/qmuparser/qmuparserbase.cpp b/src/libs/qmuparser/qmuparserbase.cpp
index 244e79fb2..40229e420 100644
--- a/src/libs/qmuparser/qmuparserbase.cpp
+++ b/src/libs/qmuparser/qmuparserbase.cpp
@@ -873,13 +873,13 @@ namespace qmu
     while (a_stOpt.size() && a_stOpt.top().GetCode()==cmELSE)
     {
       token_type opElse = a_stOpt.pop();
-      MUP_ASSERT(a_stOpt.size()>0);
+      Q_ASSERT(a_stOpt.size()>0);
 
       // Take the value associated with the else branch from the value stack
       token_type vVal2 = a_stVal.pop();
 
-      MUP_ASSERT(a_stOpt.size()>0);
-      MUP_ASSERT(a_stVal.size()>=2);
+      Q_ASSERT(a_stOpt.size()>0);
+      Q_ASSERT(a_stVal.size()>=2);
 
       // it then else is a ternary operator Pop all three values from the value s
       // tack and just return the right value
@@ -889,8 +889,8 @@ namespace qmu
       a_stVal.push( (vExpr.GetVal()!=0) ? vVal1 : vVal2);
 
       token_type opIf = a_stOpt.pop();
-      MUP_ASSERT(opElse.GetCode()==cmELSE);
-      MUP_ASSERT(opIf.GetCode()==cmIF);
+      Q_ASSERT(opElse.GetCode()==cmELSE);
+      Q_ASSERT(opIf.GetCode()==cmIF);
 
       m_vRPN.AddIfElse(cmENDIF);
     } // while pending if-else-clause found
@@ -910,7 +910,7 @@ namespace qmu
     }
     else
     {
-      MUP_ASSERT(a_stVal.size()>=2);
+      Q_ASSERT(a_stVal.size()>=2);
       token_type valTok1 = a_stVal.pop(),
                  valTok2 = a_stVal.pop(),
                  optTok  = a_stOpt.pop(),
@@ -1044,7 +1044,7 @@ namespace qmu
 
       //case  cmBO:  // unused, listed for compiler optimization purposes
       //case  cmBC:
-      //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
+      //      Q_ASSERT(INVALID_CODE_IN_BYTECODE);
       //      continue;
 
       case  cmIF:
@@ -1060,7 +1060,7 @@ namespace qmu
             continue;
 
       //case  cmARG_SEP:
-      //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
+      //      Q_ASSERT(INVALID_CODE_IN_BYTECODE);
       //      continue;
 
       // value and variable tokens
@@ -1118,7 +1118,7 @@ namespace qmu
 
               // The index of the string argument in the string table
               int iIdxStack = pTok->Fun.idx;  
-              MUP_ASSERT( iIdxStack>=0 && iIdxStack<(int)m_vStringBuf.size() );
+              Q_ASSERT( iIdxStack>=0 && iIdxStack<(int)m_vStringBuf.size() );
 
               switch(pTok->Fun.argc)  // switch according to argument count
               {
@@ -1158,7 +1158,7 @@ namespace qmu
         //case  cmOPRT_BIN:
         //case  cmOPRT_POSTFIX:
         //case  cmOPRT_INFIX:
-        //      MUP_FAIL(INVALID_CODE_IN_BYTECODE);
+        //      Q_ASSERT(INVALID_CODE_IN_BYTECODE);
         //      continue;
 
         //case  cmEND:
@@ -1392,7 +1392,7 @@ namespace qmu
       Error(ecMISSING_ELSE_CLAUSE);
 
     // get the last value (= final result) from the stack
-    MUP_ASSERT(stArgCount.size()==1);
+    Q_ASSERT(stArgCount.size()==1);
     m_nFinalResultIdx = stArgCount.top();
     if (m_nFinalResultIdx==0)
       Error(ecINTERNAL_ERROR, 9);
diff --git a/src/libs/qmuparser/qmuparserdef.h b/src/libs/qmuparser/qmuparserdef.h
index b5dc3e89c..2ad34d556 100644
--- a/src/libs/qmuparser/qmuparserdef.h
+++ b/src/libs/qmuparser/qmuparserdef.h
@@ -58,35 +58,6 @@
   #define MUP_STRING_TYPE std::string
 #endif
 
-#if defined(_DEBUG)
-  /** \brief Debug macro to force an abortion of the programm with a certain message.
-  */
-  #define MUP_FAIL(MSG)     \
-          {                 \
-            bool MSG=false; \
-            assert(MSG);    \
-          }
-
-    /** \brief An assertion that does not kill the program.
-
-        This macro is neutralised in UNICODE builds. It's
-        too difficult to translate.
-    */
-    #define MUP_ASSERT(COND)                         \
-            if (!(COND))                             \
-            {                                        \
-              stringstream_type ss;                  \
-              ss << "Assertion \"" #COND "\" failed: ") \
-                 << __FILE__ << " line "         \
-                 << __LINE__ << ".";             \
-              throw ParserError( ss.str() );         \
-            }
-#else
-  #define MUP_FAIL(MSG)
-  #define MUP_ASSERT(COND)
-#endif
-
-
 namespace qmu
 {
 #if defined(_UNICODE)