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

[poincare] Factorize Symbol and Function code in SymbolAbstract

Browse Source
This commit is contained in:
Émilie Feral
2018-10-29 17:49:14 +01:00
parent 0cc7052d45
commit 138e955cfd
6 changed files with 31 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
poincare/src/function.cpp
View File

@@ -1,5 +1,4 @@
#include <poincare/function.h>
#include <poincare/helpers.h>
#include <poincare/layout_helper.h>
#include <poincare/parenthesis.h>
#include <poincare/rational.h>
@@ -10,25 +9,6 @@
namespace Poincare {
/* TreePool uses adresses and sizes that are multiples of 4 in order to make
* node moves faster.*/
static size_t NodeSize(size_t nameLength) {
return Helpers::AlignedSize(sizeof(FunctionNode)+nameLength+1, 4);
}
void FunctionNode::initToMatchSize(size_t goalSize) {
// TODO Factorize with symbol
assert(goalSize != sizeof(FunctionNode));
assert(goalSize > sizeof(FunctionNode));
size_t nameSize = goalSize - sizeof(FunctionNode);
SymbolAbstractNode::initName(nameSize);
assert(size() == goalSize);
}
size_t FunctionNode::size() const {
return NodeSize(strlen(m_name));
}
Expression FunctionNode::replaceSymbolWithExpression(const SymbolAbstract & symbol, const Expression & expression) {
return Function(this).replaceSymbolWithExpression(symbol, expression);
}
@@ -108,7 +88,7 @@ Evaluation<T> FunctionNode::templatedApproximate(Context& context, Preferences::
}
Function::Function(const char * name) :
Function(TreePool::sharedPool()->createTreeNode<FunctionNode>(NodeSize(strlen(name))))
Function(TreePool::sharedPool()->createTreeNode<FunctionNode>(SymbolAbstract::AlignedNodeSize(strlen(name), sizeof(FunctionNode))))
{
static_cast<FunctionNode *>(Expression::node())->setName(name, strlen(name));
}