updated copyright message

[modules/shaper.git] / src / ModelAPI / ModelAPI_Expression.cpp

diff --git a/src/ModelAPI/ModelAPI_Expression.cpp b/src/ModelAPI/ModelAPI_Expression.cpp
index 3bba79c8c12108e9b0a1dda75baae3ee7a6640e0..44c3679a5bae74b17ccef4fd637ea5c21eaabc44 100644 (file)
--- a/src/ModelAPI/ModelAPI_Expression.cpp
+++ b/src/ModelAPI/ModelAPI_Expression.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2023  CEA, EDF
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -12,14 +12,17 @@
 //
 // You should have received a copy of the GNU Lesser General Public
 // License along with this library; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include "ModelAPI_Expression.h"
 
+#include <Locale_Convert.h>
+
+#include <cwctype>
+
 ModelAPI_Expression::ModelAPI_Expression()
 {
 
@@ -50,17 +53,23 @@ ModelAPI_ExpressionInteger::ModelAPI_ExpressionInteger()
 
 
 }
+
 bool ModelAPI_Expression::isVariable(const std::string& theString)
+{
+  return isVariable(Locale::Convert::toWString(theString));
+}
+
+bool ModelAPI_Expression::isVariable(const std::wstring& theString)
 {
   if (theString.empty())
     return false;
   try {
-    std::string::const_iterator it = theString.begin();
-    if (!(isalpha(*it) || (*it) == '_') || it == theString.end())
+    std::wstring::const_iterator it = theString.begin();
+    if (!(iswalpha(*it) || (*it) == L'_') || it == theString.end())
       return false;
     it++;
     for ( ; it != theString.end(); ++it ) {
-      if(!(isalnum(*it) || (*it) == '_')) {
+      if(!(iswalnum(*it) || (*it) == L'_')) {
         return false;
       }
     }