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@648 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

Browse Source
This commit is contained in:
Пелипенко Иван
2018-10-17 08:13:47 +00:00
parent 1548cba46e
commit 74a0743045
3 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src_main/math/pievaluator.cpp
View File

@@ -710,7 +710,7 @@ PIString PIEvaluator::preprocess(const PIString & string) {
lind = parse(currentString);
if (instructions.size() == 0) {
variables.push_back(PIEvaluatorTypes::Variable());
instructions.push_back(PIEvaluatorTypes::Instruction(PIEvaluatorTypes::oNone, PIVector<int>(1, lind), -variables.size_s()));
instructions.push_back(PIEvaluatorTypes::Instruction(PIEvaluatorTypes::oNone, PIVector<short>(1, lind), -variables.size_s()));
}
kvars = &(content.variables);
/*
@@ -762,7 +762,7 @@ int PIEvaluator::parse(const PIString & string, int offset) {
PIEvaluatorTypes::Function cfunc;
PIEvaluatorTypes::Operation coper;
PIString sbrackets, carg;
PIVector<int> args, atmp;
PIVector<short> args, atmp;
PIVector<PIEvaluatorTypes::Operation> opers;
///qDebug() << "to parse :" + string;
@@ -1271,12 +1271,13 @@ complexd PIEvaluator::evaluate() {
PIByteArray PIEvaluator::save() const {
PIByteArray ret;
ret << content << elements << currentVariables << unknownVars << variables << instructions << currentString << lastError << out << correct;
ret << content << currentVariables << unknownVars << instructions << currentString << lastError << out << correct;
return ret;
}
void PIEvaluator::load(PIByteArray ba) {
if (ba.size() <= 4) return;
ba >> content >> elements >> currentVariables >> unknownVars >> variables >> instructions >> currentString >> lastError >> out >> correct;
ba >> content >> currentVariables >> unknownVars >> instructions >> currentString >> lastError >> out >> correct;
variables = currentVariables;
}