From 59edd7122e8c5a59d72d483e1b4bec257b1abb74 Mon Sep 17 00:00:00 2001
From: Quinn Dougherty <quinnd@riseup.net>
Date: Mon, 9 May 2022 15:24:46 -0400
Subject: [PATCH] wrapped error in function

Value: [1e-5 to 1e-3]
---
 .../ReducerInterface_GenericDistribution.res   | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res
index fc1c7f28..fa7be3be 100644
--- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res
+++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_GenericDistribution.res
@@ -119,19 +119,20 @@ module Helpers = {
     mixtureWithGivenWeights(distributions, weights)
   }
 
-  let mixture = (args: array<expressionValue>): DistributionOperation.outputType =>
+  let mixture = (args: array<expressionValue>): DistributionOperation.outputType => {
+    let error = (err: string): DistributionOperation.outputType => err->ArgumentError->GenDistError
     switch args {
     | [EvArray(distributions)] =>
       switch parseDistributionArray(distributions) {
       | Ok(distrs) => mixtureWithDefaultWeights(distrs)
-      | Error(err) => err->ArgumentError->GenDistError
+      | Error(err) => error(err)
       }
     | [EvArray(distributions), EvArray(weights)] =>
       switch (parseDistributionArray(distributions), parseNumberArray(weights)) {
       | (Ok(distrs), Ok(wghts)) => mixtureWithGivenWeights(distrs, wghts)
-      | (Error(err), Ok(_)) => err->ArgumentError->GenDistError
-      | (Ok(_), Error(err)) => err->ArgumentError->GenDistError
-      | (Error(err1), Error(err2)) => `${err1}|${err2}`->ArgumentError->GenDistError
+      | (Error(err), Ok(_)) => error(err)
+      | (Ok(_), Error(err)) => error(err)
+      | (Error(err1), Error(err2)) => error(`${err1}|${err2}`)
       }
     | _ =>
       switch E.A.last(args) {
@@ -142,18 +143,19 @@ module Helpers = {
           )
           switch E.R.merge(distributions, weights) {
           | Ok(d, w) => mixtureWithGivenWeights(d, w)
-          | Error(err) => GenDistError(ArgumentError(err))
+          | Error(err) => error(err)
           }
         }
       | Some(EvNumber(_))
       | Some(EvDistribution(_)) =>
         switch parseDistributionArray(args) {
         | Ok(distributions) => mixtureWithDefaultWeights(distributions)
-        | Error(err) => GenDistError(ArgumentError(err))
+        | Error(err) => error(err)
         }
-      | _ => GenDistError(ArgumentError("Last argument of mx must be array or distribution"))
+      | _ => error("Last argument of mx must be array or distribution")
       }
     }
+  }
 }
 
 module SymbolicConstructors = {