Math parser should allow apostrophe in variable name.
Apostrophe is actively used in French language. --HG-- branch : develop
This commit is contained in:
parent
0b407792d7
commit
ad48858f3d
|
@ -94,7 +94,7 @@ QT_WARNING_DISABLE_GCC("-Wattributes")
|
|||
inline QString NameRegExp()
|
||||
{
|
||||
//Same regexp in pattern.xsd shema file. Don't forget synchronize.
|
||||
return QStringLiteral("^([^0-9*/^+\\-=\\s()?%:;!.,`'\"]){1,1}([^*/^+\\-=\\s()?%:;!.,`'\"]){0,}$");
|
||||
return QStringLiteral("^([^0-9*/^+\\-=\\s()?%:;!.,`'\"]){1,1}([^*/^+\\-=\\s()?%:;!.,`\"]){0,}$");
|
||||
}
|
||||
|
||||
QT_WARNING_POP
|
||||
|
|
|
@ -69,7 +69,7 @@ void QmuFormulaBase::InitCharacterSets()
|
|||
<< "ЭųįҶرҲеԷňعθҺнԿفπÂхՇψÊэšՏÒUəÚѝŻşҤӑâeէŐımկòuշÕúտŔ";
|
||||
|
||||
// Defining identifier character sets
|
||||
DefineNameChars(QStringLiteral("0123456789_@#") + symbols.join(""));
|
||||
DefineNameChars(QStringLiteral("0123456789_@#'") + symbols.join(""));
|
||||
DefineOprtChars(symbols.join("") + QStringLiteral("+-*^/?<>=!$%&|~_"));
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user