forks
/
arsd
mirror of https://github.com/adamdruppe/arsd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improve number readability and stop dscanner from complaining

This commit is contained in:
vabenil 2022-10-20 14:51:09 +03:00
parent ea9f199b29
commit 4b750685b1
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
english.d
View File

@ -49,34 +49,34 @@ string numberToEnglish(long number) {
if(number) if(number)
word ~= "-"; word ~= "-";
} }
} else if(number < 1000) { } else if(number < 1_000) {
auto hundreds = number / 100; auto hundreds = number / 100;
word ~= onesPlaceWords[cast(int) hundreds] ~ " hundred"; word ~= onesPlaceWords[cast(int) hundreds] ~ " hundred";
number = number % 100; number = number % 100;
if(number) if(number)
word ~= " and "; word ~= " and ";
} else if(number < 1000000) { } else if(number < 1_000_000) {
auto thousands = number / 1000; auto thousands = number / 1_000;
word ~= numberToEnglish(thousands) ~ " thousand"; word ~= numberToEnglish(thousands) ~ " thousand";
number = number % 1000; number = number % 1_000;
if(number) if(number)
word ~= ", "; word ~= ", ";
} else if(number < 1_000_000_000) { } else if(number < 1_000_000_000) {
auto millions = number / 1000000; auto millions = number / 1_000_000;
word ~= numberToEnglish(millions) ~ " million"; word ~= numberToEnglish(millions) ~ " million";
number = number % 1000000; number = number % 1_000_000;
if(number) if(number)
word ~= ", "; word ~= ", ";
} else if(number < 1_000_000_000_000) { } else if(number < 1_000_000_000_000) {
auto n = number / 1000000000; auto n = number / 1_000_000_000;
word ~= numberToEnglish(n) ~ " billion"; word ~= numberToEnglish(n) ~ " billion";
number = number % 1000000000; number = number % 1_000_000_000;
if(number) if(number)
word ~= ", "; word ~= ", ";
} else if(number < 1_000_000_000_000_000) { } else if(number < 1_000_000_000_000_000) {
auto n = number / 1000000000000; auto n = number / 1_000_000_000_000;
word ~= numberToEnglish(n) ~ " trillion"; word ~= numberToEnglish(n) ~ " trillion";
number = number % 1000000000000; number = number % 1_000_000_000_000;
if(number) if(number)
word ~= ", "; word ~= ", ";
} else { } else {