From f5fcd4f9ae6ab9f080d1dcc6547042642d871b31 Mon Sep 17 00:00:00 2001 From: Ozzie Gooen Date: Tue, 24 May 2022 15:51:22 -0400 Subject: [PATCH] Added type to appease bisect --- .../ReducerInterface_DateTime.res | 60 ++++++++++--------- 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res index 08c96309..fe30b0f8 100644 --- a/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res +++ b/packages/squiggle-lang/src/rescript/ReducerInterface/ReducerInterface_DateTime.res @@ -1,60 +1,62 @@ -module ExpressionValue = ReducerInterface_ExpressionValue -type expressionValue = ExpressionValue.expressionValue +module EV = ReducerInterface_ExpressionValue +type expressionValue = EV.expressionValue -let dateDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< +let dateDispatch = (call: EV.functionCall, _: DistributionOperation.env): option< result, > => { switch call { - | ("toString", [EvDate(t)]) => EvString(DateTime.Date.toString(t))->Ok->Some + | ("toString", [EvDate(t)]) => EV.EvString(DateTime.Date.toString(t))->Ok->Some | ("makeDateFromYear", [EvNumber(year)]) => switch DateTime.Date.makeFromYear(year) { - | Ok(t) => EvDate(t)->Ok->Some + | Ok(t) => EV.EvDate(t)->Ok->Some | Error(e) => Reducer_ErrorValue.RETodo(e)->Error->Some } - | ("dateFromNumber", [EvNumber(f)]) => EvDate(DateTime.Date.fromFloat(f))->Ok->Some - | ("toNumber", [EvDate(f)]) => EvNumber(DateTime.Date.toFloat(f))->Ok->Some + | ("dateFromNumber", [EvNumber(f)]) => EV.EvDate(DateTime.Date.fromFloat(f))->Ok->Some + | ("toNumber", [EvDate(f)]) => EV.EvNumber(DateTime.Date.toFloat(f))->Ok->Some | ("subtract", [EvDate(d1), EvDate(d2)]) => switch DateTime.Date.subtract(d1, d2) { - | Ok(d) => EvTimeDuration(d)->Ok + | Ok(d) => EV.EvTimeDuration(d)->Ok | Error(e) => Error(RETodo(e)) }->Some | ("subtract", [EvDate(d1), EvTimeDuration(d2)]) => - EvDate(DateTime.Date.subtractDuration(d1, d2))->Ok->Some - | ("add", [EvDate(d1), EvTimeDuration(d2)]) => EvDate(DateTime.Date.addDuration(d1, d2))->Ok->Some + EV.EvDate(DateTime.Date.subtractDuration(d1, d2))->Ok->Some + | ("add", [EvDate(d1), EvTimeDuration(d2)]) => + EV.EvDate(DateTime.Date.addDuration(d1, d2))->Ok->Some | _ => None } } -let durationDispatch = (call: ExpressionValue.functionCall, _: DistributionOperation.env): option< +let durationDispatch = (call: EV.functionCall, _: DistributionOperation.env): option< result, > => { switch call { - | ("toString", [EvTimeDuration(t)]) => EvString(DateTime.Duration.toString(t))->Ok->Some - | ("minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some - | ("fromUnit_minutes", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some - | ("hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some - | ("fromUnit_hours", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some - | ("days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some - | ("fromUnit_days", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some - | ("years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some - | ("fromUnit_years", [EvNumber(f)]) => EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some - | ("toHours", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toHours(f))->Ok->Some - | ("toMinutes", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toMinutes(f))->Ok->Some - | ("toDays", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toDays(f))->Ok->Some - | ("toYears", [EvTimeDuration(f)]) => EvNumber(DateTime.Duration.toYears(f))->Ok->Some + | ("toString", [EvTimeDuration(t)]) => EV.EvString(DateTime.Duration.toString(t))->Ok->Some + | ("minutes", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("fromUnit_minutes", [EvNumber(f)]) => + EV.EvTimeDuration(DateTime.Duration.fromMinutes(f))->Ok->Some + | ("hours", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some + | ("fromUnit_hours", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromHours(f))->Ok->Some + | ("days", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some + | ("fromUnit_days", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromDays(f))->Ok->Some + | ("years", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some + | ("fromUnit_years", [EvNumber(f)]) => EV.EvTimeDuration(DateTime.Duration.fromYears(f))->Ok->Some + | ("toHours", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toHours(f))->Ok->Some + | ("toMinutes", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toMinutes(f))->Ok->Some + | ("toDays", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toDays(f))->Ok->Some + | ("toYears", [EvTimeDuration(f)]) => EV.EvNumber(DateTime.Duration.toYears(f))->Ok->Some | ("add", [EvTimeDuration(d1), EvTimeDuration(d2)]) => - EvTimeDuration(DateTime.Duration.add(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.add(d1, d2))->Ok->Some | ("subtract", [EvTimeDuration(d1), EvTimeDuration(d2)]) => - EvTimeDuration(DateTime.Duration.subtract(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.subtract(d1, d2))->Ok->Some | ("multiply", [EvTimeDuration(d1), EvNumber(d2)]) => - EvTimeDuration(DateTime.Duration.multiply(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.multiply(d1, d2))->Ok->Some | ("divide", [EvTimeDuration(d1), EvNumber(d2)]) => - EvTimeDuration(DateTime.Duration.divide(d1, d2))->Ok->Some + EV.EvTimeDuration(DateTime.Duration.divide(d1, d2))->Ok->Some | _ => None } } -let dispatch = (call: ExpressionValue.functionCall, env: DistributionOperation.env): option< +let dispatch = (call: EV.functionCall, env: DistributionOperation.env): option< result, > => { switch dateDispatch(call, env) {