SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

git-svn-id: svn://db.shs.com.ru/pip@317 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2017-03-10 20:18:04 +00:00
parent d0842d29f6
commit 286b63e93d
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/math/pievaluator.cpp
View File

@@ -309,15 +309,20 @@ void PIEvaluator::replaceOperators() {
currentString.replaceAll("<=", "{"); currentString.replaceAll("<=", "{");
currentString.replaceAll("&&", "&"); currentString.replaceAll("&&", "&");
currentString.replaceAll("||", "|"); currentString.replaceAll("||", "|");
currentString.replaceAll(PIString::fromUTF8("≠"), ":");
currentString.replaceAll(PIString::fromUTF8("≥"), "}");
currentString.replaceAll(PIString::fromUTF8("≤"), "{");
currentString.replaceAll(PIString::fromUTF8("⋀"), "&");
currentString.replaceAll(PIString::fromUTF8("⋁"), "|");
} }
void PIEvaluator::makeOutput(PIString & string) { void PIEvaluator::makeOutput(PIString & string) {
string.replaceAll(":", "≠"); string.replaceAll(":", PIString::fromUTF8("≠"));
string.replaceAll("}", "≥"); string.replaceAll("}", PIString::fromUTF8("≥"));
string.replaceAll("{", "≤"); string.replaceAll("{", PIString::fromUTF8("≤"));
string.replaceAll("&", "⋀"); string.replaceAll("&", PIString::fromUTF8("⋀"));
string.replaceAll("|", "⋁"); string.replaceAll("|", PIString::fromUTF8("⋁"));
} }
@@ -984,13 +989,13 @@ PIString PIEvaluator::operationChar(const PIEvaluatorTypes::Operation & operatio
case PIEvaluatorTypes::oPower: return "^"; case PIEvaluatorTypes::oPower: return "^";
case PIEvaluatorTypes::oResidue: return "%"; case PIEvaluatorTypes::oResidue: return "%";
case PIEvaluatorTypes::oEqual: return "="; case PIEvaluatorTypes::oEqual: return "=";
case PIEvaluatorTypes::oNotEqual: return ("≠"); case PIEvaluatorTypes::oNotEqual: return PIString::fromUTF8("≠");
case PIEvaluatorTypes::oGreaterEqual: return ("≥"); case PIEvaluatorTypes::oGreaterEqual: return PIString::fromUTF8("≥");
case PIEvaluatorTypes::oSmallerEqual: return ("≤"); case PIEvaluatorTypes::oSmallerEqual: return PIString::fromUTF8("≤");
case PIEvaluatorTypes::oGreater: return ">"; case PIEvaluatorTypes::oGreater: return ">";
case PIEvaluatorTypes::oSmaller: return "<"; case PIEvaluatorTypes::oSmaller: return "<";
case PIEvaluatorTypes::oAnd: return ("⋀"); case PIEvaluatorTypes::oAnd: return PIString::fromUTF8("⋀");
case PIEvaluatorTypes::oOr: return ("⋁"); case PIEvaluatorTypes::oOr: return PIString::fromUTF8("⋁");
default: return "???"; default: return "???";
} }
} }

9
src/system/piprocess.cpp
View File

@@ -193,9 +193,14 @@ void PIProcess::startProc(bool detached) {
void PIProcess::terminate() { void PIProcess::terminate() {
#ifdef WINDOWS #ifdef WINDOWS
if (is_exec) if (!TerminateProcess(pi.hProcess, 0)) return; pi.dwProcessId = 0; if (is_exec)
if (!TerminateProcess(pi.hProcess, 0))
return;
pi.dwProcessId = 0;
#else #else
if (is_exec) kill(pid, SIGKILL); pid = 0; if (is_exec)
kill(pid, SIGKILL);
pid = 0;
#endif #endif
} }