Skip to content

Fix mergeSpecs dropping first spec's external variables. Refs #551. #552

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
philphauler wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix mergeSpecs dropping first spec's external variables. Refs #551. #552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions ogma-core/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
2 changes: 1 addition & 1 deletion ogma-core/src/Command/Common.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion ogma-core/src/Command/Standalone.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down