From ec9bf9b59bc039fbb10a19689c64430c99894882 Mon Sep 17 00:00:00 2001 From: Ruben Dashyan Date: Mon, 16 Sep 2019 11:45:37 +0200 Subject: [PATCH] Remove unused parameter of Poincare::Context::setExpressionForSymbolAbstract --- apps/sequence/cache_context.cpp | 4 ++-- apps/sequence/cache_context.h | 2 +- apps/sequence/sequence_context.h | 4 ++-- apps/shared/global_context.cpp | 2 +- apps/shared/global_context.h | 5 +---- apps/shared/store_context.cpp | 4 ++-- apps/shared/store_context.h | 2 +- poincare/include/poincare/context.h | 2 +- poincare/include/poincare/variable_context.h | 2 +- poincare/src/store.cpp | 2 +- poincare/src/variable_context.cpp | 4 ++-- 11 files changed, 15 insertions(+), 18 deletions(-) diff --git a/apps/sequence/cache_context.cpp b/apps/sequence/cache_context.cpp index 6b438882a..bac977d7b 100644 --- a/apps/sequence/cache_context.cpp +++ b/apps/sequence/cache_context.cpp @@ -28,8 +28,8 @@ const Expression CacheContext::expressionForSymbolAbstract(const SymbolAbstra } template -void CacheContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) { - m_parentContext->setExpressionForSymbolAbstract(expression, symbol, context); +void CacheContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) { + m_parentContext->setExpressionForSymbolAbstract(expression, symbol); } template diff --git a/apps/sequence/cache_context.h b/apps/sequence/cache_context.h index 85696dc36..26191b8b6 100644 --- a/apps/sequence/cache_context.h +++ b/apps/sequence/cache_context.h @@ -13,7 +13,7 @@ class CacheContext : public Poincare::Context { public: CacheContext(Poincare::Context * parentContext); const Poincare::Expression expressionForSymbolAbstract(const Poincare::SymbolAbstract & symbol, bool clone) override; - void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol, Poincare::Context * context) override; + void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol) override; void setValueForSymbol(T value, const Poincare::Symbol & symbol); private: int nameIndexForSymbol(const Poincare::Symbol & symbol); diff --git a/apps/sequence/sequence_context.h b/apps/sequence/sequence_context.h index 7be29efe5..91d3067a4 100644 --- a/apps/sequence/sequence_context.h +++ b/apps/sequence/sequence_context.h @@ -48,8 +48,8 @@ public: const Poincare::Expression expressionForSymbolAbstract(const Poincare::SymbolAbstract & symbol, bool clone) override { return m_parentContext->expressionForSymbolAbstract(symbol, clone); } - void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol, Poincare::Context * context) override { - m_parentContext->setExpressionForSymbolAbstract(expression, symbol, context); + void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol) override { + m_parentContext->setExpressionForSymbolAbstract(expression, symbol); } template T valueOfSequenceAtPreviousRank(int sequenceIndex, int rank) const { if (sizeof(T) == sizeof(float)) { diff --git a/apps/shared/global_context.cpp b/apps/shared/global_context.cpp index 0489debbb..46b85092c 100644 --- a/apps/shared/global_context.cpp +++ b/apps/shared/global_context.cpp @@ -59,7 +59,7 @@ const Expression GlobalContext::expressionForSymbolAbstract(const SymbolAbstract return ExpressionForSymbolAndRecord(symbol, r); } -void GlobalContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) { +void GlobalContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) { /* If the new expression contains the symbol, replace it because it will be * destroyed afterwards (to be able to do A+2->A) */ Ion::Storage::Record record = SymbolAbstractRecordWithBaseName(symbol.name()); diff --git a/apps/shared/global_context.h b/apps/shared/global_context.h index 6233bc3f7..5e4caa14a 100644 --- a/apps/shared/global_context.h +++ b/apps/shared/global_context.h @@ -32,10 +32,7 @@ public: * The expression recorded in global context is already an expression. * Otherwise, we would need the context and the angle unit to evaluate it */ const Poincare::Expression expressionForSymbolAbstract(const Poincare::SymbolAbstract & symbol, bool clone) override; - void setExpressionForSymbolAbstract( - const Poincare::Expression & expression, - const Poincare::SymbolAbstract & symbol, - Poincare::Context * context) override; + void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol) override; private: // Expression getters diff --git a/apps/shared/store_context.cpp b/apps/shared/store_context.cpp index 321522fc3..a5b5229f8 100644 --- a/apps/shared/store_context.cpp +++ b/apps/shared/store_context.cpp @@ -7,8 +7,8 @@ using namespace Poincare; namespace Shared { -void StoreContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) { - m_parentContext->setExpressionForSymbolAbstract(expression, symbol, context); +void StoreContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) { + m_parentContext->setExpressionForSymbolAbstract(expression, symbol); } } diff --git a/apps/shared/store_context.h b/apps/shared/store_context.h index f1a8acd37..ad025fd40 100644 --- a/apps/shared/store_context.h +++ b/apps/shared/store_context.h @@ -19,7 +19,7 @@ public: {} void setParentContext(Poincare::Context * parentContext) { m_parentContext = parentContext; } void setSeriesPairIndex(int j) { m_seriesPairIndex = j; } - void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol, Poincare::Context * context) override; + void setExpressionForSymbolAbstract(const Poincare::Expression & expression, const Poincare::SymbolAbstract & symbol) override; protected: Shared::DoublePairStore * m_store; int m_seriesPairIndex; diff --git a/poincare/include/poincare/context.h b/poincare/include/poincare/context.h index 23189d0aa..ea4b42809 100644 --- a/poincare/include/poincare/context.h +++ b/poincare/include/poincare/context.h @@ -9,7 +9,7 @@ class SymbolAbstract; class Context { public: virtual const Expression expressionForSymbolAbstract(const SymbolAbstract & symbol, bool clone) = 0; - virtual void setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) = 0; + virtual void setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) = 0; }; } diff --git a/poincare/include/poincare/variable_context.h b/poincare/include/poincare/variable_context.h index 5f52c7af3..e646d99bd 100644 --- a/poincare/include/poincare/variable_context.h +++ b/poincare/include/poincare/variable_context.h @@ -13,7 +13,7 @@ public: void setApproximationForVariable(T value); // Context - void setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) override; + void setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) override; const Expression expressionForSymbolAbstract(const SymbolAbstract & symbol, bool clone) override; private: diff --git a/poincare/src/store.cpp b/poincare/src/store.cpp index 5cf9cb8b7..aa2d63704 100644 --- a/poincare/src/store.cpp +++ b/poincare/src/store.cpp @@ -80,7 +80,7 @@ Expression Store::storeValueForSymbol(Context * context, Preferences::ComplexFor finalValue = childAtIndex(0); } assert(!finalValue.isUninitialized()); - context->setExpressionForSymbolAbstract(finalValue, symbol(), context); + context->setExpressionForSymbolAbstract(finalValue, symbol()); Expression storedExpression = context->expressionForSymbolAbstract(symbol(), true); if (storedExpression.isUninitialized()) { diff --git a/poincare/src/variable_context.cpp b/poincare/src/variable_context.cpp index f971f26f8..9f5b467c7 100644 --- a/poincare/src/variable_context.cpp +++ b/poincare/src/variable_context.cpp @@ -19,7 +19,7 @@ void VariableContext::setApproximationForVariable(T value) { m_value = Float::Builder(value); } -void VariableContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) { +void VariableContext::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) { if (strcmp(symbol.name(), m_name) == 0) { assert(symbol.type() == ExpressionNode::Type::Symbol); if (expression.isUninitialized()) { @@ -27,7 +27,7 @@ void VariableContext::setExpressionForSymbolAbstract(const Expression & expressi } m_value = expression.clone(); } else { - m_parentContext->setExpressionForSymbolAbstract(expression, symbol, context); + m_parentContext->setExpressionForSymbolAbstract(expression, symbol); } }