mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Codechange: use std::string_view for town name generation

pull/14115/head
Rubidium 2025-04-26 14:25:58 +02:00 committed by rubidium42
parent 30f381acee
commit b4d4d730a5
2 changed files with 107 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

204
src/table/townname.h
View File

@ -9,14 +9,14 @@
#include "../core/enum_type.hpp" #include "../core/enum_type.hpp"
static const char * const _name_original_english_1[] = { static const std::string_view _name_original_english_1[] = {
"Great ", "Great ",
"Little ", "Little ",
"New ", "New ",
"Fort ", "Fort ",
}; };
static const char * const _name_original_english_2[] = { static const std::string_view _name_original_english_2[] = {
"Wr", "Wr",
"B", "B",
"C", "C",
@ -45,7 +45,7 @@ static const char * const _name_original_english_2[] = {
"W", "W",
}; };
static const char * const _name_original_english_3[] = { static const std::string_view _name_original_english_3[] = {
"ar", "ar",
"a", "a",
"e", "e",
@ -56,7 +56,7 @@ static const char * const _name_original_english_3[] = {
"en", "en",
}; };
static const char * const _name_original_english_4[] = { static const std::string_view _name_original_english_4[] = {
"n", "n",
"ning", "ning",
"ding", "ding",
@ -66,7 +66,7 @@ static const char * const _name_original_english_4[] = {
"fing", "fing",
}; };
static const char * const _name_original_english_5[] = { static const std::string_view _name_original_english_5[] = {
"ville", "ville",
"ham", "ham",
"field", "field",
@ -92,7 +92,7 @@ static const char * const _name_original_english_5[] = {
"burg", "burg",
}; };
static const char * const _name_original_english_6[] = { static const std::string_view _name_original_english_6[] = {
"-on-sea", "-on-sea",
" Bay", " Bay",
" Market", " Market",
@ -104,7 +104,7 @@ static const char * const _name_original_english_6[] = {
" Springs", " Springs",
}; };
static const char * const _name_additional_english_prefix[] = { static const std::string_view _name_additional_english_prefix[] = {
"Great ", "Great ",
"Little ", "Little ",
"New ", "New ",
@ -113,7 +113,7 @@ static const char * const _name_additional_english_prefix[] = {
"Old ", "Old ",
}; };
static const char * const _name_additional_english_1a[] = { static const std::string_view _name_additional_english_1a[] = {
"Pen", "Pen",
"Lough", "Lough",
"Stam", "Stam",
@ -159,7 +159,7 @@ static const char * const _name_additional_english_1a[] = {
"Stan", "Stan",
}; };
static const char * const _name_additional_english_1b1[] = { static const std::string_view _name_additional_english_1b1[] = {
"Wr", "Wr",
"B", "B",
"C", "C",
@ -188,7 +188,7 @@ static const char * const _name_additional_english_1b1[] = {
"W", "W",
}; };
static const char * const _name_additional_english_1b2[] = { static const std::string_view _name_additional_english_1b2[] = {
"ar", "ar",
"a", "a",
"e", "e",
@ -203,7 +203,7 @@ static const char * const _name_additional_english_1b2[] = {
"en", "en",
}; };
static const char * const _name_additional_english_1b3a[] = { static const std::string_view _name_additional_english_1b3a[] = {
"n", "n",
"d", "d",
"", "",
@ -212,13 +212,13 @@ static const char * const _name_additional_english_1b3a[] = {
"", "",
}; };
static const char * const _name_additional_english_1b3b[] = { static const std::string_view _name_additional_english_1b3b[] = {
"ning", "ning",
"ding", "ding",
"fing", "fing",
}; };
static const char * const _name_additional_english_2[] = { static const std::string_view _name_additional_english_2[] = {
"ville", "ville",
"ham", "ham",
"field", "field",
@ -276,7 +276,7 @@ static const char * const _name_additional_english_2[] = {
"thwaite", "thwaite",
}; };
static const char * const _name_additional_english_3[] = { static const std::string_view _name_additional_english_3[] = {
"-on-sea", "-on-sea",
" Bay", " Bay",
" Market", " Market",
@ -297,7 +297,7 @@ static const char * const _name_additional_english_3[] = {
" Springs", " Springs",
}; };
static const char * const _name_austrian_a1[] = { static const std::string_view _name_austrian_a1[] = {
"Bad ", "Bad ",
"Deutsch ", "Deutsch ",
"Gross ", "Gross ",
@ -306,7 +306,7 @@ static const char * const _name_austrian_a1[] = {
"Maria ", "Maria ",
}; };
static const char * const _name_austrian_a2[] = { static const std::string_view _name_austrian_a2[] = {
"Aus", "Aus",
"Alten", "Alten",
"Braun", "Braun",
@ -351,7 +351,7 @@ static const char * const _name_austrian_a2[] = {
"Weissen", "Weissen",
}; };
static const char * const _name_austrian_a3[] = { static const std::string_view _name_austrian_a3[] = {
"see", "see",
"bach", "bach",
"dorf", "dorf",
@ -370,7 +370,7 @@ static const char * const _name_austrian_a3[] = {
"haag", "haag",
}; };
static const char * const _name_austrian_a4[] = { static const std::string_view _name_austrian_a4[] = {
"Bruck", "Bruck",
"Brunn", "Brunn",
"Gams", "Gams",
@ -385,12 +385,12 @@ static const char * const _name_austrian_a4[] = {
"Wald", "Wald",
}; };
static const char * const _name_austrian_a5[] = { static const std::string_view _name_austrian_a5[] = {
"St. ", "St. ",
"Sankt ", "Sankt ",
}; };
static const char * const _name_austrian_a6[] = { static const std::string_view _name_austrian_a6[] = {
"Aegyd", "Aegyd",
"Andr\u00e4", "Andr\u00e4",
"Georgen", "Georgen",
@ -413,12 +413,12 @@ static const char * const _name_austrian_a6[] = {
"Wolfgang", "Wolfgang",
}; };
static const char * const _name_austrian_f1[] = { static const std::string_view _name_austrian_f1[] = {
" an der ", " an der ",
" ob der ", " ob der ",
}; };
static const char * const _name_austrian_f2[] = { static const std::string_view _name_austrian_f2[] = {
"Donau", "Donau",
"Steyr", "Steyr",
"Lafnitz", "Lafnitz",
@ -434,11 +434,11 @@ static const char * const _name_austrian_f2[] = {
"Ill", "Ill",
}; };
static const char * const _name_austrian_b1[] = { static const std::string_view _name_austrian_b1[] = {
" am ", " am ",
}; };
static const char * const _name_austrian_b2[] = { static const std::string_view _name_austrian_b2[] = {
"Brenner", "Brenner",
"Dachstein", "Dachstein",
"Gebirge", "Gebirge",
@ -451,7 +451,7 @@ static const char * const _name_austrian_b2[] = {
"Ziller", "Ziller",
}; };
static const char * const _name_german_real[] = { static const std::string_view _name_german_real[] = {
"Berlin", "Berlin",
"Bonn", "Bonn",
"Bremen", "Bremen",
@ -475,13 +475,13 @@ static const char * const _name_german_real[] = {
"Wiesbaden", "Wiesbaden",
}; };
static const char * const _name_german_pre[] = { static const std::string_view _name_german_pre[] = {
"Bad ", "Bad ",
"Klein ", "Klein ",
"Neu ", "Neu ",
}; };
static const char * const _name_german_1[] = { static const std::string_view _name_german_1[] = {
"Alb", "Alb",
"Als", "Als",
"Ander", "Ander",
@ -577,7 +577,7 @@ static const char * const _name_german_1[] = {
"W\u00fcrz", "W\u00fcrz",
}; };
static const char * const _name_german_2[] = { static const std::string_view _name_german_2[] = {
"bach", "bach",
"berg", "berg",
"br\u00fcck", "br\u00fcck",
@ -596,15 +596,15 @@ static const char * const _name_german_2[] = {
"wald", "wald",
}; };
static const char * const _name_german_3_an_der[] = { static const std::string_view _name_german_3_an_der[] = {
" an der ", " an der ",
}; };
static const char * const _name_german_3_am[] = { static const std::string_view _name_german_3_am[] = {
" am ", " am ",
}; };
static const char * const _name_german_4_an_der[] = { static const std::string_view _name_german_4_an_der[] = {
"Oder", "Oder",
"Spree", "Spree",
"Donau", "Donau",
@ -612,11 +612,11 @@ static const char * const _name_german_4_an_der[] = {
"Elbe", "Elbe",
}; };
static const char * const _name_german_4_am[] = { static const std::string_view _name_german_4_am[] = {
"Main", "Main",
}; };
static const char * const _name_spanish_real[] = { static const std::string_view _name_spanish_real[] = {
"Caracas", "Caracas",
"Maracay", "Maracay",
"Maracaibo", "Maracaibo",
@ -705,7 +705,7 @@ static const char * const _name_spanish_real[] = {
"Santa Rosa", "Santa Rosa",
}; };
static const char * const _name_french_real[] = { static const std::string_view _name_french_real[] = {
"Agincourt", "Agincourt",
"Lille", "Lille",
"Dinan", "Dinan",
@ -778,7 +778,7 @@ static const char * const _name_french_real[] = {
"Alen\u00e7on", "Alen\u00e7on",
}; };
static const char * const _name_silly_1[] = { static const std::string_view _name_silly_1[] = {
"Binky", "Binky",
"Blubber", "Blubber",
"Bumble", "Bumble",
@ -869,7 +869,7 @@ static const char * const _name_silly_1[] = {
"Griddle", "Griddle",
}; };
static const char * const _name_silly_2[] = { static const std::string_view _name_silly_2[] = {
"ton", "ton",
"bury", "bury",
"bottom", "bottom",
@ -887,14 +887,14 @@ static const char * const _name_silly_2[] = {
"bridge", "bridge",
}; };
static const char * const _name_swedish_1[] = { static const std::string_view _name_swedish_1[] = {
"Gamla ", "Gamla ",
"Lilla ", "Lilla ",
"Nya ", "Nya ",
"Stora ", "Stora ",
}; };
static const char * const _name_swedish_2[] = { static const std::string_view _name_swedish_2[] = {
"Boll", "Boll",
"Bor", "Bor",
"Ed", "Ed",
@ -935,7 +935,7 @@ static const char * const _name_swedish_2[] = {
"\u00d6ster", "\u00d6ster",
}; };
static const char * const _name_swedish_2a[] = { static const std::string_view _name_swedish_2a[] = {
"B", "B",
"Br", "Br",
"D", "D",
@ -980,7 +980,7 @@ static const char * const _name_swedish_2a[] = {
"Vr", "Vr",
}; };
static const char * const _name_swedish_2b[] = { static const std::string_view _name_swedish_2b[] = {
"a", "a",
"e", "e",
"i", "i",
@ -992,7 +992,7 @@ static const char * const _name_swedish_2b[] = {
"\u00f6", "\u00f6",
}; };
static const char * const _name_swedish_2c[] = { static const std::string_view _name_swedish_2c[] = {
"ck", "ck",
"d", "d",
"dd", "dd",
@ -1021,7 +1021,7 @@ static const char * const _name_swedish_2c[] = {
"v", "v",
}; };
static const char * const _name_swedish_3[] = { static const std::string_view _name_swedish_3[] = {
"arp", "arp",
"berg", "berg",
"boda", "boda",
@ -1056,7 +1056,7 @@ static const char * const _name_swedish_3[] = {
"\u00e5s", "\u00e5s",
}; };
static const char * const _name_dutch_1[] = { static const std::string_view _name_dutch_1[] = {
"Nieuw ", "Nieuw ",
"Oud ", "Oud ",
"Groot ", "Groot ",
@ -1067,7 +1067,7 @@ static const char * const _name_dutch_1[] = {
"Klein ", "Klein ",
}; };
static const char * const _name_dutch_2[] = { static const std::string_view _name_dutch_2[] = {
"Hoog", "Hoog",
"Laag", "Laag",
"Zuider", "Zuider",
@ -1123,7 +1123,7 @@ static const char * const _name_dutch_2[] = {
"Hil", "Hil",
}; };
static const char * const _name_dutch_3[] = { static const std::string_view _name_dutch_3[] = {
"Drog", "Drog",
"Nat", "Nat",
"Valk", "Valk",
@ -1146,7 +1146,7 @@ static const char * const _name_dutch_3[] = {
"Koning", "Koning",
}; };
static const char * const _name_dutch_4[] = { static const std::string_view _name_dutch_4[] = {
"e", "e",
"er", "er",
"el", "el",
@ -1155,7 +1155,7 @@ static const char * const _name_dutch_4[] = {
"s", "s",
}; };
static const char * const _name_dutch_5[] = { static const std::string_view _name_dutch_5[] = {
"stad", "stad",
"vorst", "vorst",
"dorp", "dorp",
@ -1214,7 +1214,7 @@ static const char * const _name_dutch_5[] = {
"end", "end",
}; };
static const char * const _name_finnish_real[] = { static const std::string_view _name_finnish_real[] = {
"Aijala", "Aijala",
"Kisko", "Kisko",
"Espoo", "Espoo",
@ -1248,7 +1248,7 @@ static const char * const _name_finnish_real[] = {
"Lieksa", "Lieksa",
}; };
static const char * const _name_finnish_1[] = { static const std::string_view _name_finnish_1[] = {
"Hiekka", "Hiekka",
"Haapa", "Haapa",
"Mylly", "Mylly",
@ -1278,7 +1278,7 @@ static const char * const _name_finnish_1[] = {
"Niini", "Niini",
}; };
static const char * const _name_finnish_2[] = { static const std::string_view _name_finnish_2[] = {
"Lappeen", "Lappeen",
"Lohjan", "Lohjan",
"Savon", "Savon",
@ -1292,7 +1292,7 @@ static const char * const _name_finnish_2[] = {
"Kangas", "Kangas",
}; };
static const char * const _name_finnish_3[] = { static const std::string_view _name_finnish_3[] = {
"harju", "harju",
"linna", "linna",
"j\u00e4rvi", "j\u00e4rvi",
@ -1314,7 +1314,7 @@ static const char * const _name_finnish_3[] = {
"salo", "salo",
}; };
static const char * const _name_polish_1_m[] = { static const std::string_view _name_polish_1_m[] = {
"Wielki ", "Wielki ",
"Ma\u0142y ", "Ma\u0142y ",
"Z\u0142y ", "Z\u0142y ",
@ -1328,7 +1328,7 @@ static const char * const _name_polish_1_m[] = {
"D\u0119bowy ", "D\u0119bowy ",
}; };
static const char * const _name_polish_1_f[] = { static const std::string_view _name_polish_1_f[] = {
"Wielka ", "Wielka ",
"Ma\u0142a ", "Ma\u0142a ",
"Z\u0142a ", "Z\u0142a ",
@ -1342,7 +1342,7 @@ static const char * const _name_polish_1_f[] = {
"D\u0119bowa ", "D\u0119bowa ",
}; };
static const char * const _name_polish_1_n[] = { static const std::string_view _name_polish_1_n[] = {
"Wielkie ", "Wielkie ",
"Ma\u0142e ", "Ma\u0142e ",
"Z\u0142e ", "Z\u0142e ",
@ -1356,7 +1356,7 @@ static const char * const _name_polish_1_n[] = {
"D\u0119bowe ", "D\u0119bowe ",
}; };
static const char * const _name_polish_2_o[] = { static const std::string_view _name_polish_2_o[] = {
"Frombork", "Frombork",
"Gniezno", "Gniezno",
"Olsztyn", "Olsztyn",
@ -1393,7 +1393,7 @@ static const char * const _name_polish_2_o[] = {
"Wolsztyn", "Wolsztyn",
}; };
static const char * const _name_polish_2_m[] = { static const std::string_view _name_polish_2_m[] = {
"Jarocin", "Jarocin",
"Gogolin", "Gogolin",
"Tomasz\u00f3w", "Tomasz\u00f3w",
@ -1444,7 +1444,7 @@ static const char * const _name_polish_2_m[] = {
"Garwolin", "Garwolin",
}; };
static const char * const _name_polish_2_f[] = { static const std::string_view _name_polish_2_f[] = {
"Szprotawa", "Szprotawa",
"Pogorzelica", "Pogorzelica",
"Mot\u0142awa", "Mot\u0142awa",
@ -1475,7 +1475,7 @@ static const char * const _name_polish_2_f[] = {
"Pilawa", "Pilawa",
}; };
static const char * const _name_polish_2_n[] = { static const std::string_view _name_polish_2_n[] = {
"Lipsko", "Lipsko",
"Pilzno", "Pilzno",
"Przodkowo", "Przodkowo",
@ -1508,7 +1508,7 @@ static const char * const _name_polish_2_n[] = {
"Opoczno", "Opoczno",
}; };
static const char * const _name_polish_3_m[] = { static const std::string_view _name_polish_3_m[] = {
" Wybudowanie", " Wybudowanie",
" \u015awi\u0119tokrzyski", " \u015awi\u0119tokrzyski",
" G\u00f3rski", " G\u00f3rski",
@ -1540,7 +1540,7 @@ static const char * const _name_polish_3_m[] = {
" Lesny", " Lesny",
}; };
static const char * const _name_polish_3_f[] = { static const std::string_view _name_polish_3_f[] = {
" Wybudowanie", " Wybudowanie",
" \u015awi\u0119tokrzyska", " \u015awi\u0119tokrzyska",
" G\u00f3rska", " G\u00f3rska",
@ -1572,7 +1572,7 @@ static const char * const _name_polish_3_f[] = {
" Le\u015bna", " Le\u015bna",
}; };
static const char * const _name_polish_3_n[] = { static const std::string_view _name_polish_3_n[] = {
" Wybudowanie", " Wybudowanie",
" \u015awietokrzyskie", " \u015awietokrzyskie",
" G\u00f3rskie", " G\u00f3rskie",
@ -1604,7 +1604,7 @@ static const char * const _name_polish_3_n[] = {
" Le\u015bne", " Le\u015bne",
}; };
static const char * const _name_czech_real[] = { static const std::string_view _name_czech_real[] = {
"A\u0161", "A\u0161",
"Bene\u0161ov", "Bene\u0161ov",
"Beroun", "Beroun",
@ -1716,7 +1716,7 @@ enum CzechPattern : uint8_t {
}; };
/* [CzechGender][CzechPattern] - suffixes for adjectives */ /* [CzechGender][CzechPattern] - suffixes for adjectives */
static const char * const _name_czech_patmod[][3] = { static const std::string_view _name_czech_patmod[][3] = {
/* CZG_SMASC */ { "\u00ed", "\u00fd", "uv" }, /* CZG_SMASC */ { "\u00ed", "\u00fd", "uv" },
/* CZG_SFEM */ { "\u00ed", "\u00e1", "ova" }, /* CZG_SFEM */ { "\u00ed", "\u00e1", "ova" },
/* CZG_SNEUT */ { "\u00ed", "\u00e9", "ovo" }, /* CZG_SNEUT */ { "\u00ed", "\u00e9", "ovo" },
@ -1752,13 +1752,13 @@ struct CzechNameSubst {
CzechGender gender; CzechGender gender;
CzechAllowFlags allow; CzechAllowFlags allow;
CzechChooseFlags choose; CzechChooseFlags choose;
const char *name; std::string_view name;
}; };
struct CzechNameAdj { struct CzechNameAdj {
CzechPattern pattern; CzechPattern pattern;
CzechChooseFlags choose; CzechChooseFlags choose;
const char *name; std::string_view name;
}; };
/* Some of items which should be common are doubled. */ /* Some of items which should be common are doubled. */
@ -1880,7 +1880,7 @@ static const CzechNameSubst _name_czech_subst_stem[] = {
}; };
/* Optional postfix inserted between stem and ending. */ /* Optional postfix inserted between stem and ending. */
static const char * const _name_czech_subst_postfix[] = { static const std::string_view _name_czech_subst_postfix[] = {
"av", "an", "at", "av", "an", "at",
"ov", "on", "ot", "ov", "on", "ot",
"ev", "en", "et", "ev", "en", "et",
@ -1910,7 +1910,7 @@ static const CzechNameSubst _name_czech_subst_ending[] = {
{ CZG_SNEUT, { CzechAllowFlag::Long}, CZC_ANY, "i\u0161t\u011b" }, { CZG_SNEUT, { CzechAllowFlag::Long}, CZC_ANY, "i\u0161t\u011b" },
}; };
static const char * const _name_czech_suffix[] = { static const std::string_view _name_czech_suffix[] = {
"nad Cidlinou", "nad Cidlinou",
"nad Dyj\u00ed", "nad Dyj\u00ed",
"nad Jihlavou", "nad Jihlavou",
@ -1934,7 +1934,7 @@ static const char * const _name_czech_suffix[] = {
static const char * const _name_romanian_real[] = { static const std::string_view _name_romanian_real[] = {
"Adjud", "Adjud",
"Alba Iulia", "Alba Iulia",
"Alexandria", "Alexandria",
@ -2031,7 +2031,7 @@ static const char * const _name_romanian_real[] = {
"Zal\u0103u", "Zal\u0103u",
}; };
static const char * const _name_slovak_real[] = { static const std::string_view _name_slovak_real[] = {
"Bratislava", "Bratislava",
"B\u00e1novce nad Bebravou", "B\u00e1novce nad Bebravou",
"Bansk\u00e1 Bystrica", "Bansk\u00e1 Bystrica",
@ -2121,7 +2121,7 @@ static const char * const _name_slovak_real[] = {
"Zvolen", "Zvolen",
}; };
static const char * const _name_norwegian_1[] = { static const std::string_view _name_norwegian_1[] = {
"Arna", "Arna",
"Aust", "Aust",
"Bj\u00f8rk", "Bj\u00f8rk",
@ -2208,7 +2208,7 @@ static const char * const _name_norwegian_1[] = {
"V\u00e5g", "V\u00e5g",
}; };
static const char * const _name_norwegian_2[] = { static const std::string_view _name_norwegian_2[] = {
"aker", "aker",
"anger", "anger",
"bakken", "bakken",
@ -2278,7 +2278,7 @@ static const char * const _name_norwegian_2[] = {
"\u00e5sen", "\u00e5sen",
}; };
static const char * const _name_norwegian_real[] = { static const std::string_view _name_norwegian_real[] = {
"Alta", "Alta",
"Arendal", "Arendal",
"Askim", "Askim",
@ -2375,7 +2375,7 @@ static const char * const _name_norwegian_real[] = {
"\u00c5ndalsnes", "\u00c5ndalsnes",
}; };
static const char * const _name_hungarian_1[] = { static const std::string_view _name_hungarian_1[] = {
"Nagy-", "Nagy-",
"Kis-", "Kis-",
"Fels\u0151-", "Fels\u0151-",
@ -2383,7 +2383,7 @@ static const char * const _name_hungarian_1[] = {
"\u00daj-", "\u00daj-",
}; };
static const char * const _name_hungarian_2[] = { static const std::string_view _name_hungarian_2[] = {
"Bodrog", "Bodrog",
"Dr\u00e1va", "Dr\u00e1va",
"Duna", "Duna",
@ -2440,7 +2440,7 @@ static const char * const _name_hungarian_2[] = {
"V\u00e1s\u00e1ros", "V\u00e1s\u00e1ros",
}; };
static const char * const _name_hungarian_3[] = { static const std::string_view _name_hungarian_3[] = {
"ap\u00e1ti", "ap\u00e1ti",
"b\u00e1ba", "b\u00e1ba",
"bikk", "bikk",
@ -2459,7 +2459,7 @@ static const char * const _name_hungarian_3[] = {
"v\u00f6lgy", "v\u00f6lgy",
}; };
static const char * const _name_hungarian_4[] = { static const std::string_view _name_hungarian_4[] = {
"alja", "alja",
"egyh\u00e1za", "egyh\u00e1za",
"h\u00e1za", "h\u00e1za",
@ -2467,7 +2467,7 @@ static const char * const _name_hungarian_4[] = {
"v\u00e1r", "v\u00e1r",
}; };
static const char * const _name_hungarian_real[] = { static const std::string_view _name_hungarian_real[] = {
"Ajka", "Ajka",
"Asz\u00f3d", "Asz\u00f3d",
"Badacsony", "Badacsony",
@ -2506,7 +2506,7 @@ static const char * const _name_hungarian_real[] = {
"Zirc", "Zirc",
}; };
static const char * const _name_swiss_real[] = { static const std::string_view _name_swiss_real[] = {
"Aarau", "Aarau",
"Aesch", "Aesch",
"Altdorf", "Altdorf",
@ -2632,7 +2632,7 @@ static const char * const _name_swiss_real[] = {
"Zug", "Zug",
}; };
static const char * const _name_danish_1[] = { static const std::string_view _name_danish_1[] = {
"Gamle ", "Gamle ",
"Lille ", "Lille ",
"Nye ", "Nye ",
@ -2647,7 +2647,7 @@ static const char * const _name_danish_1[] = {
"Kongens ", "Kongens ",
}; };
static const char * const _name_danish_2[] = { static const std::string_view _name_danish_2[] = {
"Ager", "Ager",
"Alle", "Alle",
"Aske", "Aske",
@ -2731,7 +2731,7 @@ static const char * const _name_danish_2[] = {
"\u00c5l", "\u00c5l",
}; };
static const char * const _name_danish_3[] = { static const std::string_view _name_danish_3[] = {
"basse", "basse",
"borg", "borg",
"berg", "berg",
@ -2764,7 +2764,7 @@ static const char * const _name_danish_3[] = {
"skov", "skov",
}; };
static const char * const _name_turkish_prefix[] = { static const std::string_view _name_turkish_prefix[] = {
"Ak\u00e7a", "Ak\u00e7a",
"Alt\u0131n", "Alt\u0131n",
"Bah\u00e7e", "Bah\u00e7e",
@ -2783,7 +2783,7 @@ static const char * const _name_turkish_prefix[] = {
"Yeni", "Yeni",
}; };
static const char * const _name_turkish_middle[] = { static const std::string_view _name_turkish_middle[] = {
"aga\u00e7", "aga\u00e7",
"ayva", "ayva",
"\u00e7am", "\u00e7am",
@ -2793,7 +2793,7 @@ static const char * const _name_turkish_middle[] = {
"yal\u0131", "yal\u0131",
}; };
static const char * const _name_turkish_suffix[] = { static const std::string_view _name_turkish_suffix[] = {
"dere", "dere",
"hisar", "hisar",
"kale", "kale",
@ -2810,7 +2810,7 @@ static const char * const _name_turkish_suffix[] = {
"yurt", "yurt",
}; };
static const char * const _name_turkish_real[] = { static const std::string_view _name_turkish_real[] = {
"Adana", "Adana",
"Ad\u0131yaman", "Ad\u0131yaman",
"Afyon", "Afyon",
@ -2878,7 +2878,7 @@ static const char * const _name_turkish_real[] = {
"D\u00fczce", "D\u00fczce",
}; };
static const char * const _name_italian_real[] = { static const std::string_view _name_italian_real[] = {
"Roma", "Roma",
"Milano", "Milano",
"Napoli", "Napoli",
@ -2959,7 +2959,7 @@ static const char * const _name_italian_real[] = {
"Grosseto", "Grosseto",
}; };
static const char * const _name_italian_pref[] = { static const std::string_view _name_italian_pref[] = {
"Alpe ", "Alpe ",
"Borgo ", "Borgo ",
"Cascina ", "Cascina ",
@ -2974,7 +2974,7 @@ static const char * const _name_italian_pref[] = {
"Villar ", "Villar ",
}; };
static const char * const _name_italian_1m[] = { static const std::string_view _name_italian_1m[] = {
"Bel", "Bel",
"Borgo", "Borgo",
"Bosco", "Bosco",
@ -3002,7 +3002,7 @@ static const char * const _name_italian_1m[] = {
"Vico", "Vico",
}; };
static const char * const _name_italian_1f[] = { static const std::string_view _name_italian_1f[] = {
"Acqua", "Acqua",
"Bra", "Bra",
"Cala", "Cala",
@ -3028,7 +3028,7 @@ static const char * const _name_italian_1f[] = {
"Villa", "Villa",
}; };
static const char * const _name_italian_2[] = { static const std::string_view _name_italian_2[] = {
"bell", "bell",
"bianc", "bianc",
"cald", "cald",
@ -3058,7 +3058,7 @@ static const char * const _name_italian_2[] = {
"viv", "viv",
}; };
static const char * const _name_italian_2i[] = { static const std::string_view _name_italian_2i[] = {
"", "",
"breve", "breve",
"brevi", "brevi",
@ -3085,7 +3085,7 @@ static const char * const _name_italian_2i[] = {
}; };
static const char * const _name_italian_3[] = { static const std::string_view _name_italian_3[] = {
" Marittimo", " Marittimo",
" Marittima", " Marittima",
" del Capo", " del Capo",
@ -3109,14 +3109,14 @@ static const char * const _name_italian_3[] = {
" Ticino", " Ticino",
}; };
static const char * const _name_italian_river1[] = { static const std::string_view _name_italian_river1[] = {
" del", " del",
" sul", " sul",
" al", " al",
" nel", " nel",
}; };
static const char * const _name_italian_river2[] = { static const std::string_view _name_italian_river2[] = {
"l'Adda", "l'Adda",
"l'Adige", "l'Adige",
"le Alpi", "le Alpi",
@ -3144,7 +3144,7 @@ static const char * const _name_italian_river2[] = {
" Tevere", " Tevere",
}; };
static const char * const _name_catalan_real[] = { static const std::string_view _name_catalan_real[] = {
"Barcelona", "Barcelona",
"L'Hospitalet de Llobregat", "L'Hospitalet de Llobregat",
"Cerdanyola", "Cerdanyola",
@ -3214,7 +3214,7 @@ static const char * const _name_catalan_real[] = {
"Roses", "Roses",
}; };
static const char * const _name_catalan_pref[] = { static const std::string_view _name_catalan_pref[] = {
"El Pont de ", "El Pont de ",
"Parets de ", "Parets de ",
"Canet de ", "Canet de ",
@ -3249,7 +3249,7 @@ static const char * const _name_catalan_pref[] = {
}; };
static const char * const _name_catalan_1m[] = { static const std::string_view _name_catalan_1m[] = {
"Torrent", "Torrent",
"Cami", "Cami",
"Mont", "Mont",
@ -3258,7 +3258,7 @@ static const char * const _name_catalan_1m[] = {
"Riu", "Riu",
}; };
static const char * const _name_catalan_1f[] = { static const std::string_view _name_catalan_1f[] = {
"Pala", "Pala",
"Selva", "Selva",
"Vall", "Vall",
@ -3269,7 +3269,7 @@ static const char * const _name_catalan_1f[] = {
"Terra", "Terra",
}; };
static const char * const _name_catalan_2m[] = { static const std::string_view _name_catalan_2m[] = {
"alt", "alt",
"baix", "baix",
"fosc", "fosc",
@ -3280,7 +3280,7 @@ static const char * const _name_catalan_2m[] = {
"gr\u00eds", "gr\u00eds",
}; };
static const char * const _name_catalan_2f[] = { static const std::string_view _name_catalan_2f[] = {
"baixa", "baixa",
"alta", "alta",
"fosca", "fosca",
@ -3291,7 +3291,7 @@ static const char * const _name_catalan_2f[] = {
"freda", "freda",
}; };
static const char * const _name_catalan_3[] = { static const std::string_view _name_catalan_3[] = {
" Desp\u00ed", " Desp\u00ed",
" Desvern", " Desvern",
" del Cam\u00ed", " del Cam\u00ed",
@ -3304,7 +3304,7 @@ static const char * const _name_catalan_3[] = {
" de la Plana", " de la Plana",
}; };
static const char * const _name_catalan_river1[] = { static const std::string_view _name_catalan_river1[] = {
" d'Anoia", " d'Anoia",
" de Ter", " de Ter",
" de Llobregat", " de Llobregat",

10
src/townname.cpp
View File

@ -702,11 +702,11 @@ static void MakeCzechTownName(StringBuilder &builder, uint32_t seed)
if (dynamic_subst) { if (dynamic_subst) {
builder += _name_czech_subst_stem[stem].name; builder += _name_czech_subst_stem[stem].name;
if (postfix < std::size(_name_czech_subst_postfix)) { if (postfix < std::size(_name_czech_subst_postfix)) {
const char *poststr = _name_czech_subst_postfix[postfix]; std::string_view poststr = _name_czech_subst_postfix[postfix];
const char *endstr = _name_czech_subst_ending[ending].name; std::string_view endstr = _name_czech_subst_ending[ending].name;
size_t postlen = strlen(poststr); size_t postlen = poststr.size();
size_t endlen = strlen(endstr); size_t endlen = endstr.size();
assert(postlen > 0 && endlen > 0); assert(postlen > 0 && endlen > 0);
/* Kill the "avava" and "Jananna"-like cases */ /* Kill the "avava" and "Jananna"-like cases */
@ -884,7 +884,7 @@ static void MakeItalianTownName(StringBuilder &builder, uint32_t seed)
return; return;
} }
static const char * const mascul_femin_italian[] = { static std::string_view const mascul_femin_italian[] = {
"o", "o",
"a", "a",
}; };