added unit test for #93

added unit test for #93 cleanuo
beltoforion · Jun 7, 2021 · 6d8c4b8 · 6d8c4b8
1 parent a20d8a0
commit 6d8c4b8
Show file tree

Hide file tree

Showing 25 changed files with 264 additions and 165 deletions.
diff --git a/include/muParser.h b/include/muParser.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserBase.h b/include/muParserBase.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:
@@ -176,6 +176,7 @@ namespace mu
 		const string_type& GetExpr() const;
 		const funmap_type& GetFunDef() const;
 		string_type GetVersion(EParserVersionInfo eInfo = pviFULL) const;
+		const ParserByteCode& GetByteCode() const;
 
 		const char_type** GetOprtDef() const;
 		void DefineNameChars(const char_type* a_szCharset);
@@ -214,9 +215,9 @@ namespace mu
 
 			explicit change_dec_sep(char_type cDecSep, char_type cThousandsSep = 0, int nGroup = 3)
 				:std::numpunct<TChar>()
-				, m_nGroup(nGroup)
-				, m_cDecPoint(cDecSep)
-				, m_cThousandsSep(cThousandsSep)
+				,m_nGroup(nGroup)
+				,m_cDecPoint(cDecSep)
+				,m_cThousandsSep(cThousandsSep)
 			{}
 
 		protected:

