Fix context processing for reverse terms

Fixes w3c#565.

Author: niklasl

index.html

@@ -1664,10 +1664,10 @@ <h3>Algorithm</h3>
             <li>Set the <a>term definition</a> of <var>term</var> in
               <var>active context</var> to <var>definition</var> and the
               value associated with <var>defined</var>'s <a>entry</a> <var>term</var> to
-              <code>true</code> and return.</li>
+              <code>true</code>.</li>
           </ol>
         </li>
-        <li>If <var>value</var> contains the <a>entry</a> <code>@id</code> and its value
+        <li>Otherwise if <var>value</var> contains the <a>entry</a> <code>@id</code> and its value
           does not equal <var>term</var>:
           <ol>
             <li id="ctd-id-null">If the <code>@id</code> <a>entry</a> of <var>value</var>

tests/expand-manifest.html

@@ -3215,6 +3215,34 @@ <h2>
 </dd>
 </dl>
 </dd>
+<dt id='t0131'>
+Test t0131 Reverse term with property based indexed container
+</dt>
+<dd>
+<dl class='entry'>
+<dt>id</dt>
+<dd>#t0131</dd>
+<dt>Type</dt>
+<dd>jld:PositiveEvaluationTest, jld:ExpandTest</dd>
+<dt>Purpose</dt>
+<dd>Expanding a reverse term using @container: @index and @index set to a property</dd>
+<dt>input</dt>
+<dd>
+<a href='expand/0131-in.jsonld'>expand/0131-in.jsonld</a>
+</dd>
+<dt>expect</dt>
+<dd>
+<a href='expand/0131-out.jsonld'>expand/0131-out.jsonld</a>
+</dd>
+<dt>Options</dt>
+<dd>
+<dl class='options'>
+<dt>specVersion</dt>
+<dd>json-ld-1.1</dd>
+</dl>
+</dd>
+</dl>
+</dd>
 <dt id='tc001'>
 Test tc001 adding new term
 </dt>

tests/expand-manifest.jsonld

@@ -978,6 +978,14 @@
       "purpose": "Verify URI resolution relative to base (without trailing slash, with path) according to RFC 3986",
       "input": "expand/0130-in.jsonld",
       "expect": "expand/0130-out.jsonld"
+    }, {
+      "@id": "#t0131",
+      "@type": [ "jld:PositiveEvaluationTest", "jld:ExpandTest" ],
+      "name": "Reverse term with property based indexed container",
+      "purpose": "Expanding a reverse term using @container: @index and @index set to a property",
+      "input": "expand/0131-in.jsonld",
+      "expect": "expand/0131-out.jsonld",
+      "option": {"specVersion": "json-ld-1.1"}
     }, {
       "@id": "#tc001",
       "@type": ["jld:PositiveEvaluationTest", "jld:ExpandTest"],

tests/expand/0131-in.jsonld

@@ -0,0 +1,16 @@
+{
+  "@context": {
+    "@version": 1.1,
+    "@base": "https://example.org/",
+    "@vocab": "https://example.net/ns#",
+    "rdf": "http://www.w3.org/1999/02/22-rdf-syntax-ns#",
+    "statement": {"@reverse": "rdf:subject", "@container": "@index", "@index": "predicate"},
+    "predicate": {"@id": "rdf:predicate", "@type": "@vocab"},
+    "term": {"@id": "rdf:object", "@type": "@vocab"},
+    "addedIn": {"@type": "@id"}
+  },
+  "@id": "item/1",
+  "statement": {
+    "rdf:type": {"term": "A", "addedIn": "v1"}
+  }
+}

tests/expand/0131-out.jsonld

@@ -0,0 +1,26 @@
+[
+  {
+    "@id": "https://example.org/item/1",
+    "@reverse": {
+      "http://www.w3.org/1999/02/22-rdf-syntax-ns#subject": [
+        {
+          "https://example.net/ns#addedIn": [
+            {
+              "@id": "https://example.org/v1"
+            }
+          ],
+          "http://www.w3.org/1999/02/22-rdf-syntax-ns#object": [
+            {
+              "@id": "https://example.net/ns#A"
+            }
+          ],
+          "http://www.w3.org/1999/02/22-rdf-syntax-ns#predicate": [
+            {
+              "@id": "http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
+            }
+          ]
+        }
+      ]
+    }
+  }
+]