diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index c418e182..22f37fcd 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -2,6 +2,8 @@ ## [1.X.Y] - 2026-08-20 +* Fix `mergeSpecs` dropping first spec's external variables (#551). +* Fix spelling of "cannot" in `Command.Standalone` (#551). * Replace adhoc function `mergeMaybe` with function from `base` (#516). * Fix malformed comments (#518). * Remove unnecessary line breaks (#520). diff --git a/ogma-core/src/Command/Common.hs b/ogma-core/src/Command/Common.hs index d6999d53..8825baf4 100644 --- a/ogma-core/src/Command/Common.hs +++ b/ogma-core/src/Command/Common.hs @@ -98,7 +98,7 @@ combineInputFiles xs mergeSpecs :: Spec a -> Spec a -> Spec a mergeSpecs s1 s2 = Spec { internalVariables = internalVariables s1 ++ internalVariables s2 - , externalVariables = externalVariables s2 ++ externalVariables s2 + , externalVariables = externalVariables s1 ++ externalVariables s2 , requirements = requirements s1 ++ requirements s2 } diff --git a/ogma-core/src/Command/Standalone.hs b/ogma-core/src/Command/Standalone.hs index 834fff2e..c208f590 100644 --- a/ogma-core/src/Command/Standalone.hs +++ b/ogma-core/src/Command/Standalone.hs @@ -253,7 +253,7 @@ commandIncorrectSpecF e = ErrorTriplet ecIncorrectSpec msg LocationNothing where msg = - "The input specification(s) canbot be formalized: " ++ e + "The input specification(s) cannot be formalized: " ++ e -- | Error message associated to not being able to formalize the input spec. commandIncorrectSpecE :: String -> String -> ErrorTriplet