Merge branch 'release-1.0.11'. Refs #103.

nasa · Sep 22, 2023 · d2b0f28 · d2b0f28
2 parents df5fa89 + 8ec6ddc
commit d2b0f28
Show file tree

Hide file tree

Showing 21 changed files with 69 additions and 19 deletions.
diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-cli
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-cli/ogma-cli.cabal b/ogma-cli/ogma-cli.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Simple
 
 name:                ogma-cli
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf
@@ -141,7 +141,7 @@ executable ogma
   build-depends:
       base                 >= 4.11.0.0 && < 5
     , optparse-applicative
-    , ogma-core            >= 1.0.10 && < 1.1
+    , ogma-core            >= 1.0.11 && < 1.1
 
   hs-source-dirs:
     src

diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md
@@ -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).

diff --git a/ogma-core/ogma-core.cabal b/ogma-core/ogma-core.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 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 @@ library
     , 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

diff --git a/ogma-core/src/Language/Trans/FRETReqsDB2Copilot.hs b/ogma-core/src/Language/Trans/FRETReqsDB2Copilot.hs
@@ -112,6 +112,7 @@ fret2CopilotModule' prefs smvSpec cocoSpec = unlines $ concat sections
       , "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)"

diff --git a/ogma-core/src/Language/Trans/SMV2Copilot.hs b/ogma-core/src/Language/Trans/SMV2Copilot.hs
@@ -142,6 +142,7 @@ ordOp2Copilot OrdOpGE = ">="
 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.
@@ -163,6 +164,15 @@ opOneMTL2Copilot operator _comparison 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)
+
 -- | Return the Copilot representation of a unary logical possibly MTL FRET
 -- operator.
 opOneMTL2Copilot' :: Op1Name -> String

diff --git a/ogma-extra/CHANGELOG.md b/ogma-extra/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-extra
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-extra/ogma-extra.cabal b/ogma-extra/ogma-extra.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Simple
 
 name:                ogma-extra
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf

diff --git a/ogma-language-c/CHANGELOG.md b/ogma-language-c/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-language-c
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-language-c/ogma-language-c.cabal b/ogma-language-c/ogma-language-c.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Custom
 
 name:                ogma-language-c
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf

diff --git a/ogma-language-cocospec/CHANGELOG.md b/ogma-language-cocospec/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-language-cocospec
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-language-cocospec/ogma-language-cocospec.cabal b/ogma-language-cocospec/ogma-language-cocospec.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Custom
 
 name:                ogma-language-cocospec
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf

diff --git a/ogma-language-copilot/CHANGELOG.md b/ogma-language-copilot/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-language-copilot
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-language-copilot/ogma-language-copilot.cabal b/ogma-language-copilot/ogma-language-copilot.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Simple
 
 name:                ogma-language-copilot
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf

diff --git a/ogma-language-fret-cs/CHANGELOG.md b/ogma-language-fret-cs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-language-fret-cs
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-language-fret-cs/ogma-language-fret-cs.cabal b/ogma-language-fret-cs/ogma-language-fret-cs.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Simple
 
 name:                ogma-language-fret-cs
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf

diff --git a/ogma-language-fret-reqs/CHANGELOG.md b/ogma-language-fret-reqs/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Revision history for ogma-language-fret-reqs
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal b/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Simple
 
 name:                ogma-language-fret-reqs
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf

diff --git a/ogma-language-smv/CHANGELOG.md b/ogma-language-smv/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Revision history for ogma-language-smv
 
+## [1.0.11] - 2023-09-21
+
+* Version bump 1.0.11 (#103).
+* Support MTL operators with number ranges (#101).
+
 ## [1.0.10] - 2023-07-21
 
 * Version bump 1.0.10 (#98).

diff --git a/ogma-language-smv/grammar/SMV.cf b/ogma-language-smv/grammar/SMV.cf
@@ -83,8 +83,9 @@ BoolConstFalse. BoolConst ::= "FALSE";
 BoolConstFTP.   BoolConst ::= "FTP";
 BoolConstLAST.  BoolConst ::= "LAST";
 
-Op1Alone . OpOne ::= Op1Name;
-Op1MTL.    OpOne ::= Op1Name "[" OrdOp Number "]";
+Op1Alone .   OpOne ::= Op1Name;
+Op1MTL.      OpOne ::= Op1Name "[" OrdOp Number "]";
+Op1MTLRange. OpOne ::= Op1Name "[" Number "," Number "]";
 
 NumberInt . Number ::= Integer;
 _ . Number ::= "<b>" Number "</b>";

diff --git a/ogma-language-smv/ogma-language-smv.cabal b/ogma-language-smv/ogma-language-smv.cabal
@@ -32,7 +32,7 @@ cabal-version:       2.0
 build-type:          Custom
 
 name:                ogma-language-smv
-version:             1.0.10
+version:             1.0.11
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf