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

[poincare/layout_helper] Simplify Infix and Prefix

Browse Source
This commit is contained in:
Ruben Dashyan
2019-11-13 11:24:24 +01:00
committed by Léa Saviot
parent ad938aed48
commit 51cc6a4d71
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
poincare/src/layout_helper.cpp
View File

@@ -11,13 +11,12 @@
namespace Poincare {
Layout LayoutHelper::Infix(const Expression & expression, Preferences::PrintFloatMode floatDisplayMode, int numberOfSignificantDigits, const char * operatorName) {
int numberOfChildren = expression.numberOfChildren();
assert(numberOfChildren > 1);
HorizontalLayout result = HorizontalLayout::Builder();
result.addOrMergeChildAtIndex(expression.childAtIndex(0).createLayout(floatDisplayMode, numberOfSignificantDigits), 0, true);
for (int i = 1; i < numberOfChildren; i++) {
size_t operatorLength = strlen(operatorName);
if (operatorLength > 0) {
const size_t operatorLength = strlen(operatorName);
const int numberOfChildren = expression.numberOfChildren();
assert(numberOfChildren > 1);
for (int i = 0; i < numberOfChildren; i++) {
if (i > 0 && operatorLength > 0) {
result.addOrMergeChildAtIndex(String(operatorName, operatorLength), result.numberOfChildren(), true);
}
result.addOrMergeChildAtIndex(
@@ -35,13 +34,12 @@ Layout LayoutHelper::Prefix(const Expression & expression, Preferences::PrintFlo
// Create the layout of arguments separated by commas.
HorizontalLayout args = HorizontalLayout::Builder();
int numberOfChildren = expression.numberOfChildren();
if (numberOfChildren > 0) {
args.addOrMergeChildAtIndex(expression.childAtIndex(0).createLayout(floatDisplayMode, numberOfSignificantDigits), 0, true);
for (int i = 1; i < numberOfChildren; i++) {
const int numberOfChildren = expression.numberOfChildren();
for (int i = 0; i < numberOfChildren; i++) {
if (i > 0) {
args.addChildAtIndex(CodePointLayout::Builder(','), args.numberOfChildren(), args.numberOfChildren(), nullptr);
args.addOrMergeChildAtIndex(expression.childAtIndex(i).createLayout(floatDisplayMode, numberOfSignificantDigits), args.numberOfChildren(), true);
}
args.addOrMergeChildAtIndex(expression.childAtIndex(i).createLayout(floatDisplayMode, numberOfSignificantDigits), args.numberOfChildren(), true);
}
// Add the parenthesed arguments.
result.addOrMergeChildAtIndex(Parentheses(args, false), result.numberOfChildren(), true);