Skip to content

Commit cdbe72c

Browse files
VestVest
committed
Fix broken GETLIST/GETRULE references in random-name data
The bundled dataset contained 33 unresolved id refs that the legacy engine swallowed silently at generation time. The new loader surfaces them via NameGenData.unresolvedReferences(), which is asserted empty in NameGenDataLoaderTest. Categories of fix: - 25 GETLIST refs whose target is a RULESET → switched to GETRULE - 4 GETRULE refs whose target is a LIST → switched to GETLIST - tamrelilic-noun-a typo → tamrelic-noun-a (7 occurrences) - tamriel-dunmer-surname-Suffix case typo → ...-suffix - 6 mar-standard-rule refs split into mar-standard-male-rule / mar-standard-female-rule per call-site gender - russian-historical-male-patrynomic-rule_alt (never authored) → drop the _alt suffix to point at the existing rule
1 parent 0299fa3 commit cdbe72c

10 files changed

Lines changed: 86 additions & 86 deletions

File tree

‎plugins/Random Names/arabic.xml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@
1919
<SPACE/>
2020
<GETLIST idref="arabic-male-kunya" title="Prefix"/>
2121
<SPACE />
22-
<GETLIST idref="arabic-male-given-rule" title="Patrynomic"/>
22+
<GETRULE idref="arabic-male-given-rule" title="Patrynomic"/>
2323
</RULE>
2424
<RULE weight="1">
2525
<GETRULE idref="arabic-male-given-rule" title="Given"/>
2626
<SPACE/>
27-
<GETLIST idref="arabic-male-locative-rule" title="Locative Byname"/>
27+
<GETRULE idref="arabic-male-locative-rule" title="Locative Byname"/>
2828
</RULE>
2929
</RULESET>
3030
<RULESET id="arabic-historical-female-rule" title="Arabic" usage="final">
@@ -51,15 +51,15 @@
5151
<RULE weight="2">
5252
<GETLIST idref="arabic-female-given" title="Given"/>
5353
<SPACE/>
54-
<GETLIST idref="arabic-male-locative-rule" title="Locative Byname"/>
54+
<GETRULE idref="arabic-male-locative-rule" title="Locative Byname"/>
5555
<GETLIST idref="arabic-female-locative-suffix" title="Suffix"/>
5656
</RULE>
5757
<RULE weight="2">
5858
<GETLIST idref="arabic-female-given" title="Given"/>
5959
<SPACE/>
6060
<GETLIST idref="arabic-female-kunya" title="Prefix"/>
6161
<SPACE />
62-
<GETLIST idref="arabic-male-given-rule" title="Patrynomic"/>
62+
<GETRULE idref="arabic-male-given-rule" title="Patrynomic"/>
6363
</RULE>
6464
</RULESET>
6565
<RULESET id="arabic-male-locative-rule" title="Locative Byname" usage="public">
@@ -76,12 +76,12 @@
7676
<CATEGORY title="All"/>
7777
<CATEGORY title="Sex: Other"/>
7878
<RULE weight="24">
79-
<GETLIST idref="arabic-historical-location-name-rule" title="Location"/>
79+
<GETRULE idref="arabic-historical-location-name-rule" title="Location"/>
8080
</RULE>
8181
<RULE weight="8">
8282
<GETLIST idref="arabic-location-prefix" title="Prefix"/>
8383
<SPACE/>
84-
<GETLIST idref="arabic-historical-location-name-rule" title="Location"/>
84+
<GETRULE idref="arabic-historical-location-name-rule" title="Location"/>
8585
</RULE>
8686
<RULE weight="1">
8787
<GETLIST idref="arabic-location-prefix" title="Prefix"/>
@@ -117,11 +117,11 @@
117117
<GETLIST idref="arabic-male-cognomen" title="Cognomen"/>
118118
</RULE>
119119
<RULE weight="1">
120-
<GETRULE idref="arabic-male-given" title="Given"/>
120+
<GETLIST idref="arabic-male-given" title="Given"/>
121121
<SPACE/>
122122
<GETLIST idref="arabic-male-kunya" title="Prefix"/>
123123
<SPACE />
124-
<GETLIST idref="arabic-male-given-rule" title="Patrynomic"/>
124+
<GETRULE idref="arabic-male-given-rule" title="Patrynomic"/>
125125
<SPACE />
126126
</RULE>
127127
</RULESET>

‎plugins/Random Names/fantasy-tamriel.xml‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,11 @@
5050
</RULESET>
5151
<RULESET id="tamriel-atmer-surname-rule" title="Atmer Surname" usage="public">
5252
<RULE weight="3">
53-
<GETLIST idref="tamriel-atmer-family" title="Family" />
53+
<GETRULE idref="tamriel-atmer-family" title="Family" />
5454
<SPACE />
5555
<GETLIST idref="tamriel-atmer-family-supplimental" title="intrix" />
5656
<SPACE />
57-
<GETLIST idref="tamriel-atmer-family" title="Family" />
57+
<GETRULE idref="tamriel-atmer-family" title="Family" />
5858
</RULE>
5959
<RULE weight="3">
6060
<GETRULE idref="tamriel-atmer-family" title="Family" />
@@ -65,7 +65,7 @@
6565
<HYPHEN />
6666
<GETRULE idref="tamriel-atmer-family" title="Family" />
6767
<SPACE />
68-
<GETLIST idref="tamriel-atmer-family" title="Family" />
68+
<GETRULE idref="tamriel-atmer-family" title="Family" />
6969
</RULE>
7070
<RULE weight="3">
7171
<GETRULE idref="tamriel-atmer-family" title="Family" />
@@ -78,7 +78,7 @@
7878
<SPACE />
7979
<GETLIST idref="tamriel-atmer-family-supplimental" title="intrix2" />
8080
<SPACE />
81-
<GETLIST idref="tamriel-atmer-family" title="Family" />
81+
<GETRULE idref="tamriel-atmer-family" title="Family" />
8282
</RULE>
8383
<RULE weight="2">
8484
<GETRULE idref="tamriel-atmer-family" title="Family" />
@@ -155,19 +155,19 @@
155155
<GETLIST idref="tamrelic-adverb-b" title="Adverb" />
156156
</RULE>
157157
<RULE weight="2">
158-
<GETLIST idref="tamrelilic-noun-a" title="Noun" />
158+
<GETLIST idref="tamrelic-noun-a" title="Noun" />
159159
<HYPHEN />
160160
<GETLIST idref="tamrelic-adverb-b" title="Adj" />
161161
</RULE>
162162
<RULE weight="2">
163-
<GETLIST idref="tamrelilic-noun-a" title="Noun A" />
163+
<GETLIST idref="tamrelic-noun-a" title="Noun A" />
164164
<HYPHEN />
165165
<GETLIST idref="tamrelic-nn-articles" title="Article" />
166166
<HYPHEN />
167167
<GETLIST idref="tamrelic-noun-b" title="Noun B" />
168168
</RULE>
169169
<RULE weight="1">
170-
<GETLIST idref="tamrelilic-noun-a" title="Noun A" />
170+
<GETLIST idref="tamrelic-noun-a" title="Noun A" />
171171
<HYPHEN />
172172
<GETLIST idref="tamrelic-noun-b" title="Noun B" />
173173
</RULE>
@@ -194,19 +194,19 @@
194194
<GETLIST idref="tamrelic-adverb-b" title="Adverb" />
195195
</RULE>
196196
<RULE weight="2">
197-
<GETLIST idref="tamrelilic-noun-a" title="Noun" />
197+
<GETLIST idref="tamrelic-noun-a" title="Noun" />
198198
<HYPHEN />
199199
<GETLIST idref="tamrelic-adverb-b" title="Adj" />
200200
</RULE>
201201
<RULE weight="1">
202-
<GETLIST idref="tamrelilic-noun-a" title="Noun A" />
202+
<GETLIST idref="tamrelic-noun-a" title="Noun A" />
203203
<HYPHEN />
204204
<GETLIST idref="tamrelic-nn-articles" title="Article" />
205205
<HYPHEN />
206206
<GETLIST idref="tamrelic-noun-b" title="Noun B" />
207207
</RULE>
208208
<RULE weight="1">
209-
<GETLIST idref="tamrelilic-noun-a" title="Noun A" />
209+
<GETLIST idref="tamrelic-noun-a" title="Noun A" />
210210
<HYPHEN />
211211
<GETLIST idref="tamrelic-noun-b" title="Noun B" />
212212
</RULE>
@@ -370,7 +370,7 @@
370370
</RULE>
371371
<RULE>
372372
<GETLIST idref="tamriel-dunmer-surname-prefix" title="Prefix" />
373-
<GETLIST idref="tamriel-dunmer-surname-Suffix" title="Suffix" />
373+
<GETLIST idref="tamriel-dunmer-surname-suffix" title="Suffix" />
374374
</RULE>
375375
</RULESET>
376376

@@ -406,11 +406,11 @@
406406
<CATEGORY title="Sex: Male" />
407407
<RULE weight="12">
408408
<GETLIST idref="tamriel-kajiit-male-prefix" title="Honorific" />
409-
<GETRULE idref="tamriel-kajiit-male-core" title="Core" />
409+
<GETLIST idref="tamriel-kajiit-male-core" title="Core" />
410410
</RULE>
411411
<RULE weight="1">
412412
<GETLIST idref="tamriel-kajiit-male-prefix" title="Honorific A" />
413-
<GETRULE idref="tamriel-kajiit-male-core" title="Core" />
413+
<GETLIST idref="tamriel-kajiit-male-core" title="Core" />
414414
<GETLIST idref="tamriel-kajiit-male-suffix" title="Honorific B" />
415415
</RULE>
416416
<RULE weight="3">
@@ -419,12 +419,12 @@
419419
<GETLIST idref="tamrelic-noun-b" title="Noun" />
420420
</RULE>
421421
<RULE weight="2">
422-
<GETLIST idref="tamrelilic-noun-a" title="Noun" />
422+
<GETLIST idref="tamrelic-noun-a" title="Noun" />
423423
<HYPHEN />
424424
<GETLIST idref="tamrelic-adverb-b" title="Adj" />
425425
</RULE>
426426
<RULE weight="12">
427-
<GETRULE idref="tamriel-kajiit-male-core" title="Core" />
427+
<GETLIST idref="tamriel-kajiit-male-core" title="Core" />
428428
<GETLIST idref="tamriel-kajiit-male-suffix" title="Honorific B" />
429429
</RULE>
430430
</RULESET>
@@ -435,11 +435,11 @@
435435
<CATEGORY title="Sex: Female" />
436436
<RULE weight="12">
437437
<GETLIST idref="tamriel-kajiit-female-prefix" title="Honorific" />
438-
<GETRULE idref="tamriel-kajiit-female-core" title="Core" />
438+
<GETLIST idref="tamriel-kajiit-female-core" title="Core" />
439439
</RULE>
440440
<RULE weight="1">
441441
<GETLIST idref="tamriel-kajiit-female-prefix" title="Honorific A" />
442-
<GETRULE idref="tamriel-kajiit-female-core" title="Core" />
442+
<GETLIST idref="tamriel-kajiit-female-core" title="Core" />
443443
<GETLIST idref="tamriel-kajiit-female-suffix" title="Honorific B" />
444444
</RULE>
445445
<RULE weight="12">

‎plugins/Random Names/fantasy.xml‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -92,22 +92,22 @@
9292
<GETLIST idref="fantasy-misc-village-names" title="Misc Location Name"/>
9393
</RULE>
9494
<RULE weight="150">
95-
<GETLIST idref="russian-historical-village-rule" title="Historical Russian Location"/>
95+
<GETRULE idref="russian-historical-village-rule" title="Historical Russian Location"/>
9696
</RULE>
9797
<RULE weight="150">
98-
<GETLIST idref="english-historical-village-rule" title="Historical English Location"/>
98+
<GETRULE idref="english-historical-village-rule" title="Historical English Location"/>
9999
</RULE>
100100
<RULE weight="150">
101-
<GETLIST idref="italian-historical-village-rule" title="Historical Italian Location"/>
101+
<GETRULE idref="italian-historical-village-rule" title="Historical Italian Location"/>
102102
</RULE>
103103
<RULE weight="150">
104-
<GETLIST idref="roman-historical-village-rule" title="Historical Roman Location"/>
104+
<GETRULE idref="roman-historical-village-rule" title="Historical Roman Location"/>
105105
</RULE>
106106
<RULE weight="100">
107-
<GETLIST idref="french-historical-village-rule" title="Historical French Location"/>
107+
<GETRULE idref="french-historical-village-rule" title="Historical French Location"/>
108108
</RULE>
109109
<RULE weight="150">
110-
<GETLIST idref="arabic-historical-location-rule" title="Historical Arabic Location"/>
110+
<GETRULE idref="arabic-historical-location-rule" title="Historical Arabic Location"/>
111111
</RULE>
112112
</RULESET>
113113
<RULESET id="fantasy-general-elf-male" title="Consolidated Elven" usage="final">
@@ -118,10 +118,10 @@
118118
<GETRULE idref="fantasy_craft-elf" title="Fantasy Craft" />
119119
</RULE>
120120
<RULE weight="3">
121-
<GETLIST idref="tamriel-atmer-male-full-rule" title="Atmer (High Elf)" />
121+
<GETRULE idref="tamriel-atmer-male-full-rule" title="Atmer (High Elf)" />
122122
</RULE>
123123
<RULE weight="3">
124-
<GETLIST idref="tamriel-bosmer-male-full-rule" title="Bosmer (Wood Elf)" />
124+
<GETRULE idref="tamriel-bosmer-male-full-rule" title="Bosmer (Wood Elf)" />
125125
</RULE>
126126
<RULE weight="3">
127127
<GETRULE idref="tamriel-dunmer-male-rule" title="Dunmer (Dark Elf)" />
@@ -142,7 +142,7 @@
142142
<GETRULE idref="mar-elf-male-rule" title="Mar Elf" />
143143
</RULE>
144144
<RULE weight="1">
145-
<GETRULE idref="mar-standard-rule" title="Mar Standard" />
145+
<GETRULE idref="mar-standard-male-rule" title="Mar Standard" />
146146
</RULE>
147147
<RULE weight="5">
148148
<GETRULE idref="middle-earth-fantasy-elven-male-rule" title="Middle-Earth" />
@@ -159,10 +159,10 @@
159159
<GETRULE idref="fantasy_craft-elf" title="Fantasy Craft" />
160160
</RULE>
161161
<RULE weight="3">
162-
<GETLIST idref="tamriel-atmer-female-full-rule" title="Atmer (High Elf)" />
162+
<GETRULE idref="tamriel-atmer-female-full-rule" title="Atmer (High Elf)" />
163163
</RULE>
164164
<RULE weight="3">
165-
<GETLIST idref="tamriel-bosmer-female-full-rule" title="Bosmer (Wood Elf)" />
165+
<GETRULE idref="tamriel-bosmer-female-full-rule" title="Bosmer (Wood Elf)" />
166166
</RULE>
167167
<RULE weight="3" >
168168
<GETRULE idref="tamriel-dunmer-female-rule" title="Dunmer (Dark Elf)" />
@@ -174,7 +174,7 @@
174174
<GETRULE idref="mar-elf-female-rule" title="Mar Elf" />
175175
</RULE>
176176
<RULE weight="1">
177-
<GETRULE idref="mar-standard-rule" title="Mar Standard" />
177+
<GETRULE idref="mar-standard-female-rule" title="Mar Standard" />
178178
</RULE>
179179
<RULE weight="1"> <!-- Short list of possible names, so bring these up less often-->
180180
<GETRULE idref="cg-fantasy-half-elf-female-rule" title="Half-Elf"/>
@@ -203,8 +203,8 @@
203203
<GETRULE idref="mar-dwarf-male-rule" title="Mar Dwarf" />
204204
</RULE>
205205
<RULE weight="1">
206-
<GETRULE idref="mar-standard-rule" title="Mar Standard" />
207-
</RULE>
206+
<GETRULE idref="mar-standard-male-rule" title="Mar Standard" />
207+
</RULE>
208208
</RULESET>
209209
<RULESET id="fantasy-general-dwarf-female" title="Consolidated Dwarven" usage="final">
210210
<CATEGORY title="All"/>
@@ -221,10 +221,10 @@
221221
</RULE>
222222
<RULE weight="5">
223223
<GETRULE idref="mar-dwarf-female-rule" title="Mar Dwarf" />
224-
</RULE>
224+
</RULE>
225225
<RULE weight="1">
226-
<GETRULE idref="mar-standard-rule" title="Mar Standard" />
227-
</RULE>
226+
<GETRULE idref="mar-standard-female-rule" title="Mar Standard" />
227+
</RULE>
228228
</RULESET>
229229

230230
<RULESET id="fantasy-general-halfling-male" title="Consolidated Halfling" usage="final">
@@ -238,7 +238,7 @@
238238
<GETRULE idref="middle-earth-fantasy-halfling-male-rule" title="Hobbit" />
239239
</RULE>
240240
<RULE weight="1">
241-
<GETRULE idref="mar-standard-rule" title="Mar Standard" />
241+
<GETRULE idref="mar-standard-male-rule" title="Mar Standard" />
242242
</RULE>
243243
</RULESET>
244244
<RULESET id="fantasy-general-halfling-female" title="Consolidated Halfling" usage="final">
@@ -252,7 +252,7 @@
252252
<GETRULE idref="middle-earth-fantasy-halfling-female-rule" title="Hobbit" />
253253
</RULE>
254254
<RULE weight="1">
255-
<GETRULE idref="mar-standard-rule" title="Mar Standard" />
255+
<GETRULE idref="mar-standard-female-rule" title="Mar Standard" />
256256
</RULE>
257257
</RULESET>
258258

‎plugins/Random Names/fantasy_craft.xml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -269,21 +269,21 @@
269269
<CATEGORY title="Fantasy Craft"/>
270270
<CATEGORY title="Sex: Male"/>
271271
<RULE weight="6">
272-
<GETLIST idref="fantasy_craft-human-male-first" title="Human Given"/>
272+
<GETRULE idref="fantasy_craft-human-male-first" title="Human Given"/>
273273
<SPACE/>
274274
<GETLIST idref="fantasy_craft-positive" title="Positive"/>
275275
<HYPHEN />
276276
<GETLIST idref="fantasy_craft-critters" title="Critters"/>
277277
</RULE>
278278
<RULE weight="6">
279-
<GETLIST idref="fantasy_craft-human-male-first" title="Human Given"/>
279+
<GETRULE idref="fantasy_craft-human-male-first" title="Human Given"/>
280280
<SPACE/>
281281
<GETLIST idref="fantasy_craft-critters" title="Critters"/>
282282
<HYPHEN />
283283
<GETLIST idref="fantasy_craft-anatomy" title="Anatomy"/>
284284
</RULE>
285285
<RULE weight="4">
286-
<GETLIST idref="fantasy_craft-human-male-first" title="Human Given"/>
286+
<GETRULE idref="fantasy_craft-human-male-first" title="Human Given"/>
287287
<SPACE/>
288288
<GETLIST idref="fantasy_craft-elvish-prefix" title="Elf Prefix"/>
289289
<GETLIST idref="fantasy_craft-elvish-suffix" title="Elf Suffix"/>
@@ -302,21 +302,21 @@
302302
<CATEGORY title="Fantasy Craft"/>
303303
<CATEGORY title="Sex: Female"/>
304304
<RULE weight="6">
305-
<GETLIST idref="fantasy_craft-human-female-first" title="Human Given"/>
305+
<GETRULE idref="fantasy_craft-human-female-first" title="Human Given"/>
306306
<SPACE/>
307307
<GETLIST idref="fantasy_craft-positive" title="Positive"/>
308308
<HYPHEN />
309309
<GETLIST idref="fantasy_craft-critters" title="Critters"/>
310310
</RULE>
311311
<RULE weight="6">
312-
<GETLIST idref="fantasy_craft-human-female-first" title="Human Given"/>
312+
<GETRULE idref="fantasy_craft-human-female-first" title="Human Given"/>
313313
<SPACE/>
314314
<GETLIST idref="fantasy_craft-critters" title="Critters"/>
315315
<HYPHEN />
316316
<GETLIST idref="fantasy_craft-anatomy" title="Anatomy"/>
317317
</RULE>
318318
<RULE weight="4">
319-
<GETLIST idref="fantasy_craft-human-female-first" title="Human Given"/>
319+
<GETRULE idref="fantasy_craft-human-female-first" title="Human Given"/>
320320
<SPACE/>
321321
<GETLIST idref="fantasy_craft-elvish-prefix" title="Elf Prefix"/>
322322
<GETLIST idref="fantasy_craft-elvish-suffix" title="Elf Suffix"/>
@@ -553,7 +553,7 @@
553553
<GETLIST idref="fantasy_craft-actions" title="Actions"/>
554554
</RULE>
555555
<RULE weight="5">
556-
<GETLIST idref="fantasy_craft-folkish-either" title="Folk Given"/>
556+
<GETRULE idref="fantasy_craft-folkish-either" title="Folk Given"/>
557557
<GETLIST idref="fantasy_craft-possessive" title="'s"/>
558558
<SPACE/>
559559
<GETLIST idref="fantasy_craft-negative" title="Negative"/>

‎plugins/Random Names/french.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@
99
<RULE weight="2">
1010
<GETLIST idref="french-male-given" title="Given"/>
1111
<SPACE/>
12-
<GETLIST idref="french-historical-surname-rule" title="Surname"/>
12+
<GETRULE idref="french-historical-surname-rule" title="Surname"/>
1313
</RULE>
1414
<RULE weight="1">
1515
<GETLIST idref="french-male-given" title="Given"/>
1616
<SPACE/>
17-
<GETLIST idref="french-historical-locative-byname-rule" title="Locative Byname"/>
17+
<GETRULE idref="french-historical-locative-byname-rule" title="Locative Byname"/>
1818
</RULE>
1919
</RULESET>
2020
<RULESET id="french-historical-female-rule" title="French" usage="final">
@@ -25,12 +25,12 @@
2525
<RULE weight="2">
2626
<GETLIST idref="french-female-given" title="Given"/>
2727
<SPACE/>
28-
<GETLIST idref="french-historical-surname-rule" title="Surname"/>
28+
<GETRULE idref="french-historical-surname-rule" title="Surname"/>
2929
</RULE>
3030
<RULE weight="1">
3131
<GETLIST idref="french-female-given" title="Given"/>
3232
<SPACE/>
33-
<GETLIST idref="french-historical-locative-byname-rule" title="Locative Byname"/>
33+
<GETRULE idref="french-historical-locative-byname-rule" title="Locative Byname"/>
3434
</RULE>
3535
</RULESET>
3636
<RULESET id="french-historical-village-rule" title="French Location" usage="final">

0 commit comments

Comments
 (0)