Conversation
Updates the vendored muParserX code in core/src/main/cpp/parser to match equations-parser's current HEAD, merged via a 3-way merge (BASE=fe93ca5, LOCAL=Android customizations, UPSTREAM=ec64e60) instead of copying files by hand. Brings in the following equations-parser changes: - DUV-4103 Adding custom round with Up and down args (#59) - Remove deprecated std::binary_function inheritance for C++17 compatibility (#56) - Create current_time function (#53) - Create weekday(date) function (#50) - Create calculate(string) function (#48) - Remove logs from regex function - Create weekyear(date) function (#46) - Create regex(input, pattern) function (#45) - Improve unneeded ternary operator (#41) - Create helper functions inside EquationParser namespace (#43) - Fixing compilation error on GCC 11.3.0
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.
What this is
Updates the vendored equations-parser code in
core/src/main/cpp/parser, which had been stuck since commitfe93ca5(Nov/2022), up to the current HEADec64e60.Instead of copying files one by one, this was done with a 3-way merge (
git merge-file, BASE =fe93ca5, LOCAL = Android customizations, UPSTREAM =ec64e60), which applies upstream changes on top of the local customizations automatically.equations-parser commits brought in by this PR
ec64e603a79bde39ba4c43e0e34f39d949bb81e50b76b6aaa87691750012543bfd3d5a8c4fab5(Other commits from that period —
7428a00,e7650c1,a210f5d,a4606cd,fea0e4d,ecf9a64,af58a4c— only touched the equations-parser README, CMake config, or tests/CI, outside the vendoredparser/folder, so they have no effect here.)How the result was validated
Every new feature above was checked individually (class declared + defined + registered via
DefineFun), and every small removal/tweak (e.g. removingstd::binary_function, simplifying a ternary, the GCC 11.3 fix, removing debug logs) was confirmed present in the final result.Final comparison between
equations-parser/parser(HEAD) and this module'score/src/main/cpp/parser(run from the parent directory containing both repos as siblings):The only remaining differences are pre-existing Android-side formatting quirks (a stray blank line, a missing space before
{, indentation inside an#ifndefblock) — confirmed identical to their state before this sync, unrelated to any change in this PR. No functional/content difference. Every other file inparser/ended up byte-for-byte identical to upstream.Notes
equationsParser.cpp/h(new upstream sincebfd3d5a) was ported — it's a real dependency of thecalculate(s)function added in39d949b, not just optional convenience code (the build failed to link without it:undefined symbol: EquationsParser::Calc).coremodule (Debug, arm64-v8a and x86) via Android Studio.