Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Opt-out of std::locale via cmake -DENABLE_LOCALE=N #134

Closed
wants to merge 1 commit into from
Closed

Opt-out of std::locale via cmake -DENABLE_LOCALE=N #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ set(MUPARSER_VERSION ${MUPARSER_VERSION_MAJOR}.${MUPARSER_VERSION_MINOR}.${MUPAR

# Build options
option(ENABLE_SAMPLES "Build the samples" ON)
option(ENABLE_LOCALE "Enable std::locale support" ON)
option(ENABLE_OPENMP "Enable OpenMP for multithreading" ON)
option(ENABLE_WIDE_CHAR "Enable wide character support" OFF)
option(BUILD_SHARED_LIBS "Build shared/static libs" ON)
Expand Down Expand Up @@ -72,6 +73,12 @@ if(ENABLE_WIDE_CHAR)
target_compile_definitions(muparser PUBLIC _UNICODE)
endif()

if(ENABLE_LOCALE)
else()
target_compile_definitions(muparser PUBLIC MUPARSER_NO_LOCALE)
add_definitions( -DMUPARSER_NO_LOCALE )
endif()

set_target_properties(muparser PROPERTIES
VERSION ${MUPARSER_VERSION}
SOVERSION ${MUPARSER_VERSION_MAJOR}
Expand Down
9 changes: 8 additions & 1 deletion include/muParserBase.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,12 @@
#include <iostream>
#include <map>
#include <memory>
#include <locale>
#include <limits.h>

#if !defined(MUPARSER_NO_LOCALE)
#include <locale>
#endif

//--- Parser includes --------------------------------------------------------------------------
#include "muParserDef.h"
#include "muParserTokenReader.h"
Expand Down Expand Up @@ -119,9 +122,11 @@ namespace mu
void SetExpr(const string_type& a_sExpr);
void SetVarFactory(facfun_type a_pFactory, void* pUserData = nullptr);

#if !defined(MUPARSER_NO_LOCALE)
void SetDecSep(char_type cDecSep);
void SetThousandsSep(char_type cThousandsSep = 0);
void ResetLocale();
#endif

void EnableOptimizer(bool a_bIsOn = true);
void EnableBuiltInOprt(bool a_bIsOn = true);
Expand Down Expand Up @@ -205,7 +210,9 @@ namespace mu
virtual void OnDetectVar(string_type* pExpr, int& nStart, int& nEnd);

static const char_type* c_DefaultOprt[];
#if !defined(MUPARSER_NO_LOCALE)
static std::locale s_locale; ///< The locale used by the parser
#endif
static bool g_DbgDumpCmdCode;
static bool g_DbgDumpStack;

Expand Down
2 changes: 2 additions & 0 deletions src/muParser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ namespace mu

stringstream_type stream(a_szExpr);
stream.seekg(0); // todo: check if this really is necessary
#if !defined(MUPARSER_NO_LOCALE)
stream.imbue(Parser::s_locale);
#endif
stream >> fVal;
stringstream_type::pos_type iEnd = stream.tellg(); // Position after reading

Expand Down
11 changes: 10 additions & 1 deletion src/muParserBase.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,13 @@
#include <vector>
#include <deque>
#include <sstream>
#include <locale>
#include <cassert>
#include <cctype>

#if !defined(MUPARSER_NO_LOCALE)
#include <locale>
#endif

#ifdef MUP_USE_OPENMP

#include <omp.h>
Expand All @@ -59,7 +62,9 @@ using namespace std;

namespace mu
{
#if !defined(MUPARSER_NO_LOCALE)
std::locale ParserBase::s_locale = std::locale(std::locale::classic(), new change_dec_sep<char_type>('.'));
#endif

bool ParserBase::g_DbgDumpCmdCode = false;
bool ParserBase::g_DbgDumpStack = false;
Expand Down Expand Up @@ -193,6 +198,7 @@ namespace mu
m_sInfixOprtChars = a_Parser.m_sInfixOprtChars;
}

#if !defined(MUPARSER_NO_LOCALE)
//---------------------------------------------------------------------------
/** \brief Set the decimal separator.
\param cDecSep Decimal separator as a character value.
Expand Down Expand Up @@ -232,6 +238,7 @@ namespace mu
s_locale = std::locale(std::locale("C"), new change_dec_sep<char_type>('.'));
SetArgSep(',');
}
#endif

//---------------------------------------------------------------------------
/** \brief Initialize the token reader.
Expand Down Expand Up @@ -440,9 +447,11 @@ namespace mu
*/
void ParserBase::SetExpr(const string_type& a_sExpr)
{
#if !defined(MUPARSER_NO_LOCALE)
// Check locale compatibility
if (m_pTokenReader->GetArgSep() == std::use_facet<numpunct<char_type> >(s_locale).decimal_point())
Error(ecLOCALE);
#endif

// Check maximum allowed expression length. An arbitrary value small enough so i can debug expressions sent to me
if (a_sExpr.length() >= MaxLenExpression)
Expand Down
2 changes: 2 additions & 0 deletions src/muParserDLL.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1093,6 +1093,7 @@ API_EXPORT(void) mupSetArgSep(muParserHandle_t a_hParser, const muChar_t cArgSep
}


#if !defined(MUPARSER_NO_LOCALE)
API_EXPORT(void) mupResetLocale(muParserHandle_t a_hParser)
{
MU_TRY
Expand All @@ -1118,6 +1119,7 @@ API_EXPORT(void) mupSetThousandsSep(muParserHandle_t a_hParser, const muChar_t c
p->SetThousandsSep(cThousandsSep);
MU_CATCH
}
#endif

//---------------------------------------------------------------------------
/** \brief Retrieve name and value of a single parser constant.
Expand Down