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

[poincare] Clean Expression and Layout builders

Browse Source 
Before: Opposite(Opposite(Rational(1))) misleadingly created the
expression "-1"; now, Opposite::Builder(Opposite::Builder(Rational(1)))
creates "--1"
This commit is contained in:
Émilie Feral
2019-01-28 17:44:08 +01:00
committed by LeaNumworks
parent b3d15d7e7f
commit ac6f23684d
113 changed files with 779 additions and 743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
poincare/src/vertical_offset_layout.cpp
View File

@@ -231,7 +231,7 @@ bool VerticalOffsetLayoutNode::willAddSibling(LayoutCursor * cursor, LayoutNode
// Add the Left parenthesis
int idxInParent = parentRef.indexOfChild(thisRef);
int leftParenthesisIndex = idxInParent;
LeftParenthesisLayout leftParenthesis = LeftParenthesisLayout();
LeftParenthesisLayout leftParenthesis = LeftParenthesisLayout::Builder();
int numberOfOpenParenthesis = 0;
while (leftParenthesisIndex > 0
&& parentRef.childAtIndex(leftParenthesisIndex-1).isCollapsable(&numberOfOpenParenthesis, true))
@@ -242,7 +242,7 @@ bool VerticalOffsetLayoutNode::willAddSibling(LayoutCursor * cursor, LayoutNode
idxInParent = parentRef.indexOfChild(thisRef);
// Add the Right parenthesis
RightParenthesisLayout rightParenthesis = RightParenthesisLayout();
RightParenthesisLayout rightParenthesis = RightParenthesisLayout::Builder();
if (cursor->position() == LayoutCursor::Position::Right) {
parentRef.addChildAtIndex(rightParenthesis, idxInParent + 1, parentRef.numberOfChildren(), nullptr);
} else {
@@ -266,11 +266,4 @@ LayoutNode * VerticalOffsetLayoutNode::baseLayout() {
return parentNode->childAtIndex(idxInParent - 1);
}
VerticalOffsetLayout::VerticalOffsetLayout(Layout l, VerticalOffsetLayoutNode::Type type) :
Layout(TreePool::sharedPool()->createTreeNode<VerticalOffsetLayoutNode>())
{
static_cast<VerticalOffsetLayoutNode *>(node())->setType(type);
replaceChildAtIndexInPlace(0,l);
}
}