diff --git a/include/muParserBytecode.h b/include/muParserBytecode.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:
@@ -50,14 +50,14 @@ namespace mu
 
 		union
 		{
-			struct //SValData
+			struct // SValData
 			{
 				value_type* ptr;
 				value_type  data;
 				value_type  data2;
 			} Val;
 
-			struct //SFunData
+			struct // SFunData
 			{
 				// Note: the type is erased in generic_callable_type and the signature of the
 				//       function to call is tracked elsewhere in regard with the number of
@@ -68,7 +68,7 @@ namespace mu
 				int   idx;
 			} Fun;
 
-			struct //SOprtData
+			struct // SOprtData
 			{
 				value_type* ptr;
 				int offset;

diff --git a/include/muParserCallback.h b/include/muParserCallback.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserDLL.h b/include/muParserDLL.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserDef.h b/include/muParserDef.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserError.h b/include/muParserError.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserFixes.h b/include/muParserFixes.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserInt.h b/include/muParserInt.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserTemplateMagic.h b/include/muParserTemplateMagic.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/include/muParserTest.h b/include/muParserTest.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:
@@ -179,35 +179,61 @@ namespace mu
 			}
 
 			// postfix operator callback
-			static value_type Mega(value_type a_fVal) { return a_fVal * (value_type)1e6; }
-			static value_type Micro(value_type a_fVal) { return a_fVal * (value_type)1e-6; }
-			static value_type Milli(value_type a_fVal) { return a_fVal / (value_type)1e3; }
+			static value_type Mega(value_type a_fVal) 
+			{
+				return a_fVal * (value_type)1e6; 
+			}
+
+			static value_type Micro(value_type a_fVal)
+			{
+				return a_fVal * (value_type)1e-6; 
+			}
+
+			static value_type Milli(value_type a_fVal) 
+			{
+				return a_fVal / (value_type)1e3; 
+			}
 
 			// Custom value recognition
 			static int IsHexVal(const char_type* a_szExpr, int* a_iPos, value_type* a_fVal);
 
 			// With user data
-			static value_type FunUd0(void* data) { return reinterpret_cast<std::intptr_t>(data); }
-			static value_type FunUd1(void* data, value_type v) { return reinterpret_cast<std::intptr_t>(data) + v; }
-			static value_type FunUd2(void* data, value_type v1, value_type v2) { return reinterpret_cast<std::intptr_t>(data) + v1 + v2; }
-			static value_type FunUd10(void* data, value_type v1, value_type v2, value_type v3, value_type v4, value_type v5,
-			                                      value_type v6, value_type v7, value_type v8, value_type v9, value_type v10)
+			static value_type FunUd0(void* data) 
+			{
+				return reinterpret_cast<std::intptr_t>(data); 
+			}
+
+			static value_type FunUd1(void* data, value_type v) 
+			{
+				return reinterpret_cast<std::intptr_t>(data) + v; 
+			}
+
+			static value_type FunUd2(void* data, value_type v1, value_type v2) 
+			{
+				return reinterpret_cast<std::intptr_t>(data) + v1 + v2; 
+			}
+
+			static value_type FunUd10(void* data, value_type v1, value_type v2, value_type v3, value_type v4, value_type v5, value_type v6, value_type v7, value_type v8, value_type v9, value_type v10)
 			{
 				return reinterpret_cast<std::intptr_t>(data) + v1 + v2 + v3 + v4 + v5 + v6 + v7 + v8 + v9 + v10;
 			}
+
 			static value_type StrFunUd3(void* data, const char_type* v1, value_type v2, value_type v3)
 			{
 				int val(0);
 				stringstream_type(v1) >> val;
 				return reinterpret_cast<std::intptr_t>(data) + val + v2 + v3;
 			}
+
 			static value_type SumUd(void* data, const value_type* a_afArg, int a_iArgc)
 			{
 				if (!a_iArgc)
 					throw mu::Parser::exception_type(_T("too few arguments for function sum."));
 
 				value_type fRes = 0;
-				for (int i = 0; i < a_iArgc; ++i) fRes += a_afArg[i];
+				for (int i = 0; i < a_iArgc; ++i) 
+					fRes += a_afArg[i];
+
 				return reinterpret_cast<std::intptr_t>(data) + fRes;
 			}
 
@@ -225,6 +251,7 @@ namespace mu
 			int TestIfThenElse();
 			int TestBulkMode();
 			int TestOssFuzzTestCases();
+			int TestOptimizer();
 
 			void Abort() const;
 

diff --git a/include/muParserToken.h b/include/muParserToken.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:
@@ -68,64 +68,86 @@ namespace mu
 	{
 		// Note: we keep generic_callable_type a pod for the purpose of layout
 
-		erased_fun_type pRawFun_;
-		void*           pUserData_;
+		erased_fun_type _pRawFun;
+		void*           _pUserData;
 
 		template <std::size_t NbParams, typename... Args>
 		value_type call_fun(Args&&... args) const
 		{
 			static_assert(NbParams == sizeof...(Args), "mismatch between NbParams and Args");
-			if (pUserData_ == nullptr) {
-				auto fun_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::fun_type>(pRawFun_);
+			if (_pUserData == nullptr) 
+			{
+				auto fun_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::fun_type>(_pRawFun);
 				return (*fun_typed_ptr)(std::forward<Args>(args)...);
-			} else {
-				auto fun_userdata_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::fun_userdata_type>(pRawFun_);
-				return (*fun_userdata_typed_ptr)(pUserData_, std::forward<Args>(args)...);
+			} 
+			else 
+			{
+				auto fun_userdata_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::fun_userdata_type>(_pRawFun);
+				return (*fun_userdata_typed_ptr)(_pUserData, std::forward<Args>(args)...);
 			}
 		}
 
 		template <std::size_t NbParams, typename... Args>
 		value_type call_bulkfun(Args&&... args) const
 		{
 			static_assert(NbParams == sizeof...(Args) - 2, "mismatch between NbParams and Args");
-			if (pUserData_ == nullptr) {
-				auto bulkfun_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::bulkfun_type>(pRawFun_);
+			if (_pUserData == nullptr) {
+				auto bulkfun_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::bulkfun_type>(_pRawFun);
 				return (*bulkfun_typed_ptr)(std::forward<Args>(args)...);
 			} else {
-				auto bulkfun_userdata_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::bulkfun_userdata_type>(pRawFun_);
-				return (*bulkfun_userdata_typed_ptr)(pUserData_, std::forward<Args>(args)...);
+				auto bulkfun_userdata_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::bulkfun_userdata_type>(_pRawFun);
+				return (*bulkfun_userdata_typed_ptr)(_pUserData, std::forward<Args>(args)...);
 			}
 		}
 
 		value_type call_multfun(const value_type* a_afArg, int a_iArgc) const
 		{
-			if (pUserData_ == nullptr) {
-				auto multfun_typed_ptr = reinterpret_cast<multfun_type>(pRawFun_);
+			if (_pUserData == nullptr) {
+				auto multfun_typed_ptr = reinterpret_cast<multfun_type>(_pRawFun);
 				return (*multfun_typed_ptr)(a_afArg, a_iArgc);
 			} else {
-				auto multfun_userdata_typed_ptr = reinterpret_cast<multfun_userdata_type>(pRawFun_);
-				return (*multfun_userdata_typed_ptr)(pUserData_, a_afArg, a_iArgc);
+				auto multfun_userdata_typed_ptr = reinterpret_cast<multfun_userdata_type>(_pRawFun);
+				return (*multfun_userdata_typed_ptr)(_pUserData, a_afArg, a_iArgc);
 			}
 		}
 
 		template <std::size_t NbParams, typename... Args>
 		value_type call_strfun(Args&&... args) const
 		{
 			static_assert(NbParams == sizeof...(Args), "mismatch between NbParams and Args");
-			if (pUserData_ == nullptr) {
-				auto strfun_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::strfun_type>(pRawFun_);
+			if (_pUserData == nullptr) 
+			{
+				auto strfun_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::strfun_type>(_pRawFun);
 				return (*strfun_typed_ptr)(std::forward<Args>(args)...);
-			} else {
-				auto strfun_userdata_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::strfun_userdata_type>(pRawFun_);
-				return (*strfun_userdata_typed_ptr)(pUserData_, std::forward<Args>(args)...);
+			} 
+			else 
+			{
+				auto strfun_userdata_typed_ptr = reinterpret_cast<typename TplCallType<NbParams>::strfun_userdata_type>(_pRawFun);
+				return (*strfun_userdata_typed_ptr)(_pUserData, std::forward<Args>(args)...);
 			}
 		}
 
-		bool operator==(generic_callable_type other) const { return pRawFun_ == other.pRawFun_ && pUserData_ == other.pUserData_; }
-		explicit operator bool() const { return pRawFun_ != nullptr; }
-		bool operator==(std::nullptr_t) const { return pRawFun_ == nullptr; }
-		bool operator!=(std::nullptr_t) const { return pRawFun_ != nullptr; }
+		bool operator==(generic_callable_type other) const 
+		{
+			return _pRawFun == other._pRawFun && _pUserData == other._pUserData; 
+		}
+
+		explicit operator bool() const 
+		{
+			return _pRawFun != nullptr; 
+		}
+
+		bool operator==(std::nullptr_t) const 
+		{
+			return _pRawFun == nullptr; 
+		}
+
+		bool operator!=(std::nullptr_t) const 
+		{
+			return _pRawFun != nullptr; 
+		}
 	};
+
 	static_assert(std::is_trivial<generic_callable_type>::value, "generic_callable_type shall be trivial");
 	static_assert(std::is_standard_layout<generic_callable_type>::value, "generic_callable_type shall have standard layout");
 	// C++17: static_assert(std::is_aggregate<generic_callable_type>::value, "generic_callable_type shall be an aggregate");

diff --git a/include/muParserTokenReader.h b/include/muParserTokenReader.h
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/samples/example1/example1.cpp b/samples/example1/example1.cpp
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:
@@ -455,7 +455,7 @@ static void Calc()
 	parser.DefineFun(_T("strfun0"), StrFun0);
 	parser.DefineFun(_T("strfun2"), StrFun2);
 	parser.DefineFun(_T("ping"), Ping);
-	parser.DefineFun(_T("rnd"), Rnd);     // Add an unoptimizeable function
+	parser.DefineFun(_T("rnd"), Rnd, false);     // Add an unoptimizeable function
 	parser.DefineFun(_T("throw"), ThrowAnException);
 
 	parser.DefineOprt(_T("add"), Add, 0);
@@ -466,7 +466,7 @@ static void Calc()
 	parser.DefineFun(_T("selftest"), SelfTest);
 	parser.DefineFun(_T("help"), Help);
 	parser.DefineFun(_T("arg2of2"), Arg2Of2);
-	parser.DefineFun(_T("arg1of2"), Arg1Of2);
+	parser.DefineFun(_T("arg1of2"), Arg1Of2, false);
 
 	parser.DefinePostfixOprt(_T("{ft}"), Milli);
 	parser.DefinePostfixOprt(_T("ft"), Milli);

diff --git a/samples/example2/example2.c b/samples/example2/example2.c
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
 		 \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
 	Redistribution and use in source and binary forms, with or without modification, are permitted
 	provided that the following conditions are met:

diff --git a/samples/example3/example3.cpp b/samples/example3/example3.cpp
@@ -5,7 +5,7 @@
    |  Y Y  \  |  /  |_> > __ \|  | \/\___ \\  ___/|  | \/
    |__|_|  /____/|   __(____  /__|  /____  >\___  >__|
        \/      |__|       \/           \/     \/
-   Copyright (C) 2004 - 2020 Ingo Berg
+   Copyright (C) 2004 - 2021 Ingo Berg
 
    Redistribution and use in source and binary forms, with or without modification, are permitted
    provided that the following conditions are met: