Sitelet https://web.archive.org/web/20210816153057/https://github.com/OpenRCT2/OpenRCT2/issues/14093
Skip to content

/ OpenRCT2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

User defined literals for Money32 #14093

Open
duncanspumpkin opened this issue Feb 14, 2021 · 1 comment
Open

User defined literals for Money32 #14093

duncanspumpkin opened this issue Feb 14, 2021 · 1 comment
Labels
good first issue refactor

Comments

@duncanspumpkin
Copy link
Contributor

@duncanspumpkin duncanspumpkin commented Feb 14, 2021

We currently use a macro for writing down a money amount as a literal. We should move to a more modern C++ representation with a user defined literal like the below:

constexpr money32 operator"" _GBP(long double money)
{
    return money * 10;
}

static_assert(MONEY(2, 40) == 2.40_GBP);

Go through the codebase and replace all MONEY macro uses with the equivalent version. You might need to also make a helper function that can convert from a runtime value to money as the macro is currently used in one or two places.
@geoff-B
Copy link
Contributor

@geoff-B geoff-B commented Mar 1, 2021 •
edited

I'm interested in taking on this issue, but one quick question: Why does the money have to be multiplied by 10? Doesn't 2.40_GBP simply represent £2.40?

Nevermind, figured it out myself, it's because money32 is stored in multiples of 0.10.
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
OpenRCT2#14093 replace macro with user define literal
e6f87a6
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
OpenRCT2#14093 Scrappy way to replace MONEY macro in Localisation.cpp
211876a 
There should be a better way to do this, that would probably require the casting of the number to a long double, then checking it for overflow.
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: fix typos
4712e5a 
One underscore for UDL, not two
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: add helper fn to convert runtime values
a868292 
expression converts runtime values to money, replaces the function of the MONEY macro.
Fixed runtime uses of MONEY that were removed in the initial find and replace
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix: OpenRCT2#14093: Fix refrences in Finances,interactiveConsole wit…
e7ff216 
…h UDL, helper func
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: format code
560de5a
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: format common.h
99cc227
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B @Gymnasiast
Fix OpenRCT2#14093: 0_GBP -> 00_GBP to match formatting
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
3ba61c1 
Accepting suggestion, will do a proper search and replace later.

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: Replace all 0_GBP -> 00_GBP to match formatting
cbcc77a
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: Remove useless MONEY_FREE def
a71a7d2
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B @Gymnasiast
Fix OpenRCT2#14093: change int32_t -> money32 when referencing money
Verified
This commit was created on GitHub.com and signed with GitHub’s verified signature.
GPG key ID: 4AEE18F83AFDEB23 Learn about vigilant mode.
2f974ff 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: turn all MONEY defines into constexpr
47469c6 
Is the use of auto correct, or should it be in money32?
I am fairly new to C++, coming from C.
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 1, 2021
@geoff-B
Fix OpenRCT2#14093: Replace reference to removed MONEY_FREE
485c479
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 2, 2021
@geoff-B
Fix OpenRCT2#14093: Replace ENTRANCE_FEE define with constexpr
15fd139
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
OpenRCT2#14093 replace macro with user define literal
6424d5d
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
OpenRCT2#14093 Scrappy way to replace MONEY macro in Localisation.cpp
b263f78 
There should be a better way to do this, that would probably require the casting of the number to a long double, then checking it for overflow.
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: fix typos
9e2c765 
One underscore for UDL, not two
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: add helper fn to convert runtime values
328f6a7 
expression converts runtime values to money, replaces the function of the MONEY macro.
Fixed runtime uses of MONEY that were removed in the initial find and replace
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix: OpenRCT2#14093: Fix refrences in Finances,interactiveConsole wit…
9bc5d7e 
…h UDL, helper func
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: format code
994f3ca
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: format common.h
9d9e746
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B @Gymnasiast
Fix OpenRCT2#14093: 0_GBP -> 00_GBP to match formatting
4042392 
Accepting suggestion, will do a proper search and replace later.

Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: Replace all 0_GBP -> 00_GBP to match formatting
7437b5a
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: Remove useless MONEY_FREE def
0fab495
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: turn all MONEY defines into constexpr
da1a9e5 
Is the use of auto correct, or should it be in money32?
I am fairly new to C++, coming from C.
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B @Gymnasiast
Fix OpenRCT2#14093: change int32_t -> money32 when referencing money
933cec1 
Co-authored-by: Michael Steenbeek <m.o.steenbeek@gmail.com>
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: Replace reference to removed MONEY_FREE
211803e
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 3, 2021
@geoff-B
Fix OpenRCT2#14093: Replace ENTRANCE_FEE define with constexpr
a429b14
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 6, 2021
@geoff-B @duncanspumpkin
Part of OpenRCT2#14093: streamline money operations
19d9ac6 
 Replace old fraction and whole with single int, with overflow check

Co-Authored-By: Duncan <duncan.p.frost@gmail.com>
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 6, 2021
@geoff-B
Part of OpenRCT2#14093: C cast -> static_cast
90f30ed
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 6, 2021
@geoff-B
Part of OpenRCT2#14093 remove and replace MONEY function
022bbf7 
Instead of storing whole and decimal separately in MONEY function,
multiply doubles by 10 and cast to int32_t
function is not needed at all for ints
geoff-B added a commit to geoff-B/OpenRCT2 that referenced this issue Mar 6, 2021
@geoff-B
Part of OpenRCT2#14093: fix multiply by 10
0f66088
@extratone extratone mentioned this issue May 27, 2021
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
good first issue refactor
Projects
None yet
Milestone
No milestone
Linked pull requests

Successfully merging a pull request may close this issue.

None yet
2 participants
@duncanspumpkin @geoff-B