From 84130236a80fffb0ae32b302eff1c55dce282c51 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Tue, 23 Jul 2019 16:56:45 +0200 Subject: [PATCH] [apps/shared/global_context] Inline SetExpressionForFunctionRecord --- apps/shared/global_context.cpp | 8 ++------ apps/shared/global_context.h | 3 --- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/shared/global_context.cpp b/apps/shared/global_context.cpp index dba7ec0a4..1f716aaa0 100644 --- a/apps/shared/global_context.cpp +++ b/apps/shared/global_context.cpp @@ -118,13 +118,13 @@ Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForActualSymbol(co return Ion::Storage::sharedStorage()->createRecordWithExtension(symbol.name(), Ion::Storage::expExtension, expression.addressInPool(), expression.size()); } -Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForFunctionRecord(Expression expressionToStore, Ion::Storage::Record previousRecord, const char * baseName) { +Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForFunction(const Expression & expressionToStore, const SymbolAbstract & symbol, Ion::Storage::Record previousRecord) { Ion::Storage::Record recordToSet = previousRecord; Ion::Storage::Record::ErrorStatus error = Ion::Storage::Record::ErrorStatus::None; if (!Ion::Storage::FullNameHasExtension(previousRecord.fullName(), Ion::Storage::funcExtension, strlen(Ion::Storage::funcExtension))) { // The previous record was not a function. Destroy it and create the new record. previousRecord.destroy(); - CartesianFunction newModel = CartesianFunction::NewModel(&error, baseName); + CartesianFunction newModel = CartesianFunction::NewModel(&error, symbol.name()); if (error != Ion::Storage::Record::ErrorStatus::None) { return error; } @@ -134,10 +134,6 @@ Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForFunctionRecord( return error; } -Ion::Storage::Record::ErrorStatus GlobalContext::SetExpressionForFunction(const Expression & expressionToStore, const SymbolAbstract & symbol, Ion::Storage::Record previousRecord) { - return SetExpressionForFunctionRecord(expressionToStore, previousRecord, symbol.name()); -} - Ion::Storage::Record GlobalContext::SymbolAbstractRecordWithBaseName(const char * name) { return Ion::Storage::sharedStorage()->recordBaseNamedWithExtensions(name, k_extensions, k_numberOfExtensions); } diff --git a/apps/shared/global_context.h b/apps/shared/global_context.h index 533420079..66518f8a7 100644 --- a/apps/shared/global_context.h +++ b/apps/shared/global_context.h @@ -26,9 +26,6 @@ public: static const Poincare::Layout LayoutForRecord(Ion::Storage::Record record); - // Set expression for record - static Ion::Storage::Record::ErrorStatus SetExpressionForFunctionRecord(Poincare::Expression e, Ion::Storage::Record record, const char * baseName); - // Destroy records static void DestroyRecordsBaseNamedWithoutExtension(const char * baseName, const char * extension);