UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-24 08:10:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps] Add context parameter to fix tests

Browse Source
This commit is contained in:
Léa Saviot
2020-01-16 16:08:39 +01:00
parent 78adca7113
commit a3a1f86f8d
12 changed files with 35 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/shared/expression_model.cpp
View File

@@ -105,8 +105,8 @@ Layout ExpressionModel::layout(const Storage::Record * record, CodePoint symbol)
return m_layout;
}
Ion::Storage::Record::ErrorStatus ExpressionModel::setContent(Ion::Storage::Record * record, const char * c, CodePoint symbol) {
Expression e = ExpressionModel::BuildExpressionFromText(c, symbol);
Ion::Storage::Record::ErrorStatus ExpressionModel::setContent(Ion::Storage::Record * record, const char * c, Context * context, CodePoint symbol) {
Expression e = ExpressionModel::BuildExpressionFromText(c, symbol, context);
return setExpressionContent(record, e);
}
@@ -155,12 +155,12 @@ void ExpressionModel::tidy() const {
m_circular = -1;
}
Poincare::Expression ExpressionModel::BuildExpressionFromText(const char * c, CodePoint symbol) {
Poincare::Expression ExpressionModel::BuildExpressionFromText(const char * c, CodePoint symbol, Poincare::Context * context) {
Expression expressionToStore;
// if c = "", we want to reinit the Expression
if (c && *c != 0) {
// Compute the expression to store, without replacing symbols
expressionToStore = Expression::Parse(c, Container::activeApp()->localContext());
expressionToStore = Expression::Parse(c, context);
if (!expressionToStore.isUninitialized() && symbol != 0) {
expressionToStore = expressionToStore.replaceSymbolWithExpression(Symbol::Builder(symbol), Symbol::Builder(UCodePointUnknown));
}