ogma-core 1.0.10 → 1.0.11

raw patch · 4 files changed

+24/−8 lines, 4 filesdep ~ogma-extradep ~ogma-language-cdep ~ogma-language-cocospec

Dependency ranges changed: ogma-extra, ogma-language-c, ogma-language-cocospec, ogma-language-copilot, ogma-language-fret-cs, ogma-language-fret-reqs, ogma-language-smv

Files

• CHANGELOG.md +5/−0
• ogma-core.cabal +8/−8
• src/Language/Trans/FRETReqsDB2Copilot.hs +1/−0
• src/Language/Trans/SMV2Copilot.hs +10/−0

@@ -1,5 +1,10 @@ # Revision history for ogma-core +## [1.0.11] - 2023-09-21++* Version bump 1.0.11 (#103).+* Support MTL operators with number ranges in SMV (#101).+ ## [1.0.10] - 2023-07-21  * Version bump 1.0.10 (#98).

@@ -32,7 +32,7 @@ build-type:          Simple  name:                ogma-core-version:             1.0.10+version:             1.0.11 homepage:            http://nasa.gov license:             OtherLicense license-file:        LICENSE.pdf@@ -109,13 +109,13 @@     , IfElse     , mtl -    , ogma-extra              >= 1.0.10 && < 1.1-    , ogma-language-c         >= 1.0.10 && < 1.1-    , ogma-language-cocospec  >= 1.0.10 && < 1.1-    , ogma-language-copilot   >= 1.0.10 && < 1.1-    , ogma-language-fret-cs   >= 1.0.10 && < 1.1-    , ogma-language-fret-reqs >= 1.0.10 && < 1.1-    , ogma-language-smv       >= 1.0.10 && < 1.1+    , ogma-extra              >= 1.0.11 && < 1.1+    , ogma-language-c         >= 1.0.11 && < 1.1+    , ogma-language-cocospec  >= 1.0.11 && < 1.1+    , ogma-language-copilot   >= 1.0.11 && < 1.1+    , ogma-language-fret-cs   >= 1.0.11 && < 1.1+    , ogma-language-fret-reqs >= 1.0.11 && < 1.1+    , ogma-language-smv       >= 1.0.11 && < 1.1    hs-source-dirs:     src

@@ -112,6 +112,7 @@       , "import           Copilot.Library.PTLTL     (since, previous,"         ++ " alwaysBeen)"       , "import qualified Copilot.Library.PTLTL     as PTLTL"+      , "import qualified Copilot.Library.MTL       as MTL"       , "import           Language.Copilot          (reify)"       , "import Prelude                   hiding ((&&), (||), (++), (<=), (>=),"         ++ " (<), (>), (==), (/=), not)"

@@ -142,6 +142,7 @@ opOne2Copilot :: OpOne -> String opOne2Copilot (Op1Alone x)    = opOneAlone2Copilot x opOne2Copilot (Op1MTL x op v) = opOneMTL2Copilot x op v+opOne2Copilot (Op1MTLRange op mn mx) = opOneMTLRange2Copilot op mn mx  -- | Return the Copilot representation of a unary logical non-MTL FRET -- operator.@@ -160,6 +161,15 @@ opOneMTL2Copilot operator _comparison number =   opOneMTL2Copilot' operator ++ " " ++ show (0 :: Int)                              ++ " " ++ number2Copilot number+                             ++ " " ++ "clock" ++ " "+                             ++ show (1 :: Int)++-- | Return the Copilot representation of a unary logical MTL FRET operator+-- that uses an explicit range.+opOneMTLRange2Copilot :: Op1Name -> Number -> Number -> String+opOneMTLRange2Copilot operator mn mx =+  opOneMTL2Copilot' operator ++ " " ++ number2Copilot mn+                             ++ " " ++ number2Copilot mx                              ++ " " ++ "clock" ++ " "                              ++ show (1 :: Int)