Skip to content

Commit b83e092

Browse files
committed
Further improve applicator interaction language
There were more places where some interaction between applicators and annoations were implied. This fixes thos.
1 parent f0eca1c commit b83e092

File tree

1 file changed

+13
-8
lines changed

1 file changed

+13
-8
lines changed

jsonschema-core.xml

+13-8
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,12 @@
655655
Typically, applicator keywords are processed until a schema object with no
656656
applicators (and therefore no subschemas) is reached. The appropriate
657657
location in the instance is evaluated against the assertion and
658-
annotation keywords in the schema object, and their results are gathered
659-
into the parent schema according to the rules of the applicator.
658+
annotation keywords in the schema object. The interactions of those
659+
keyword results to produce the schema object results are governed by
660+
section <xref target="annot-assert" format="counter"></xref>, while the
661+
relationship of subschema results to the results of the applicator
662+
keyword that applied them is described by section
663+
<xref target="applicators" format="counter"></xref>.
660664
</t>
661665
<t>
662666
Evaluation of a parent schema object can complete once all of its
@@ -811,10 +815,11 @@
811815
assertion conditions of their own.
812816
</t>
813817
<t>
814-
<xref target="annotations">Annotation</xref> results are
815-
preserved along with the instance location and the location of
816-
the schema keyword, so that applications can decide how to
817-
interpret multiple values.
818+
<xref target="annotations">Annotation</xref> results from subschemas
819+
are preserved in accordance with section
820+
<xref target="collect" format="counter"></xref> so that applications
821+
can decide how to interpret multiple values. Applicator keywords
822+
do not play a direct role in this preservation.
818823
</t>
819824
<section title="Referenced and Referencing Schemas" anchor="referenced">
820825
<t>
@@ -935,7 +940,7 @@
935940
for failing schemas.
936941
</t>
937942

938-
<section title="Collecting Annotations">
943+
<section title="Collecting Annotations" anchor="collect">
939944
<t>
940945
Annotations are collected by keywords that explicitly define
941946
annotation-collecting behavior. Note that boolean schemas cannot
@@ -1058,7 +1063,7 @@
10581063
schema locations.
10591064
</t>
10601065
</section>
1061-
<section title="Annotations and Assertions">
1066+
<section title="Annotations and Assertions" anchor="annot-assert">
10621067
<t>
10631068
Schema objects that produce a false assertion result MUST NOT
10641069
produce any annotation results, whether from their own keywords

0 commit comments

Comments
 (0)