Skip to content

Commit bc2a042

Browse files
committed
Improved wording, fix typo.
This tries to make the concept of having multiple annotation results for the same keyword more clear in the applicator vocabulary.
1 parent b72cdd6 commit bc2a042

File tree

1 file changed

+17
-8
lines changed

1 file changed

+17
-8
lines changed

jsonschema-core.xml

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,9 +1264,10 @@
12641264
index of the instance, such as when "items" is a schema.
12651265
</t>
12661266
<t>
1267-
Annotation results from multiple "items" keyword are combined
1267+
Annotation results for "items" keywords from multiple
1268+
schemas applied to the same instance location are combined
12681269
by setting the combined result to true if any of the values
1269-
are true, and otherwise retaining the larges numerical value.
1270+
are true, and otherwise retaining the largest numerical value.
12701271
</t>
12711272
<t>
12721273
Omitting this keyword has the same assertion behavior as
@@ -1293,14 +1294,17 @@
12931294
If the "additionalItems" subschema is applied to any
12941295
positions within the instance array, it produces an
12951296
annotation result of boolean true, analogous to the
1296-
single schema behavior of "items".
1297+
single schema behavior of "items". If any "additionalItems"
1298+
keyword from any subschema applied to the same instance
1299+
location produces an annotation value of true, then
1300+
the combined result from these keywords is also true.
12971301
</t>
12981302
<t>
12991303
Omitting this keyword has the same assertion behavior as
13001304
an empty schema.
13011305
</t>
13021306
<t>
1303-
Implementation MAY choose to implement or optimize this keyword
1307+
Implementations MAY choose to implement or optimize this keyword
13041308
in another way that produces the same effect, such as by directly
13051309
checking for the presence and size of an "items" array.
13061310
Implementations that do not support annotation collection MUST do so.
@@ -1341,8 +1345,9 @@
13411345
</t>
13421346
<t>
13431347
The annotation result of this keyword is the set of instance
1344-
property names matched by this keyword. Multiple annotation
1345-
results for "properties" are combined by taking the union
1348+
property names matched by this keyword. Annotation results
1349+
for "properties" keywords from multiple schemas applied to
1350+
the same instance location are combined by taking the union
13461351
of the sets.
13471352
</t>
13481353
<t>
@@ -1366,8 +1371,9 @@
13661371
</t>
13671372
<t>
13681373
The annotation result of this keyword is the set of instance
1369-
property names matched by this keyword. Multiple annotation
1370-
results for "patternProperties" are combined by taking the union
1374+
property names matched by this keyword. Annotation results
1375+
for "patternProperties" keywords from multiple schemas applied to
1376+
the same instance location are combined by taking the union
13711377
of the sets.
13721378
</t>
13731379
<t>
@@ -1395,6 +1401,9 @@
13951401
<t>
13961402
The annotation result of this keyword is the set of instance
13971403
property names validated by this keyword's subschema.
1404+
Annotation results for "additionalProperties" keywords from
1405+
multiple schemas applied to the same instance location are combined
1406+
by taking the union of the sets.
13981407
</t>
13991408
<t>
14001409
Omitting this keyword has the same assertion behavior as

0 commit comments

Comments
 (0)