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

[apps] Handle uninitialized expression and layout in ExpressionModel

Browse Source
This commit is contained in:
Léa Saviot
2018-10-04 11:37:30 +02:00
committed by Émilie Feral
parent 77f4a92787
commit 5e860bc0f5
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
apps/shared/storage_expression_model.cpp
View File

@@ -1,5 +1,6 @@
#include "storage_expression_model.h"
#include "poincare_helpers.h"
#include <poincare/horizontal_layout.h>
#include <string.h>
#include <cmath>
#include <assert.h>
@@ -29,7 +30,12 @@ void StorageExpressionModel::destroy() {
}
void StorageExpressionModel::text(char * buffer, size_t bufferSize) const {
expression().serialize(buffer, bufferSize);
Expression e = expression();
if (e.isUninitialized() && bufferSize > 0) {
buffer[0] = 0;
} else {
e.serialize(buffer, bufferSize);
}
}
Expression StorageExpressionModel::expression() const {
@@ -46,6 +52,9 @@ Expression StorageExpressionModel::reducedExpression(Poincare::Context * context
Layout StorageExpressionModel::layout() {
if (m_layout.isUninitialized()) {
m_layout = PoincareHelpers::CreateLayout(expression());
if (m_layout.isUninitialized()) {
m_layout = HorizontalLayout();
}
}
return m_layout;
}