From 2d1f37b9b65f664d97ab5e64e45177d7cc514200 Mon Sep 17 00:00:00 2001 From: Brian Huffman Date: Sun, 17 May 2020 08:33:10 -0700 Subject: [PATCH 1/2] Update stack.yaml files to make them work again. --- stack.ghc-8.4.yaml | 2 ++ stack.ghc-8.6.yaml | 2 ++ stack.ghc-8.8.yaml | 2 ++ 3 files changed, 6 insertions(+) diff --git a/stack.ghc-8.4.yaml b/stack.ghc-8.4.yaml index d53f17ac3a..41843804b6 100644 --- a/stack.ghc-8.4.yaml +++ b/stack.ghc-8.4.yaml @@ -57,5 +57,7 @@ extra-deps: - yaml-0.11.2.0 - libyaml-0.1.2 - aeson-1.4.3.0 + - QuickCheck-2.14 + - splitmix-0.0.4 resolver: lts-12.26 allow-newer: false diff --git a/stack.ghc-8.6.yaml b/stack.ghc-8.6.yaml index 3293a43375..b34a745480 100644 --- a/stack.ghc-8.6.yaml +++ b/stack.ghc-8.6.yaml @@ -53,5 +53,7 @@ extra-deps: - config-value-0.6.3.1 - simple-get-opt-0.3 - base-orphans-0.8.2 + - QuickCheck-2.14 + - splitmix-0.0.4 resolver: lts-14.3 allow-newer: false diff --git a/stack.ghc-8.8.yaml b/stack.ghc-8.8.yaml index 418bc586fc..70596308ac 100644 --- a/stack.ghc-8.8.yaml +++ b/stack.ghc-8.8.yaml @@ -46,5 +46,7 @@ extra-deps: - base-orphans-0.8.2 - base-compat-0.10.5 - json-0.10 + - QuickCheck-2.14 + - splitmix-0.0.4 resolver: lts-15.1 allow-newer: false From 5de5be2c96d3279cc3ea21141334fbbbf936f0ad Mon Sep 17 00:00:00 2001 From: Brian Huffman Date: Sun, 17 May 2020 08:58:29 -0700 Subject: [PATCH 2/2] Remove call to `error` in saw-script type checker. Fixes #698. --- src/SAWScript/MGU.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SAWScript/MGU.hs b/src/SAWScript/MGU.hs index 3305e7161b..74130f878f 100644 --- a/src/SAWScript/MGU.hs +++ b/src/SAWScript/MGU.hs @@ -625,7 +625,7 @@ inferRecDecls ds = $ sequence [ withExprPos pos $ inferE (patternLName p, e) | Decl pos p _ e <- ds ] - sequence_ $ zipWith (constrainTypeWithPattern (error "FIXME")) ts pats' + sequence_ $ zipWith (constrainTypeWithPattern (patternLName (head pats))) ts pats' ess <- generalize es ts return [ Decl pos p (Just s) e1 | (pos, p, (e1, s)) <- zip3 (map getPos ds) pats ess