UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-18 16:27:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

[poincare] Fix Expression::shallowReplaceReplaceableSymbols

Browse Source
This commit is contained in:
Léa Saviot
2018-11-23 14:45:44 +01:00
parent f81e221f50
commit 3273de4dac
3 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
poincare/include/poincare/expression.h
View File

@@ -247,6 +247,7 @@ protected:
int getPolynomialCoefficients(Context & context, const char * symbolName, Expression coefficients[]) const { return node()->getPolynomialCoefficients(context, symbolName, coefficients); }
bool hasReplaceableSymbols(Context & context) const;
Expression shallowReplaceReplaceableSymbols(Context & context) { return node()->shallowReplaceReplaceableSymbols(context); }
Expression defaultReplaceReplaceableSymbols(Context & context);
/* Simplification */
Expression denominator(Context & context, Preferences::AngleUnit angleUnit) const { return node()->denominator(context, angleUnit); }

8
poincare/src/expression.cpp
View File

@@ -238,6 +238,14 @@ bool Expression::hasReplaceableSymbols(Context & context) const {
}, context, false);
}
Expression Expression::defaultReplaceReplaceableSymbols(Context & context) {
int nbChildren = numberOfChildren();
for (int i = 0; i < nbChildren; i++) {
childAtIndex(i).shallowReplaceReplaceableSymbols(context);
}
return *this;
}
template<typename U>
Evaluation<U> Expression::approximateToEvaluation(Context& context, Preferences::AngleUnit angleUnit) const {
return node()->approximate(U(), context, angleUnit);

2
poincare/src/expression_node.cpp
View File

@@ -28,7 +28,7 @@ int ExpressionNode::getPolynomialCoefficients(Context & context, const char * sy
}
Expression ExpressionNode::shallowReplaceReplaceableSymbols(Context & context) {
return Expression(this);
return Expression(this).defaultReplaceReplaceableSymbols(context);
}
int ExpressionNode::getVariables(Context & context, isVariableTest isVariable, char * variables, int maxSizeVariable) const {