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

[poincare] Expression: methods that should return an Expression HAVE to

Browse Source 
be implemented on Expression and not on ExpressionNode in order to copy
the returned Expression.
This commit is contained in:
Émilie Feral
2018-08-14 13:41:45 +02:00
parent dab9b5cd21
commit 67f4c3de77
5 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
poincare/src/expression_node.cpp
View File

@@ -5,7 +5,7 @@
namespace Poincare {
Expression ExpressionNode::replaceSymbolWithExpression(char symbol, Expression expression) const {
return Expression(this).privateReplaceSymbolWithExpression(symbol, expression);
return Expression(this).defaultReplaceSymbolWithExpression(symbol, expression);
}
Expression ExpressionNode::setSign(Sign s, Context & context, Preferences::AngleUnit angleUnit) const {
@@ -23,6 +23,7 @@ int ExpressionNode::polynomialDegree(char symbolName) const {
}
int ExpressionNode::getPolynomialCoefficients(char symbolName, Expression coefficients[]) const {
return Expression(this).defaultGetPolynomialCoefficients(symbolName, coefficients);
int deg = polynomialDegree(symbolName);
if (deg == 0) {
coefficients[0] = Expression(this);
@@ -76,12 +77,11 @@ int ExpressionNode::SimplificationOrder(const ExpressionNode * e1, const Express
}
Expression ExpressionNode::shallowReduce(Context & context, Preferences::AngleUnit angleUnit) const {
return Expression(this).simpleShallowReduce(context, angleUnit);
return Expression(this).defaultShallowReduce(context, angleUnit);
}
Expression ExpressionNode::shallowBeautify(Context & context, Preferences::AngleUnit angleUnit) const {
Expression result = Expression(this);
return result;
return Expression(this).defaultShallowBeautify(context, angleUnit);
}
bool ExpressionNode::isOfType(Type * types, int length) const {