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

[apps] StorageExpressionModel stores both name and record

Browse Source
This commit is contained in:
Léa Saviot
2018-10-04 11:35:14 +02:00
committed by Émilie Feral
parent 1aa1ee3001
commit dd01a57ba4
4 changed files with 32 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
apps/shared/storage_expression_model.cpp
View File

@@ -8,15 +8,24 @@ using namespace Poincare;
namespace Shared {
StorageExpressionModel::StorageExpressionModel(Ion::Storage::Record record) :
m_record(record),
StorageExpressionModel::StorageExpressionModel(const char * name) :
m_name(name),
m_expression(),
m_layout()
m_layout(),
m_record()
{
}
StorageExpressionModel::StorageExpressionModel(Ion::Storage::Record record) :
m_name(record.fullName()),
m_expression(),
m_layout(),
m_record(record)
{
}
void StorageExpressionModel::destroy() {
m_record.destroy();
record().destroy();
}
void StorageExpressionModel::text(char * buffer, size_t bufferSize) const {
@@ -25,7 +34,7 @@ void StorageExpressionModel::text(char * buffer, size_t bufferSize) const {
Expression StorageExpressionModel::expression() const {
if (m_expression.isUninitialized()) {
m_expression = Expression::ExpressionFromRecord(m_record);
m_expression = Expression::ExpressionFromRecord(record());
}
return m_expression;
}
@@ -42,11 +51,11 @@ Layout StorageExpressionModel::layout() {
}
bool StorageExpressionModel::isDefined() {
return !m_record.isNull();
return !record().isNull();
}
bool StorageExpressionModel::isEmpty() {
return m_record.isNull();
return record().isNull();
}
void StorageExpressionModel::setContent(const char * c) {
@@ -57,7 +66,7 @@ void StorageExpressionModel::setContent(const char * c) {
Symbol xUnknown = Symbol(x, 1);
expressionToStore = expressionToStore.replaceSymbolWithExpression(Symbol("x", 1), xUnknown);
Ion::Storage::Record::Data newData = {.buffer = expressionToStore.addressInPool(), .size = expressionToStore.size()};
m_record.setValue(newData);
record().setValue(newData);
/* We cannot call tidy here because tidy is a virtual function and does not
* do the same thing for all children class. And here we want to delete only
* the m_layout and m_expression. */
@@ -70,4 +79,11 @@ void StorageExpressionModel::tidy() {
m_expression = Expression();
}
Ion::Storage::Record StorageExpressionModel::record() const {
if (m_record.isNull()) {
m_record = Ion::Storage::sharedStorage()->recordNamed(m_name);
}
return m_record;
}
}