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

[apps] Clean the syntax error warning displaying

Browse Source
This commit is contained in:
Léa Saviot
2018-11-19 16:21:29 +01:00
committed by Émilie Feral
parent 97d7955d15
commit f5586b3d36
6 changed files with 12 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/calculation/app.cpp
View File

@@ -61,7 +61,7 @@ bool App::layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::E
return Shared::ExpressionFieldDelegateApp::layoutFieldDidReceiveEvent(layoutField, event);
}
bool App::isAcceptableExpression(const Poincare::Expression expression, Responder * responder) {
bool App::isAcceptableExpression(const Poincare::Expression expression) {
/* Here, we check that the expression entered by the user can be printed with
* less than k_printedExpressionLength characters. Otherwise, we prevent the
* user from adding this expression to the calculation store. */

2
apps/calculation/app.h
View File

@@ -30,7 +30,7 @@ public:
bool textFieldDidReceiveEvent(::TextField * textField, Ion::Events::Event event) override;
bool layoutFieldDidReceiveEvent(::LayoutField * layoutField, Ion::Events::Event event) override;
// TextFieldDelegateApp
bool isAcceptableExpression(const Poincare::Expression expression, Responder * responder) override;
bool isAcceptableExpression(const Poincare::Expression expression) override;
char XNT() override;
private:
App(Container * container, Snapshot * snapshot);

3
apps/calculation/edit_expression_controller.cpp
View File

@@ -130,7 +130,8 @@ bool EditExpressionController::inputViewDidReceiveEvent(Ion::Events::Event event
App * calculationApp = (App *)app();
/* The input text store in m_cacheBuffer might have beed correct the first
* time but then be too long when replacing ans in another context */
if (!calculationApp->isAcceptableText(m_cacheBuffer, calculationApp)) {
if (!calculationApp->isAcceptableText(m_cacheBuffer)) {
calculationApp->displayWarning(I18n::Message::SyntaxError);
return true;
}
m_calculationStore->push(m_cacheBuffer, calculationApp->localContext());

2
apps/shared/expression_field_delegate_app.cpp
View File

@@ -32,7 +32,7 @@ bool ExpressionFieldDelegateApp::layoutFieldDidReceiveEvent(LayoutField * layout
displayWarning(I18n::Message::SyntaxError);
return true;
}
if (!isAcceptableText(buffer, layoutField)) {
if (!isAcceptableText(buffer)) {
displayWarning(I18n::Message::SyntaxError);
return true;
}

15
apps/shared/text_field_delegate_app.cpp
View File

@@ -21,7 +21,8 @@ bool TextFieldDelegateApp::textFieldShouldFinishEditing(TextField * textField, I
bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) {
if (textField->isEditing() && textField->shouldFinishEditing(event)) {
if (!isAcceptableText(textField->text(), textField)) {
if (!isAcceptableText(textField->text())) {
textField->app()->displayWarning(I18n::Message::SyntaxError);
return true;
}
}
@@ -32,9 +33,9 @@ bool TextFieldDelegateApp::textFieldDidReceiveEvent(TextField * textField, Ion::
}
bool TextFieldDelegateApp::isAcceptableText(const char * text, Responder * responder) {
bool TextFieldDelegateApp::isAcceptableText(const char * text) {
Expression exp = Expression::parse(text);
return isAcceptableExpression(exp, responder);
return isAcceptableExpression(exp);
}
/* Protected */
@@ -60,18 +61,12 @@ bool TextFieldDelegateApp::isFinishingEvent(Ion::Events::Event event) {
return event == Ion::Events::OK || event == Ion::Events::EXE;
}
bool TextFieldDelegateApp::isAcceptableExpression(const Expression exp, Responder * responder) {
bool TextFieldDelegateApp::isAcceptableExpression(const Expression exp) {
if (exp.isUninitialized()) {
if (responder != nullptr) {
responder->app()->displayWarning(I18n::Message::SyntaxError);
}
return false;
}
if (exp.type() == ExpressionNode::Type::Store) {
// Most textfields do not allow Store "3->a" or "5->f(x)"
if (responder != nullptr) {
responder->app()->displayWarning(I18n::Message::StoreExpressionNotAllowed);
}
return false;
}
return true;

4
apps/shared/text_field_delegate_app.h
View File

@@ -17,12 +17,12 @@ public:
virtual char XNT();
bool textFieldShouldFinishEditing(TextField * textField, Ion::Events::Event event) override;
virtual bool textFieldDidReceiveEvent(TextField * textField, Ion::Events::Event event) override;
bool isAcceptableText(const char * text, Responder * responder);
bool isAcceptableText(const char * text);
protected:
TextFieldDelegateApp(Container * container, Snapshot * snapshot, ViewController * rootViewController);
bool fieldDidReceiveEvent(EditableField * field, Responder * responder, Ion::Events::Event event);
bool isFinishingEvent(Ion::Events::Event event);
virtual bool isAcceptableExpression(const Poincare::Expression expression, Responder * responder);
virtual bool isAcceptableExpression(const Poincare::Expression expression);
};
}