authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-13 11:09:41-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2018-06-13 11:09:41-04:00
log41e6c664d8b751b81effd2341cf1bd5950c40d8c
tree55f1ee0e657a05d8d2804218badfcdc285b1c505
parent8dd24796c43b5241a5dcd5508e4be00483ebc25b

langref: add merge error sets operator to operator table

1 files changed, 17 insertions(+), 1 deletions(-)

doc/langref.html.in+17-1
...@@ -1261,6 +1261,22 @@ const ptr = &amp;x;...@@ -1261,6 +1261,22 @@ const ptr = &amp;x;
1261x.* == 1234</code></pre>1261x.* == 1234</code></pre>
1262 </td>1262 </td>
1263 </tr>1263 </tr>
1264 <tr>
1265 <td><pre><code class="zig">a || b<code></pre></td>
1266 <td>
1267 <ul>
1268 <li>{#link|Error Set Type#}</li>
1269 </ul>
1270 </td>
1271 <td>
1272 {#link|Merging Error Sets#}
1273 </td>
1274 <td>
1275 <pre><code class="zig">const A = error{One};
1276const B = error{Two};
1277(A || B) == error{One, Two}</code></pre>
1278 </td>
1279 </tr>
1264 </table>1280 </table>
1265 </div>1281 </div>
1266 {#header_close#}1282 {#header_close#}
...@@ -1269,7 +1285,7 @@ x.* == 1234</code></pre>...@@ -1269,7 +1285,7 @@ x.* == 1234</code></pre>
1269a!b1285a!b
1270!x -x -%x ~x &amp;x ?x1286!x -x -%x ~x &amp;x ?x
1271x{} x.* x.?1287x{} x.* x.?
1272! * / % ** *%1288! * / % ** *% ||
1273+ - ++ +% -%1289+ - ++ +% -%
1274&lt;&lt; &gt;&gt;1290&lt;&lt; &gt;&gt;
1275&amp;1291&amp;