feat: math expressions in input fields#1106
Draft
lucasser wants to merge 2 commits intorefinedmods:developfrom
Draft
feat: math expressions in input fields#1106lucasser wants to merge 2 commits intorefinedmods:developfrom
lucasser wants to merge 2 commits intorefinedmods:developfrom
Conversation
raoulvdberge
requested changes
Aug 11, 2025
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
2 times, most recently
from
f6b2638 to
3720b7b
Compare
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
2 times, most recently
from
73e9574 to
5d2c8d7
Compare
Contributor
Author
|
I added an ifValidOrElse method to ParsedValue to use instead of ifpresentorelse, idk if that works. Other than everything should be fixed. |
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
6 times, most recently
from
0a3390b to
15bb80f
Compare
raoulvdberge
requested changes
Aug 22, 2025
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
15bb80f to
9869bac
Compare
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
9869bac to
844026a
Compare
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
844026a to
5c598ca
Compare
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
5c598ca to
f79e188
Compare
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
f79e188 to
daeee48
Compare
Contributor
|
Please rebase on |
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
daeee48 to
626ea91
Compare
lucasser
force-pushed
the
feat/GH-834/expressions-in-input-no-error-handling
branch
from
626ea91 to
6ed6e76
Compare
raoulvdberge
requested changes
Apr 19, 2026
Contributor
raoulvdberge
left a comment
raoulvdberge
left a comment
There was a problem hiding this comment.
And rebase on develop please
| return Optional.ofNullable(value); | ||
| } | ||
|
|
||
| public boolean isValid() { |
Contributor
There was a problem hiding this comment.
Is the only use for ParseValue to indicate out of boundness? I don't care about reporting that error back to the user, so can we remove this class please?
| * Evaluate a math expression inside a string. | ||
| */ | ||
|
|
||
| public class Evaluator { |
Contributor
There was a problem hiding this comment.
MathExpressionEvaluator and then we can remove the comment on top of this class.
|
|
||
| public Evaluator(final Source source) { | ||
| if (source.content().isEmpty()) { | ||
| throw new EvaluatorException(""); |
| lexer = new Lexer(source, LexerTokenMappings.ARITHMETIC_MAPPINGS); | ||
| lexer.scan(); | ||
| } catch (LexerException e) { | ||
| throw new EvaluatorException("unrecognized character"); |
Contributor
There was a problem hiding this comment.
Always pass exception context along
Suggested change
| throw new EvaluatorException("unrecognized character"); | |
| throw new EvaluatorException("unrecognized character", e); |
| parser = new Parser(applyUnits(lexer.getTokens()), ParserOperatorMappings.ARITHMETIC_MAPPINGS); | ||
| parser.parse(); | ||
| } catch (ParserException e) { | ||
| throw new EvaluatorException("syntax error"); |
| @FieldsAndMethodsAreNonnullByDefault | ||
| package com.refinedmods.refinedstorage.query.evaluator; | ||
|
|
||
| import com.refinedmods.refinedstorage.api.core.FieldsAndMethodsAreNonnullByDefault; |
Contributor
There was a problem hiding this comment.
I don't think this exists in develop anymore?
| ### Added | ||
|
|
||
| - You can now configure Refined Storage to not require energy. Controllers are not necessary in this case. Creative variants of items will be hidden and items will function without energy. | ||
| - Support for entering math expressions when requesting a craft, creating a pattern, and configuring a detector. |
Contributor
There was a problem hiding this comment.
Suggested change
| - Support for entering math expressions when requesting a craft, creating a pattern, and configuring a detector. | |
| - Support for entering math expressions when requesting autocrafting, creating a processing pattern, and configuring a detector. |
|
|
||
| import static org.junit.jupiter.api.Assertions.assertEquals; | ||
|
|
||
| class EvaluatorTest { |
Contributor
There was a problem hiding this comment.
Where are the tests for the units?
| return e.getMessage(); | ||
| } | ||
| } | ||
|
|
Contributor
There was a problem hiding this comment.
I don't see any exception edge cases being tested. You probably want to run mutation testing here to check what you're missing!
| public class Evaluator { | ||
| private final Source source; | ||
| private final List<Node> nodes = new ArrayList<>(); | ||
| private final Map<String, Double> unitMap = Map.of( |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Implements #199