From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 2 Apr 2021 22:44:54 +0000 (+0100)
Subject: utils: Many fixes to want_let
X-Git-Tag: otter-0.5.0~286
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=824cff816953c1908010e66fc712d5b36d065081;p=otter.git

utils: Many fixes to want_let

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/utils.rs b/src/utils.rs
index 853be507..457572cd 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -480,7 +480,9 @@ macro_rules! want_let {
     let $binding = match $input {
       $($variant(y))::+ => y,
       x => {
-        want_failed_internal!{ $variant($binding)=$input, x, $($d:expr),* }
+        want_failed_internal!{
+          $($variant)::+($binding)=$input, x, $($d),*
+        }
         $($otherwise)*
       },
     };
@@ -488,7 +490,7 @@ macro_rules! want_let {
   { $($variant:ident)::+($binding:pat) = $input:expr;
     else $($otherwise:tt)*
   } => {
-    want_let!{ $($variant(y))::+ = $input; ?; $($otherwise)* }
+    want_let!{ $($variant($binding))::+ = $input; else ?; $($otherwise)* }
   };
 }