From cc1d51f331f1e27f367351b7819d2a115b7a91e5 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Fri, 13 Sep 2019 16:13:04 +0200 Subject: [PATCH] [apps/shared/expression_model] Substitute Expression::replaceSymbolWithExpression for replaceUnknown since the latter calls the former anyway. --- apps/shared/expression_model.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/shared/expression_model.cpp b/apps/shared/expression_model.cpp index e359c4e1a..015526c11 100644 --- a/apps/shared/expression_model.cpp +++ b/apps/shared/expression_model.cpp @@ -27,7 +27,7 @@ void ExpressionModel::text(const Storage::Record * record, char * buffer, size_t buffer[0] = 0; } else { if (symbol != 0 && !e.isUninitialized()) { - e = e.replaceUnknown(Symbol::Builder(UCodePointUnknownX), Symbol::Builder(symbol)); + e = e.replaceSymbolWithExpression(Symbol::Builder(UCodePointUnknownX), Symbol::Builder(symbol)); } e.serialize(buffer, bufferSize); } @@ -67,7 +67,7 @@ Layout ExpressionModel::layout(const Storage::Record * record, CodePoint symbol) if (m_layout.isUninitialized()) { Expression clone = expressionClone(record); if (!clone.isUninitialized() && symbol != 0) { - clone = clone.replaceUnknown(Symbol::Builder(UCodePointUnknownX), Symbol::Builder(symbol)); + clone = clone.replaceSymbolWithExpression(Symbol::Builder(UCodePointUnknownX), Symbol::Builder(symbol)); } m_layout = PoincareHelpers::CreateLayout(clone); if (m_layout.isUninitialized()) { @@ -134,7 +134,7 @@ Poincare::Expression ExpressionModel::BuildExpressionFromText(const char * c, Co // Compute the expression to store, without replacing symbols expressionToStore = Expression::Parse(c); if (!expressionToStore.isUninitialized() && symbol != 0) { - expressionToStore = expressionToStore.replaceUnknown(Symbol::Builder(symbol), Symbol::Builder(UCodePointUnknownX)); + expressionToStore = expressionToStore.replaceSymbolWithExpression(Symbol::Builder(symbol), Symbol::Builder(UCodePointUnknownX)); } } return expressionToStore;