fix for #93

beltoforion · Jun 7, 2021 · 39ddf1f · 39ddf1f
1 parent 6d8c4b8
commit 39ddf1f
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 14 deletions.
diff --git a/include/muParserBytecode.h b/include/muParserBytecode.h
@@ -119,7 +119,7 @@ namespace mu
 		void AddOp(ECmdCode a_Oprt);
 		void AddIfElse(ECmdCode a_Oprt);
 		void AddAssignOp(value_type* a_pVar);
-		void AddFun(generic_callable_type a_pFun, int a_iArgc);
+		void AddFun(generic_callable_type a_pFun, int a_iArgc, bool isOptimizable);
 		void AddBulkFun(generic_callable_type a_pFun, int a_iArgc);
 		void AddStrFun(generic_callable_type a_pFun, int a_iArgc, int a_iIdx);
 

diff --git a/include/muParserToken.h b/include/muParserToken.h
@@ -493,6 +493,14 @@ namespace mu
 			return m_pCallback->GetArgc();
 		}
 
+		//------------------------------------------------------------------------------
+		/** \brief Return true if the token is a function token that can be optimized.
+		*/
+		bool IsOptimizable() const
+		{
+			return m_pCallback->IsValid() && m_pCallback->IsOptimizable();
+		}
+
 		//------------------------------------------------------------------------------
 		/** \brief Return the token identifier.
 

diff --git a/src/muParserBase.cpp b/src/muParserBase.cpp
@@ -873,7 +873,7 @@ namespace mu
 			if (funTok.GetArgCount() == -1 && iArgCount == 0)
 				Error(ecTOO_FEW_PARAMS, m_pTokenReader->GetPos(), funTok.GetAsString());
 
-			m_vRPN.AddFun(funTok.GetFuncAddr(), (funTok.GetArgCount() == -1) ? -iArgNumerical : iArgNumerical);
+			m_vRPN.AddFun(funTok.GetFuncAddr(), (funTok.GetArgCount() == -1) ? -iArgNumerical : iArgNumerical, funTok.IsOptimizable());
 			break;
 		default:
 			break;

diff --git a/src/muParserBytecode.cpp b/src/muParserBytecode.cpp
@@ -371,13 +371,13 @@ namespace mu
 		\param a_iArgc Number of arguments, negative numbers indicate multiarg functions.
 		\param a_pFun Pointer to function callback.
 	*/
-	void ParserByteCode::AddFun(generic_callable_type a_pFun, int a_iArgc)
+	void ParserByteCode::AddFun(generic_callable_type a_pFun, int a_iArgc, bool isFunctionOptimizable)
 	{
 		std::size_t sz = m_vRPN.size();
 		bool optimize = false;
 
 		// only optimize functions with fixed number of more than a single arguments
-		if (m_bEnableOptimizer && a_iArgc > 0)
+		if (isFunctionOptimizable && m_bEnableOptimizer && a_iArgc > 0)
 		{
 			// <ibg 2020-06-10/> Unary Plus is a no-op
 			if (a_pFun == generic_callable_type{(erased_fun_type)&MathImpl<value_type>::UnaryPlus, nullptr})

diff --git a/src/muParserTest.cpp b/src/muParserTest.cpp
@@ -141,19 +141,36 @@ namespace mu
 			Parser p;
 			try
 			{
-				p.DefineFun(_T("unoptimizable"), f1of1, false);
-				p.SetExpr(_T("unoptimizable(1)"));
-				p.Eval();
-
 				// test for #93 (https://github.com/beltoforion/muparser/issues/93)
 				// expected bytecode is:
-				// FUN, VAL, END
-				auto& bc = p.GetByteCode();
-				const SToken* tok = bc.GetBase();
-				if (tok->Cmd != cmFUNC)
+				// VAL, FUN
+				{
+					p.DefineFun(_T("unoptimizable"), f1of1, false);
+					p.SetExpr(_T("unoptimizable(1)"));
+					p.Eval();
+
+					auto& bc = p.GetByteCode();
+					const SToken* tok = bc.GetBase();
+					if (bc.GetSize() != 2 && tok[1].Cmd != cmFUNC)
+					{
+						mu::console() << _T("#93 an unoptimizable expression was optimized!") << endl;
+						iStat += 1;
+					}
+				}
+
 				{
-					mu::console() << _T("#93 an unoptimizable expression was optimized!") << endl;
-					iStat += 1;
+					p.ClearFun();
+					p.DefineFun(_T("unoptimizable"), f1of1, true);
+					p.SetExpr(_T("unoptimizable(1)"));
+					p.Eval();
+
+					auto& bc = p.GetByteCode();
+					const SToken* tok = bc.GetBase();
+					if (bc.GetSize() != 1 && tok[0].Cmd != cmVAL)
+					{
+						mu::console() << _T("#93 optimizer error") << endl;
+						iStat += 1;
+					}
 				}
 			}
 			catch (...)