diff --git a/implement/elm-time/ElmTime/compile-elm-program/src/ElmInteractive.elm b/implement/elm-time/ElmTime/compile-elm-program/src/ElmInteractive.elm index b1e31097..9b958e94 100644 --- a/implement/elm-time/ElmTime/compile-elm-program/src/ElmInteractive.elm +++ b/implement/elm-time/ElmTime/compile-elm-program/src/ElmInteractive.elm @@ -2323,44 +2323,28 @@ emitExpressionInDeclarationBlock : -> List ( String, Expression ) -> Expression -> Result String Pine.Expression -emitExpressionInDeclarationBlock stack originalEnvironmentDeclarations = - let - environmentDeclarations = - originalEnvironmentDeclarations - |> List.map - (Tuple.mapSecond - (inlineApplicationsOfEnvironmentDeclarations stack originalEnvironmentDeclarations) - ) - in - \originalMainExpression -> - let - mainExpression = - inlineApplicationsOfEnvironmentDeclarations - stack - environmentDeclarations - originalMainExpression - in - emitExpressionInDeclarationBlockLessClosureArgument - stack - environmentDeclarations - mainExpression - |> Result.andThen - (\emitInClosureResult -> - case emitInClosureResult.closureCaptures of - Nothing -> - Ok emitInClosureResult.expr - - Just closureCaptures -> - { closureCaptures = closureCaptures } - |> emitClosureArgument stack - |> Result.mapError ((++) "Failed to emit closure argument for declaration block: ") - |> Result.map - (\closureArgumentPine -> - partialApplicationExpressionFromListOfArguments - [ closureArgumentPine ] - emitInClosureResult.expr - ) - ) +emitExpressionInDeclarationBlock stack environmentDeclarations mainExpression = + emitExpressionInDeclarationBlockLessClosureArgument + stack + environmentDeclarations + mainExpression + |> Result.andThen + (\emitInClosureResult -> + case emitInClosureResult.closureCaptures of + Nothing -> + Ok emitInClosureResult.expr + + Just closureCaptures -> + { closureCaptures = closureCaptures } + |> emitClosureArgument stack + |> Result.mapError ((++) "Failed to emit closure argument for declaration block: ") + |> Result.map + (\closureArgumentPine -> + partialApplicationExpressionFromListOfArguments + [ closureArgumentPine ] + emitInClosureResult.expr + ) + ) emitExpressionInDeclarationBlockLessClosureArgument : diff --git a/implement/elm-time/Program.cs b/implement/elm-time/Program.cs index cc472dec..0fe77b8e 100644 --- a/implement/elm-time/Program.cs +++ b/implement/elm-time/Program.cs @@ -17,7 +17,7 @@ namespace ElmTime; public class Program { - public static string AppVersionId => "2023-07-17"; + public static string AppVersionId => "2023-07-18"; private static int AdminInterfaceDefaultPort => 4000; diff --git a/implement/elm-time/elm-time.csproj b/implement/elm-time/elm-time.csproj index be042b6f..bf929197 100644 --- a/implement/elm-time/elm-time.csproj +++ b/implement/elm-time/elm-time.csproj @@ -5,8 +5,8 @@ net7.0 ElmTime elm-time - 2023.0717.0.0 - 2023.0717.0.0 + 2023.0718.0.0 + 2023.0718.0.0 enable true