Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Address @lanthaler comments on scoped context changes.
  • Loading branch information
gkellogg committed Jan 3, 2017
commit 5f48c927ab7af773b98fa069dda89d5cdfe3ff0e
13 changes: 9 additions & 4 deletions spec/latest/json-ld-api/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -877,7 +877,7 @@ <h3>Algorithm</h3>
<li>If <em>value</em> contains the key <code>@type</code>:
<ol class="algorithm">
<li>Initialize <em>type</em> to the value associated with the
<code>@type</code> key, which MUST be a <a>string</a>. Otherwise, an
<code>@type</code> key, which must be a <a>string</a>. Otherwise, an
<a data-link-for="JsonLdErrorCode">invalid type mapping</a>
error has been detected and processing is aborted.</li>
<li>Set <em>type</em> to the result of using the
Expand Down Expand Up @@ -976,7 +976,7 @@ <h3>Algorithm</h3>
<li>If <em>value</em> contains the key <code>@container</code>:
<ol class="algorithm">
<li>Initialize <em>container</em> to the value associated with the
<code>@container</code> key, which MUST be either
<code>@container</code> key, which must be either
<code>@list</code>, <code>@set</code>, <code>@index</code>,
or <code>@language</code>. Otherwise, an
<a data-link-for="JsonLdErrorCode">invalid container mapping</a>
Expand All @@ -992,7 +992,7 @@ <h3>Algorithm</h3>
<li>Invoke the <a href="#context-processing-algorithm">Context Processing algorithm</a>
using the <a>active context</a> and <em>context</em> as <a>local context</a>.
If any error is detected, an
<a data-link-for="JsonLdErrorCode">invalid scoped context</a> errors
<a data-link-for="JsonLdErrorCode">invalid scoped context</a> error
has been detected and processing is aborted.</li>
<li>Set the <a>local context</a> of <em>definition</em> to <em>context</em>.</li>
</ol>
Expand All @@ -1001,7 +1001,7 @@ <h3>Algorithm</h3>
does not contain the key <code>@type</code>:
<ol class="algorithm">
<li>Initialize <em>language</em> to the value associated with the
<code>@language</code> key, which MUST be either <code>null</code>
<code>@language</code> key, which must be either <code>null</code>
or a <a>string</a>. Otherwise, an
<a data-link-for="JsonLdErrorCode">invalid language mapping</a>
error has been detected and processing is aborted.</li>
Expand All @@ -1010,6 +1010,11 @@ <h3>Algorithm</h3>
of <em>definition</em> to <em>language</em>.</li>
</ol>
</li>
<li>If the value contains any key other than <code>@id</code>,
<code>@reverse</code>, <code>@container</code>,
<code>@context</code>, or <code>@type</code>, an
<a data-link-for="JsonLdErrorCode">invalid term definition</a> error has
been detected and processing is aborted.</li>
<li>Set the <a>term definition</a> of <em>term</em> in
<a>active context</a> to <em>definition</em> and set the value
associated with <em>defined</em>'s key <em>term</em> to
Expand Down