diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-06-13 11:09:41 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-06-13 11:09:41 -0400 |
| commit | 41e6c664d8b751b81effd2341cf1bd5950c40d8c (patch) | |
| tree | 55f1ee0e657a05d8d2804218badfcdc285b1c505 | |
| parent | 8dd24796c43b5241a5dcd5508e4be00483ebc25b (diff) | |
| download | zig-41e6c664d8b751b81effd2341cf1bd5950c40d8c.tar.gz zig-41e6c664d8b751b81effd2341cf1bd5950c40d8c.zip | |
langref: add merge error sets operator to operator table
| -rw-r--r-- | doc/langref.html.in | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/doc/langref.html.in b/doc/langref.html.in index 290ed77e7d..1fccd6e351 100644 --- a/doc/langref.html.in +++ b/doc/langref.html.in @@ -1261,6 +1261,22 @@ const ptr = &x; x.* == 1234</code></pre> </td> </tr> + <tr> + <td><pre><code class="zig">a || b<code></pre></td> + <td> + <ul> + <li>{#link|Error Set Type#}</li> + </ul> + </td> + <td> + {#link|Merging Error Sets#} + </td> + <td> + <pre><code class="zig">const A = error{One}; +const B = error{Two}; +(A || B) == error{One, Two}</code></pre> + </td> + </tr> </table> </div> {#header_close#} @@ -1269,7 +1285,7 @@ x.* == 1234</code></pre> a!b !x -x -%x ~x &x ?x x{} x.* x.? -! * / % ** *% +! * / % ** *% || + - ++ +% -% << >> & |