mirror of
https://github.com/microsoft/PowerToys.git
synced 2026-02-23 19:49:43 +01:00
2d1676b7df
<!-- Enter a brief description/summary of your PR here. What does it fix/what does it change/how was it tested (even manually, if necessary)? --> ## Summary of the Pull Request This PR replaces the original Mages-based expression evaluation engine with a WinRT-wrapped version of Exprtk in the CmdPalCalculator module. ### Key Changes **Expression Engine:** - All expression parsing and evaluation now use Exprtk (via a WinRT wrapper) instead of Mages. **Base Conversion Handling:** - Since Exprtk does not support non-decimal (binary, octal, hexadecimal) input natively, added logic to convert all such inputs to decimal before evaluation. **Code Structure:** - The overall logic and API surface remain unchanged except for the engine and base conversion handling. - All previous Mages references and dependencies have been removed. <!-- Please review the items on the PR checklist before submitting--> ## PR Checklist - [ ] **Closes:** #xxx - [ ] **Communication:** I've discussed this with core contributors already. If work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end user facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx <!-- Describe how you validated the behavior. Add automated tests wherever possible, but list manual validation steps taken as well --> ## Validation Steps Performed
50 lines
1.8 KiB
C++
50 lines
1.8 KiB
C++
#include "ExprtkEvaluator.h"
|
|
#include "exprtk.hpp"
|
|
#include <iomanip>
|
|
#include <iostream>
|
|
#include <sstream>
|
|
|
|
namespace ExprtkCalculator::internal
|
|
{
|
|
|
|
std::wstring ToWStringFullPrecision(double value)
|
|
{
|
|
std::wostringstream oss;
|
|
oss << std::fixed << std::setprecision(15) << value;
|
|
return oss.str();
|
|
}
|
|
|
|
std::wstring EvaluateExpression(
|
|
const std::string& expressionText,
|
|
const std::unordered_map<std::string, double>& constants)
|
|
{
|
|
exprtk::symbol_table<double> symbol_table;
|
|
|
|
for (auto const& [name, value] : constants)
|
|
{
|
|
symbol_table.add_constant(name, value);
|
|
}
|
|
|
|
exprtk::expression<double> expression;
|
|
expression.register_symbol_table(symbol_table);
|
|
|
|
exprtk::parser<double> parser;
|
|
|
|
// Enable all base functions and arithmetic operators
|
|
parser.settings().enable_all_base_functions(); // Enable all base functions like sin, cos, log, etc.
|
|
parser.settings().enable_all_arithmetic_ops(); // Enable all arithmetic operators like +, -, *, /, etc.
|
|
|
|
// Disable all control structures and assignment operators to ensure only expressions are evaluated
|
|
parser.settings().disable_all_control_structures(); // Disable control structures like if, for, while, etc.
|
|
parser.settings().disable_all_assignment_ops(); // Disable assignment operators like =, +=, -=, etc.
|
|
|
|
// Disabled for now, but can be enabled later for enhanced functionality
|
|
parser.settings().disable_all_logic_ops(); // Disable logical operators like &&, ||, !, etc.
|
|
parser.settings().disable_all_inequality_ops(); // Disable inequality operators like <, >, <=, >=, !=, etc.
|
|
|
|
if (!parser.compile(expressionText, expression))
|
|
return L"NaN";
|
|
|
|
return ToWStringFullPrecision(expression.value());
|
|
}
|
|
} |