[CmdPal Calculator] Fix issue for multi-argument functions where comma is both the number group separator and list separator#47731
Open
daverayment wants to merge 3 commits into
Conversation
… group separator and list separator. Add unit tests.
…oup separators. Added unit tests to confirm this and added nested expression and extra-space tests.
…(123,456.12)". Expanded unit tests.
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
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.
Summary of the Pull Request
This fixes Calculator functions with multiple arguments in cultures where the number group separator and list separator are identical, e.g. en-US and en-GB.
It maintains existing parsing behaviour for other cultures where the separators differ, e.g. de-DE.
PR Checklist
Detailed Description of the Pull Request / Additional comments
The root issue was in the number translation step. In cultures such as en-US, commas were being consumed as part of numeric tokens and were treated as number group separators, which broke functions whcih took multiple arguments. For example,
max(1,2)would be translated asmax(12)andpow(2,3)aspow(23). The number translator's result would be passed on to ExprTK, which could sometimes still interpret the input and would give a result (12in the case ofmax(1,2)); for cases likepow(2,3), it would surface an error, as the expressionpow(23)is invalid.This fix resolves the ambiguity in two ways:
max(123,456)are correctly interpreted as two arguments inside the function call, while123,456outside a function call is still interpreted as a grouped number.Care has been taken to preserve grouped numbers inside single-argument functions, e.g.
ceil(123,456.23).The more permissive parsing for cultures which do not have this ambiguity has been retained. (Arguably this is too loose, but that's something to consider separately.)
Validation Steps Performed
Added and updated unit tests, with en-US used as the representative 'ambiguous culture'. Coverage includes:
max(),min()andpow()ceil(),floor(),round(),log()andsin().All tests pass:
Manual testing was also performed to confirm: