ogma-core 1.10.0 → 1.11.0
raw patch · 4 files changed
+22/−15 lines, 4 filesdep ~ogma-extradep ~ogma-language-cdep ~ogma-language-copilotPVP ok
version bump matches the API change (PVP)
Dependency ranges changed: ogma-extra, ogma-language-c, ogma-language-copilot, ogma-language-csv, ogma-language-jsonspec, ogma-language-lustre, ogma-language-smv, ogma-language-xlsx, ogma-language-xmlspec, ogma-spec
API changes (from Hackage documentation)
Files
- CHANGELOG.md +6/−0
- ogma-core.cabal +11/−11
- src/Command/Diagram.hs +1/−1
- templates/diagram/Copilot.hs +4/−3
CHANGELOG.md view
@@ -1,5 +1,11 @@ # Revision history for ogma-core +## [1.11.0] - 2025-11-21++* Version bump 1.11.0 (#325).+* Make state machine code return the current state (#317).+* Negate condition in state machine monitor (#318).+ ## [1.10.0] - 2025-09-21 * Version bump 1.10.0 (#310).
ogma-core.cabal view
@@ -19,7 +19,7 @@ build-type: Simple name: ogma-core-version: 1.10.0+version: 1.11.0 homepage: https://github.com/nasa/ogma bug-reports: https://github.com/nasa/ogma/issues license: Apache-2.0@@ -139,16 +139,16 @@ , process >= 1.6 && < 1.7 , text >= 1.2.3.1 && < 2.2 - , ogma-extra >= 1.10.0 && < 1.11- , ogma-language-c >= 1.10.0 && < 1.11- , ogma-language-copilot >= 1.10.0 && < 1.11- , ogma-language-csv >= 1.10.0 && < 1.11- , ogma-language-jsonspec >= 1.10.0 && < 1.11- , ogma-language-lustre >= 1.10.0 && < 1.11- , ogma-language-smv >= 1.10.0 && < 1.11- , ogma-language-xlsx >= 1.10.0 && < 1.11- , ogma-language-xmlspec >= 1.10.0 && < 1.11- , ogma-spec >= 1.10.0 && < 1.11+ , ogma-extra >= 1.11.0 && < 1.12+ , ogma-language-c >= 1.11.0 && < 1.12+ , ogma-language-copilot >= 1.11.0 && < 1.12+ , ogma-language-csv >= 1.11.0 && < 1.12+ , ogma-language-jsonspec >= 1.11.0 && < 1.12+ , ogma-language-lustre >= 1.11.0 && < 1.12+ , ogma-language-smv >= 1.11.0 && < 1.12+ , ogma-language-xlsx >= 1.11.0 && < 1.12+ , ogma-language-xmlspec >= 1.11.0 && < 1.12+ , ogma-spec >= 1.11.0 && < 1.12 hs-source-dirs: src
src/Command/Diagram.hs view
@@ -406,7 +406,7 @@ -- Elements of the spec. propExpr = case mode of- CheckState -> "stateMachine1 == externalState"+ CheckState -> "stateMachine1 /= externalState" ComputeState -> "true" CheckMoves -> "true" initialState = minimum states
templates/diagram/Copilot.hs view
@@ -35,16 +35,17 @@ stateMachineGF :: StateMachineGF -> Stream Word8 stateMachineGF (initialState, finalState, noInputData, transitions, badState) = state where- state = [initialState] ++ ifThenElses transitions+ state = ifThenElses transitions+ previousState = [initialState] ++ state ifThenElses :: [(Word8, Stream Bool, Word8)] -> Stream Word8 ifThenElses [] =- ifThenElse (state == constant finalState && noInputData)+ ifThenElse (previousState == constant finalState && noInputData) (constant finalState) (constant badState) ifThenElses ((s1,i,s2):ss) =- ifThenElse (state == constant s1 && i) (constant s2) (ifThenElses ss)+ ifThenElse (previousState == constant s1 && i) (constant s2) (ifThenElses ss) -- | True when the given input stream does hold any of the values in the given -- list.