Merge pull request #350 from w3c/Issue267

Fixes the definition of evaluation of property path with OneOrMorePath

Author: hartig

spec/index.html

@@ -9920,6 +9920,11 @@ <h3>Property Path Patterns</h3>
             </tbody>
           </table>
         </div>
+<div class="issue" data-number="349">
+  The signature of `ppeval` should be extended to be:
+  `ppeval`(|X|, |ppe|, |Y|, |G|),
+  where |G| is an RDF graph.
+</div>
         <p>All evaluation is carried out by matching the <a href="#defn_ActiveGraph">active graph</a>
           at that point in the overall query evaluation. We omit explicitly including the active graph
           in each definition for clarity.</p>
@@ -10079,7 +10084,10 @@ <h3>Property Path Patterns</h3>
 # For <a href="#defn_ppeOneOrMorePath" class="ppeOp">OneOrMorePath</a>, we take one step of the path then start
 # recording nodes for results.
 
-ppeval(<var>x</var>:term, <a href="#defn_ppeOneOrMorePath" class="ppeOp">OneOrMorePath</a>(<var>ppe</var>), <var>vy</var>:var) =
+ppeval(<var>x</var>:term, <a href="#defn_ppeOneOrMorePath" class="ppeOp">OneOrMorePath</a>(<var>ppe</var>), <var>vy</var>:var) = { { (<var>vy</var>, <var>t</var>) } | <var>t</var> in <var>V</var> }
+    where <var>V</var> is the set of RDF terms that is returned by the
+    following algorithm.
+
     Let <var>X</var> = <a href="#defn_reachableTerms"><var>reachableTerms</var></a>(<var>x</var>, <var>ppe</var>)
     Let <var>V</var> = the empty multiset
     For <var>n</var> in <var>X</var>
@@ -10098,7 +10106,6 @@ <h3>Property Path Patterns</h3>
     { { } } if { (<var>vy</var>:var, <var>y</var>) } in ppeval(<var>x</var>, <a href="#defn_ppeOneOrMorePath" class="ppeOp">OneOrMorePath</a>(<var>ppe</var>), <var>vy</var>)
     { } otherwise
 </pre>
-<div class="issue" data-number="267"><var>V</var> is not a multiset of solution mappings but a set of RDF terms.</div>
         </div>
         <div class="defn">
           <p><b>Definition: <span id="eval_negatedPropertySet">Evaluation of NegatedPropertySet</span></b></p>