UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused parameter of Poincare::Context::setExpressionForSymbolAbstract

Browse Source
This commit is contained in:
Ruben Dashyan
2019-09-16 11:45:37 +02:00
committed by LeaNumworks
parent 45d446face
commit ec9bf9b59b
11 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/sequence/cache_context.cpp
View File

@@ -28,8 +28,8 @@ const Expression CacheContext<T>::expressionForSymbolAbstract(const SymbolAbstra
}
template<typename T>
void CacheContext<T>::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol, Context * context) {
m_parentContext->setExpressionForSymbolAbstract(expression, symbol, context);
void CacheContext<T>::setExpressionForSymbolAbstract(const Expression & expression, const SymbolAbstract & symbol) {
m_parentContext->setExpressionForSymbolAbstract(expression, symbol);
}
template<typename T>

2
apps/sequence/cache_context.h
View File

@@ -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);

4
apps/sequence/sequence_context.h
View File

@@ -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<typename T> T valueOfSequenceAtPreviousRank(int sequenceIndex, int rank) const {
if (sizeof(T) == sizeof(float)) {

2
apps/shared/global_context.cpp
View File

@@ -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());

5
apps/shared/global_context.h
View File

@@ -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

4
apps/shared/store_context.cpp
View File

@@ -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);
}
}

2
apps/shared/store_context.h
View File

@@ -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;

2
poincare/include/poincare/context.h
View File

@@ -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;
};
}

2
poincare/include/poincare/variable_context.h
View File

@@ -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:

2
poincare/src/store.cpp
View File

@@ -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()) {

4
poincare/src/variable_context.cpp
View File

@@ -19,7 +19,7 @@ void VariableContext::setApproximationForVariable(T value) {
m_value = Float<T>::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);
}
}