Skip to content

ICU-23347 Reduce construction time of RuleBasedNumberFormat #3917

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.

Sign up for GitHub

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

Open
grhoten wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ICU-23347 Reduce construction time of RuleBasedNumberFormat #3917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
152 changes: 76 additions & 76 deletions icu4c/source/data/rbnf/af.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,84 +4,84 @@
af{
RBNFRules{
OrdinalRules{
"%digits-ordinal:",
"-x: \u2212>>;",
"0: =#,##0=$(ordinal,few{de}other{ste})$;",
"%digits-ordinal:"
"-x: \u2212>>;"
"0: =#,##0=$(ordinal,few{de}other{ste})$;"
Comment on lines -7 to +9
Copy link
Copy Markdown
Member Author

@grhoten grhoten Mar 29, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All of the RBNF resource bundles are being changed from an array to a single string. These were generated from a recent copy of CLDR. Some recent changes & fixes in the main branch were included. I ignored all other changes from CLDR for this pull request.

}
SpelloutRules{
"%%2d-year:",
"0: honderd[ >%spellout-numbering>];",
"1: nul =%spellout-numbering=;",
"10: =%spellout-numbering=;",
"%spellout-numbering-year:",
"-x: min >>;",
"x.x: =0.0=;",
"0: =%spellout-numbering=;",
"1100/100: << >%%2d-year>;",
"10000: =%spellout-numbering=;",
"%spellout-numbering:",
"0: =%spellout-cardinal=;",
"%spellout-cardinal:",
"-x: min >>;",
"x.x: << komma >>;",
"0: nul;",
"1: een;",
"2: twee;",
"3: drie;",
"4: vier;",
"5: vyf;",
"6: ses;",
"7: sewe;",
"8: agt;",
"9: nege;",
"10: tien;",
"11: elf;",
"12: twaalf;",
"13: dertien;",
"14: veertien;",
"15: vyftien;",
"16: sestien;",
"17: sewentien;",
"18: agttien;",
"19: negentien;",
"20: [>>-en-]twintig;",
"30: [>>-en-]dertig;",
"40: [>>-en-]veertig;",
"50: [>>-en-]vyftig;",
"60: [>>-en-]sestig;",
"70: [>>-en-]sewentig;",
"80: [>>-en-]tagtig;",
"90: [>>-en-]negentig;",
"100: honderd[ >>];",
"200: <<honderd[ >>];",
"1000: duisend[ >>];",
"2000: <<\u00ADduisend[ >>];",
"21000/1000: << duisend[ >>];",
"1000000: << miljoen[ >>];",
"1000000000: << miljard[ >>];",
"1000000000000: << biljoen[ >>];",
"1000000000000000: << biljard[ >>];",
"1000000000000000000: =#,##0=;",
"%%ord-ste:",
"0: ste;",
"1: ' en =%spellout-ordinal=;",
"2: ' =%spellout-ordinal=;",
"%spellout-ordinal:",
"-x: min >>;",
"x.x: =#,##0.#=;",
"0: nulste;",
"1: eerste;",
"2: tweede;",
"3: derde;",
"4: =%spellout-numbering=de;",
"20: =%spellout-numbering=ste;",
"102: <%spellout-numbering< honderd>%%ord-ste>;",
"1000: <%spellout-numbering< duisend>%%ord-ste>;",
"1000000: <%spellout-numbering< miljoen>%%ord-ste>;",
"1000000000: <%spellout-numbering< miljard>%%ord-ste>;",
"1000000000000: <%spellout-numbering< biljoen>%%ord-ste>;",
"1000000000000000: <%spellout-numbering< biljard>%%ord-ste>;",
"1000000000000000000: =#,##0=.;",
"%%2d-year:"
"0: honderd[ >%spellout-numbering>];"
"1: nul =%spellout-numbering=;"
"10: =%spellout-numbering=;"
"%spellout-numbering-year:"
"-x: min >>;"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
"1100/100: << >%%2d-year>;"
"10000: =%spellout-numbering=;"
"%spellout-numbering:"
"0: =%spellout-cardinal=;"
"%spellout-cardinal:"
"-x: min >>;"
"x.x: << komma >>;"
"0: nul;"
"1: een;"
"2: twee;"
"3: drie;"
"4: vier;"
"5: vyf;"
"6: ses;"
"7: sewe;"
"8: agt;"
"9: nege;"
"10: tien;"
"11: elf;"
"12: twaalf;"
"13: dertien;"
"14: veertien;"
"15: vyftien;"
"16: sestien;"
"17: sewentien;"
"18: agttien;"
"19: negentien;"
"20: [>>-en-]twintig;"
"30: [>>-en-]dertig;"
"40: [>>-en-]veertig;"
"50: [>>-en-]vyftig;"
"60: [>>-en-]sestig;"
"70: [>>-en-]sewentig;"
"80: [>>-en-]tagtig;"
"90: [>>-en-]negentig;"
"100: honderd[ >>];"
"200: <<honderd[ >>];"
"1000: duisend[ >>];"
"2000: <<\u00ADduisend[ >>];"
"21000/1000: << duisend[ >>];"
"1000000: << miljoen[ >>];"
"1000000000: << miljard[ >>];"
"1000000000000: << biljoen[ >>];"
"1000000000000000: << biljard[ >>];"
"1000000000000000000: =#,##0=;"
"%%ord-ste:"
"0: ste;"
"1: ' en =%spellout-ordinal=;"
"2: ' =%spellout-ordinal=;"
"%spellout-ordinal:"
"-x: min >>;"
"x.x: =#,##0.#=;"
"0: nulste;"
"1: eerste;"
"2: tweede;"
"3: derde;"
"4: =%spellout-numbering=de;"
"20: =%spellout-numbering=ste;"
"102: <%spellout-numbering< honderd>%%ord-ste>;"
"1000: <%spellout-numbering< duisend>%%ord-ste>;"
"1000000: <%spellout-numbering< miljoen>%%ord-ste>;"
"1000000000: <%spellout-numbering< miljard>%%ord-ste>;"
"1000000000000: <%spellout-numbering< biljoen>%%ord-ste>;"
"1000000000000000: <%spellout-numbering< biljard>%%ord-ste>;"
"1000000000000000000: =#,##0=.;"
}
}
}
104 changes: 52 additions & 52 deletions icu4c/source/data/rbnf/ak.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,58 +4,58 @@
ak{
RBNFRules{
SpelloutRules{
"%spellout-numbering-year:",
"-x: kaw >>;",
"x.x: =0.0=;",
"0: =%spellout-numbering=;",
"10: << >>>;",
"100: << >>>;",
"1000: << >>>;",
"10000: =%spellout-numbering=;",
"%spellout-numbering:",
"0: =%spellout-cardinal=;",
"%spellout-cardinal:",
"-x: kaw >>;",
"x.x: << p\u0254w >>;",
"0: hwee;",
"1: koro;",
"2: abien;",
"3: abiasa;",
"4: anan;",
"5: anum;",
"6: asia;",
"7: asuon;",
"8: aw\u0254twe;",
"9: akron;",
"10: du[->%%spellout-cardinal-tens>];",
"20: aduonu[->%%spellout-cardinal-tens>];",
"30: aduasa[->%%spellout-cardinal-tens>];",
"40: adu<<[->%%spellout-cardinal-tens>];",
"100: \u00AD\u0254ha[-na-\u00AD>>];",
"200: aha-<<[-na->>];",
"1000: apem[-na->>];",
"2000: mpem-<<[-na->>];",
"100000: mpem-\u0254ha[-na->>];",
"200000: mpem-aha-<<[-na->>];",
"1000000: \u0254pepepem-<<[-na->>];",
"2000000: mpepepem-<<[-na->>];",
"1000000000: \u0254pepepepem-<<[-na->>];",
"2000000000: mpepepepem-<<[-na->>];",
"1000000000000: \u0254pepepepepem-<<[-na->>];",
"2000000000000: mpepepepepem-<<[-na->>];",
"1000000000000000: \u0254pepepepepepem-<<[-na->>];",
"2000000000000000: mpepepepepepem-<<[-na->>];",
"1000000000000000000: =#,##0=;",
"%%spellout-cardinal-tens:",
"0: ;",
"1: biako;",
"2: =%spellout-cardinal=;",
"%spellout-ordinal:",
"-x: kaw >>;",
"x.x: =0.0=;",
"0: a-\u025B-t\u0254-so-hwee;",
"1: a-\u025B-di-kane;",
"2: a-\u025B-t\u0254-so-=%spellout-cardinal=;",
"%spellout-numbering-year:"
"-x: kaw >>;"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
"10: <%spellout-numbering< >>>;"
"100: <%spellout-numbering< >>>;"
"1000: <%spellout-numbering< >>>;"
"10000: =%spellout-numbering=;"
"%spellout-numbering:"
"0: =%spellout-cardinal=;"
"%spellout-cardinal:"
"-x: kaw >>;"
"x.x: << p\u0254w >>;"
"0: hwee;"
"1: koro;"
"2: abien;"
"3: abiasa;"
"4: anan;"
"5: anum;"
"6: asia;"
"7: asuon;"
"8: aw\u0254twe;"
"9: akron;"
"10: du[->%%spellout-cardinal-tens>];"
"20: aduonu[->%%spellout-cardinal-tens>];"
"30: aduasa[->%%spellout-cardinal-tens>];"
"40: adu<<[->%%spellout-cardinal-tens>];"
"100: \u0254ha[-na->>];"
"200: aha-<<[-na->>];"
"1000: apem[-na->>];"
"2000: mpem-<<[-na->>];"
"100000: mpem-\u0254ha[-na->>];"
"200000: mpem-aha-<<[-na->>];"
"1000000: \u0254pepepem-<<[-na->>];"
"2000000: mpepepem-<<[-na->>];"
"1000000000: \u0254pepepepem-<<[-na->>];"
"2000000000: mpepepepem-<<[-na->>];"
"1000000000000: \u0254pepepepepem-<<[-na->>];"
"2000000000000: mpepepepepem-<<[-na->>];"
"1000000000000000: \u0254pepepepepepem-<<[-na->>];"
"2000000000000000: mpepepepepepem-<<[-na->>];"
"1000000000000000000: =#,##0=;"
"%%spellout-cardinal-tens:"
"0: ;"
"1: biako;"
"2: =%spellout-cardinal=;"
"%spellout-ordinal:"
"-x: kaw >>;"
"x.x: =0.0=;"
"0: a-\u025B-t\u0254-so-hwee;"
"1: a-\u025B-di-kane;"
"2: a-\u025B-t\u0254-so-=%spellout-cardinal=;"
}
}
}
80 changes: 40 additions & 40 deletions icu4c/source/data/rbnf/am.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,48 +4,48 @@
am{
RBNFRules{
OrdinalRules{
"%digits-ordinal:",
"-x: \u2212>>;",
"0: =#,##0=\u129B;",
"%digits-ordinal:"
"-x: \u2212>>;"
"0: =#,##0=\u129B;"
}
SpelloutRules{
"%spellout-numbering-year:",
"-x: \u1245\u1295\u1235\u1293\u123D >>;",
"x.x: =0.0=;",
"0: =%spellout-numbering=;",
"1100/100: << \u1218\u1276[ >>];",
"10000: =%spellout-numbering=;",
"%spellout-numbering:",
"0: =%spellout-cardinal=;",
"%spellout-cardinal:",
"-x: \u1245\u1295\u1235\u1293\u123D >>;",
"x.x: << \u1290\u1325\u1265 >>;",
"0: \u1263\u12F6;",
"1: \u12A0\u1295\u12F5;",
"2: \u1201\u1208\u1275;",
"3: \u1226\u1235\u1275;",
"4: \u12A0\u122B\u1275;",
"5: \u12A0\u121D\u1235\u1275;",
"6: \u1235\u12F5\u1235\u1275;",
"7: \u1230\u1263\u1275;",
"8: \u1235\u121D\u1295\u1275;",
"9: \u12D8\u1320\u129D;",
"10: \u12A0\u1235\u122D[ >>];",
"20: << \u12A0\u1235\u122D[ >>];",
"100: \u1218\u1276[ >>];",
"200: << \u1218\u1276[ >>];",
"1000: \u123A[ >>];",
"2000: << \u123A[ >>];",
"1000000: \u121A\u120A\u12EE\u1295[ >>];",
"2000000: << \u121A\u120A\u12EE\u1295[ >>];",
"1000000000: << \u1262\u120A\u12EE\u1295[ >>];",
"1000000000000: << \u1272\u122A\u120A\u12EE\u1295[ >>];",
"1000000000000000: << \u1248\u12F2\u122A\u120A\u12EE\u1295[ >>];",
"1000000000000000000: =#,##0=;",
"%spellout-ordinal:",
"-x: \u1245\u1295\u1235\u1293\u123D >>;",
"x.x: =#,##0.#=;",
"0: =%spellout-numbering=\u129B;",
"%spellout-numbering-year:"
"-x: \u1245\u1295\u1235\u1293\u123D >>;"
"x.x: =0.0=;"
"0: =%spellout-numbering=;"
"1100/100: << \u1218\u1276[ >>];"
"10000: =%spellout-numbering=;"
"%spellout-numbering:"
"0: =%spellout-cardinal=;"
"%spellout-cardinal:"
"-x: \u1245\u1295\u1235\u1293\u123D >>;"
"x.x: << \u1290\u1325\u1265 >>;"
"0: \u1263\u12F6;"
"1: \u12A0\u1295\u12F5;"
"2: \u1201\u1208\u1275;"
"3: \u1226\u1235\u1275;"
"4: \u12A0\u122B\u1275;"
"5: \u12A0\u121D\u1235\u1275;"
"6: \u1235\u12F5\u1235\u1275;"
"7: \u1230\u1263\u1275;"
"8: \u1235\u121D\u1295\u1275;"
"9: \u12D8\u1320\u129D;"
"10: \u12A0\u1235\u122D[ >>];"
"20: << \u12A0\u1235\u122D[ >>];"
"100: \u1218\u1276[ >>];"
"200: << \u1218\u1276[ >>];"
"1000: \u123A[ >>];"
"2000: << \u123A[ >>];"
"1000000: \u121A\u120A\u12EE\u1295[ >>];"
"2000000: << \u121A\u120A\u12EE\u1295[ >>];"
"1000000000: << \u1262\u120A\u12EE\u1295[ >>];"
"1000000000000: << \u1272\u122A\u120A\u12EE\u1295[ >>];"
"1000000000000000: << \u1248\u12F2\u122A\u120A\u12EE\u1295[ >>];"
"1000000000000000000: =#,##0=;"
"%spellout-ordinal:"
"-x: \u1245\u1295\u1235\u1293\u123D >>;"
"x.x: =#,##0.#=;"
"0: =%spellout-numbering=\u129B;"
}
}
}
Loading
Loading