From 2b1bd5c1914819cacbb81cfaa12a57f96607949c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=89milie=20Feral?= Date: Fri, 22 Sep 2017 13:21:55 +0200 Subject: [PATCH] [poincare] In context: clean setExpressionForSymbol Change-Id: I13f51a6c84537be43de3b78de68e77fade502344 --- apps/calculation/local_context.cpp | 2 +- apps/calculation/local_context.h | 2 +- poincare/include/poincare/context.h | 2 +- poincare/include/poincare/global_context.h | 2 +- poincare/include/poincare/variable_context.h | 2 +- poincare/src/global_context.cpp | 2 +- poincare/src/store.cpp | 2 +- poincare/src/variable_context.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/apps/calculation/local_context.cpp b/apps/calculation/local_context.cpp index 1f9983d1e..5137482d5 100644 --- a/apps/calculation/local_context.cpp +++ b/apps/calculation/local_context.cpp @@ -18,7 +18,7 @@ Evaluation * LocalContext::ansValue() { return lastCalculation->output(m_parentContext); } -void LocalContext::setExpressionForSymbolName(Expression * expression, const Symbol * symbol) { +void LocalContext::setExpressionForSymbolName(const Expression * expression, const Symbol * symbol) { if (symbol->name() != Symbol::SpecialSymbols::Ans) { m_parentContext->setExpressionForSymbolName(expression, symbol); } diff --git a/apps/calculation/local_context.h b/apps/calculation/local_context.h index d8791577a..786a6a5e3 100644 --- a/apps/calculation/local_context.h +++ b/apps/calculation/local_context.h @@ -9,7 +9,7 @@ namespace Calculation { class LocalContext : public Poincare::Context { public: LocalContext(Poincare::GlobalContext * parentContext, CalculationStore * calculationStore); - void setExpressionForSymbolName(Poincare::Expression * expression, const Poincare::Symbol * symbol) override; + void setExpressionForSymbolName(const Poincare::Expression * expression, const Poincare::Symbol * symbol) override; const Poincare::Expression * expressionForSymbol(const Poincare::Symbol * symbol) override; private: Poincare::Evaluation * ansValue(); diff --git a/poincare/include/poincare/context.h b/poincare/include/poincare/context.h index c098d64a6..6afe8bdce 100644 --- a/poincare/include/poincare/context.h +++ b/poincare/include/poincare/context.h @@ -9,7 +9,7 @@ namespace Poincare { class Context { public: virtual const Expression * expressionForSymbol(const Symbol * symbol) = 0; - virtual void setExpressionForSymbolName(Expression * expression, const Symbol * symbol) = 0; + virtual void setExpressionForSymbolName(const Expression * expression, const Symbol * symbol) = 0; }; } diff --git a/poincare/include/poincare/global_context.h b/poincare/include/poincare/global_context.h index 3d8108e3f..f28806244 100644 --- a/poincare/include/poincare/global_context.h +++ b/poincare/include/poincare/global_context.h @@ -25,7 +25,7 @@ public: return evaluationForSymbol(symbol); } const Evaluation * evaluationForSymbol(const Symbol * symbol); - void setExpressionForSymbolName(Expression * expression, const Symbol * symbol) override; + void setExpressionForSymbolName(const Expression * expression, const Symbol * symbol) override; static constexpr uint16_t k_maxNumberOfScalarExpressions = 26; static constexpr uint16_t k_maxNumberOfListExpressions = 10; static constexpr uint16_t k_maxNumberOfMatrixExpressions = 10; diff --git a/poincare/include/poincare/variable_context.h b/poincare/include/poincare/variable_context.h index 8dfbfeeb9..bd8e03f27 100644 --- a/poincare/include/poincare/variable_context.h +++ b/poincare/include/poincare/variable_context.h @@ -10,7 +10,7 @@ template class VariableContext : public Context { public: VariableContext(char name, Context * parentContext = nullptr); - void setExpressionForSymbolName(Expression * expression, const Symbol * symbol) override; + void setExpressionForSymbolName(const Expression * expression, const Symbol * symbol) override; const Expression * expressionForSymbol(const Symbol * symbol) override; private: char m_name; diff --git a/poincare/src/global_context.cpp b/poincare/src/global_context.cpp index d7e4d5ad0..d0158d84a 100644 --- a/poincare/src/global_context.cpp +++ b/poincare/src/global_context.cpp @@ -64,7 +64,7 @@ const Evaluation * GlobalContext::evaluationForSymbol(const Symbol * sym return m_expressions[index]; } -void GlobalContext::setExpressionForSymbolName(Expression * expression, const Symbol * symbol) { +void GlobalContext::setExpressionForSymbolName(const Expression * expression, const Symbol * symbol) { if (symbol->isMatrixSymbol()) { int indexMatrix = symbol->name() - (char)Symbol::SpecialSymbols::M0; assert(indexMatrix >= 0 && indexMatrix < k_maxNumberOfMatrixExpressions); diff --git a/poincare/src/store.cpp b/poincare/src/store.cpp index 56948fe25..cd1127039 100644 --- a/poincare/src/store.cpp +++ b/poincare/src/store.cpp @@ -39,7 +39,7 @@ ExpressionLayout * Store::privateCreateLayout(FloatDisplayMode floatDisplayMode, template Evaluation * Store::templatedEvaluate(Context& context, AngleUnit angleUnit) const { - context.setExpressionForSymbolName(const_cast(value()), symbol()); + context.setExpressionForSymbolName(value(), symbol()); if (context.expressionForSymbol(symbol()) != nullptr) { return context.expressionForSymbol(symbol())->evaluate(context, angleUnit); } diff --git a/poincare/src/variable_context.cpp b/poincare/src/variable_context.cpp index 7b9096054..067c67a8a 100644 --- a/poincare/src/variable_context.cpp +++ b/poincare/src/variable_context.cpp @@ -16,7 +16,7 @@ VariableContext::VariableContext(char name, Context * parentContext) : } template -void VariableContext::setExpressionForSymbolName(Expression * expression, const Symbol * symbol) { +void VariableContext::setExpressionForSymbolName(const Expression * expression, const Symbol * symbol) { if (symbol->name() == m_name) { if (expression == nullptr) { return;