Merge branch 'release-1.0.10'. Refs #98.

nasa · Jul 22, 2023 · df5fa89 · df5fa89
2 parents 20c4b73 + c2245fe
commit df5fa89
Show file tree

Hide file tree

Showing 22 changed files with 99 additions and 31 deletions.
diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Revision history for ogma-cli
 
+## [1.0.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+* Correct test case (#96).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

diff --git a/ogma-cli/examples/fret.json b/ogma-cli/examples/fret.json
@@ -12,7 +12,7 @@
     "Requirements": [
       {
         "name": "behnazOne",
-        "CoCoSpecCode": "",
+        "CoCoSpecCode": "true",
         "ptLTL": "((H ((((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>)) & (Y TRUE)) -> (Y (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))) & (((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) S ((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) -> (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))",
         "fretish": "Meaning not specified"
       }

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.9
+version:             1.0.10
 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.9 && < 1.1
+    , ogma-core            >= 1.0.10 && < 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.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+* Correct test case (#96).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

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.9
+version:             1.0.10
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf
@@ -109,13 +109,13 @@ library
     , IfElse
     , mtl
 
-    , ogma-extra              >= 1.0.9 && < 1.1
-    , ogma-language-c         >= 1.0.9 && < 1.1
-    , ogma-language-cocospec  >= 1.0.9 && < 1.1
-    , ogma-language-copilot   >= 1.0.9 && < 1.1
-    , ogma-language-fret-cs   >= 1.0.9 && < 1.1
-    , ogma-language-fret-reqs >= 1.0.9 && < 1.1
-    , ogma-language-smv       >= 1.0.9 && < 1.1
+    , 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
 
   hs-source-dirs:
     src

diff --git a/ogma-core/tests/fret_good.json b/ogma-core/tests/fret_good.json
@@ -12,7 +12,7 @@
     "Requirements": [
       {
         "name": "behnazOne",
-        "CoCoSpecCode": "",
+        "CoCoSpecCode": "true",
         "ptLTL": "((H ((((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>)) & (Y TRUE)) -> (Y (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))) & (((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) S ((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) -> (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))",
         "fretish": "Meaning not specified"
       }

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

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.9
+version:             1.0.10
 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.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

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.9
+version:             1.0.10
 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.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

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.9
+version:             1.0.10
 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.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

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.9
+version:             1.0.10
 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,10 @@
 # Revision history for ogma-language-fret-cs
 
+## [1.0.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+* Improve parsing error messages (#96).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

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.9
+version:             1.0.10
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf
@@ -68,8 +68,8 @@ library
       base                   >= 4.11.0.0 && < 5
     , aeson                  >= 2.0.0.0  && < 2.2
 
-    , ogma-language-cocospec >= 1.0.9 && < 1.1
-    , ogma-language-smv      >= 1.0.9 && < 1.1
+    , ogma-language-cocospec >= 1.0.10 && < 1.1
+    , ogma-language-smv      >= 1.0.10 && < 1.1
 
   hs-source-dirs:
     src
@@ -95,7 +95,7 @@ test-suite unit-tests
     , test-framework
     , test-framework-quickcheck2
 
-    , ogma-extra                 >= 1.0.9 && < 1.1
+    , ogma-extra                 >= 1.0.10 && < 1.1
     , ogma-language-fret-cs
 
   hs-source-dirs:

diff --git a/ogma-language-fret-cs/src/Language/FRETComponentSpec/AST.hs b/ogma-language-fret-cs/src/Language/FRETComponentSpec/AST.hs
@@ -128,11 +128,40 @@ data FRETRequirement = FRETRequirement
   deriving (Show)
 
 instance FromJSON FRETRequirement where
-  parseJSON (Object v) = FRETRequirement
-    <$> v .: "name"
-    <*> (fmap (CoCoSpec.pBoolSpec . CoCoSpec.myLexer) <$> v .: "CoCoSpecCode")
-    <*> (fmap (SMV.pBoolSpec . SMV.myLexer) <$> v .: "ptLTL")
-    <*> (v .: "fretish")
+  parseJSON (Object v) = do
+      n <- v .: "name"
+
+      coco  <- fmap (CoCoSpec.pBoolSpec . CoCoSpec.myLexer)
+                 <$> v .: "CoCoSpecCode"
+      coco' <-
+        case coco of
+          Nothing        -> fail $ noField "CoCoSpecCode" n
+          Just (Left s)  -> fail $ noParse "CoCoSpecCode" n s
+          Just (Right _) -> return coco
+
+      ptltl  <- fmap (SMV.pBoolSpec . SMV.myLexer) <$> v .: "ptLTL"
+      ptltl' <-
+        case ptltl of
+          Nothing        -> fail $ noField "ptLTL" n
+          Just (Left s)  -> fail $ noParse "ptLTL" n s
+          Just (Right _) -> return ptltl
+
+      fretish <- v .: "fretish"
+
+      return $ FRETRequirement n coco' ptltl' fretish
+
+    where
+
+      noField field req = concat
+        [ "error: requirement ", show req , " does not have a ", field
+        , " field"
+        ]
+
+      noParse field req err = concat
+        [ "error: parsing of ", field, " field of requirement ", show req
+        , " failed with ", err
+        ]
+
 
   parseJSON invalid =
     prependFailure "parsing FRET Requirement failed, "

diff --git a/ogma-language-fret-cs/tests/fret_good.json b/ogma-language-fret-cs/tests/fret_good.json
@@ -12,7 +12,7 @@
     "Requirements": [
       {
         "name": "behnazOne",
-        "CoCoSpecCode": "",
+        "CoCoSpecCode": "true",
         "ptLTL": "((H ((((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>)) & (Y TRUE)) -> (Y (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))) & (((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) S ((! ((! <b><i>flight_mode</i></b>) & (Y <b><i>flight_mode</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) -> (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) S (((O[=<b><i>10</i></b>] ((<b><i>(conflict_detected)</i></b> & ((Y (! <b><i>(conflict_detected)</i></b>)) | (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))))) & (! <b><i>(( replanning_mode ))</i></b>))) -> (O[<<b><i>10</i></b>] ((<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>)))) | <b><i>(( replanning_mode ))</i></b>))) & (<b><i>flight_mode</i></b> & ((! (Y TRUE)) | (Y (! <b><i>flight_mode</i></b>))))))))",
         "fretish": "Meaning not specified"
       }

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.10] - 2023-07-21
+
+* Version bump 1.0.10 (#98).
+
 ## [1.0.9] - 2023-05-21
 
 * Version bump 1.0.9 (#93).

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.9
+version:             1.0.10
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf
@@ -69,8 +69,8 @@ library
     , aeson                  >= 2.0.0.0  && < 2.2
     , text
 
-    , ogma-language-cocospec >= 1.0.9 && < 1.1
-    , ogma-language-smv      >= 1.0.9 && < 1.1
+    , ogma-language-cocospec >= 1.0.10 && < 1.1
+    , ogma-language-smv      >= 1.0.10 && < 1.1
 
   hs-source-dirs:
     src
@@ -96,7 +96,7 @@ test-suite unit-tests
     , test-framework
     , test-framework-quickcheck2
 
-    , ogma-extra                 >= 1.0.9 && < 1.1
+    , ogma-extra                 >= 1.0.10 && < 1.1
     , ogma-language-fret-reqs
 
   hs-source-dirs:

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

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.9
+version:             1.0.10
 homepage:            http://nasa.gov
 license:             OtherLicense
 license-file:        LICENSE.pdf