Skip to content
Prev Previous commit
Next Next commit
Clarify in the grammar that in a map, an alias of @none may be used…
…, as well as the bare keyword `@none`.

Fix some minor issues in the API defining values of `@nest`.
  • Loading branch information
gkellogg committed Jan 18, 2018
commit b1cc41beb1b26ea8e88a1243aaa1af57af3e1665
4 changes: 2 additions & 2 deletions spec/latest/json-ld-api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -2200,7 +2200,7 @@ <h3>Algorithm</h3>
<em>inside reverse</em>.</li>
<li class="changed">If the <a>term definition</a> for <em>item active property</em>
in the <em>active context</em> has a <a>nest value</a>, that value (<em>nest term</em>) must be
<code>@nest</code>, or a <a>term definition</a> in the
<code>@nest</code>, or a <a>term</a> in the
<em>active context</em> that expands to <code>@nest</code>,
otherwise an <a data-link-for="JsonLdErrorCode">invalid @nest
value</a> error has been detected, and processing is aborted.
Expand Down Expand Up @@ -2235,7 +2235,7 @@ <h3>Algorithm</h3>
<li class="changed">If the <a>term definition</a> for <em>item active property</em>
in the <em>active context</em> has a <a>nest value</a>
member, that value (<em>nest term</em>) must be
<code>@nest</code>, or a <a>term definition</a> in the
<code>@nest</code>, or a <a>term</a> in the
<em>active context</em> that expands to <code>@nest</code>,
otherwise an <a data-link-for="JsonLdErrorCode">invalid @nest
value</a> error has been detected, and processing is aborted.
Expand Down
10 changes: 7 additions & 3 deletions spec/latest/json-ld/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -4448,7 +4448,9 @@ <h2>Language Maps</h2>
or an array containing both <code>@language</code> and <code>@set</code>
</span>. The keys of a
<a>language map</a> MUST be <a>strings</a> representing
[[BCP47]] language codes, or the <a>keyword</a> <code>@none</code>, and the values MUST be any of the following types:</p>
[[BCP47]] language codes, the <a>keyword</a> <code>@none</code>,
or a <a>term</a> which expands to <code>@none</code>,
and the values MUST be any of the following types:</p>

Copy link
Contributor

Choose a reason for hiding this comment

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

..., the keyword @none or an alias that expands to it, and ... ?

<ul>
<li><a>null</a>,</li>
Expand Down Expand Up @@ -4507,7 +4509,8 @@ <h2>Id Maps</h2>
or an array containing both <code>@id</code> and <code>@set</code>.
The keys of an <a>id map</a> MUST be <a>IRIs</a>
(<a>relative IRI</a>, <a>compact IRI</a> (including <a>blank node identifiers</a>), or <a>absolute IRI</a>),
or the <a>keyword</a> <code>@none</code>,
the <a>keyword</a> <code>@none</code>,
or a <a>term</a> which expands to <code>@none</code>,
and the values MUST be <a>node objects</a>.</p>

<p>If the value contains a property expanding to <code>@id</code>, it's value MUST
Expand All @@ -4531,7 +4534,8 @@ <h2>Type Maps</h2>
or an array containing both <code>@type</code> and <code>@set</code>.
The keys of a <a>type map</a> MUST be <a>IRIs</a>
(<a>relative IRI</a>, <a>compact IRI</a> (including <a>blank node identifiers</a>), or <a>absolute IRI</a>),
or the <a>keyword</a> <code>@none</code>,
the <a>keyword</a> <code>@none</code>,
or a <a>term</a> which expands to <code>@none</code>,
and the values MUST be <a>node objects</a>.</p>

<p>If the value contains a property expanding to <code>@type</code>, and it's value
Expand Down