From 830e914bcbaaf16368dfb2c0151591f3a73c33aa Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Wed, 5 Apr 2023 08:39:34 -0700 Subject: [PATCH 01/25] ogma-language-fret-cs: Improve parsing error messages. Refs #96. Ogma relies on an existing library for error message reporting of JSON files. That library, by default, provides very plain error messages and the line and column number of the error cannot be customized or contextualized. This causes error messages to seem to apply to a line and column in the file, when they really apply to the line and column of a specific requirement (which may be hard to indentify). This commit modifies the JSON parser for component specification files so that, if a parsing error in a temporal logic formula is found, the parser reports the name of the requirement that failed to parse. --- .../src/Language/FRETComponentSpec/AST.hs | 39 ++++++++++++++++--- 1 file changed, 34 insertions(+), 5 deletions(-) diff --git a/ogma-language-fret-cs/src/Language/FRETComponentSpec/AST.hs b/ogma-language-fret-cs/src/Language/FRETComponentSpec/AST.hs index 55a12c2..bafa44b 100644 --- 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, " From 6d8783c10552e176bea54a259f285a49b8708d76 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 13:11:32 +0000 Subject: [PATCH 02/25] ogma-language-fret-cs: Add vacuous value in CoCoSpec field. Refs #96. The test case tests/fret_good.json contains no value in the CoCoSpec field, which makes the test fail even though that field is not used. This commit modifies the example to have a vacuous value in the CoCoSpec field. --- ogma-language-fret-cs/tests/fret_good.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-fret-cs/tests/fret_good.json b/ogma-language-fret-cs/tests/fret_good.json index d581d66..5ab0fef 100644 --- 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 ((((! flight_mode) & (Y flight_mode)) & (Y TRUE)) -> (Y (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) S (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode))))))))) & (((! ((! flight_mode) & (Y flight_mode))) S ((! ((! flight_mode) & (Y flight_mode))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) -> (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) S (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode))))))))", "fretish": "Meaning not specified" } From 45ca6930c5ab53198c53e2d3cb3a13ec5a96a0bb Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 13:18:23 +0000 Subject: [PATCH 03/25] ogma-core: Add vacuous value in CoCoSpec field. Refs #96. The test case tests/fret_good.json contains no value in the CoCoSpec field, which makes the test fail even though that field is not used. This commit modifies the example to have a vacuous value in the CoCoSpec field. --- ogma-core/tests/fret_good.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-core/tests/fret_good.json b/ogma-core/tests/fret_good.json index d581d66..5ab0fef 100644 --- 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 ((((! flight_mode) & (Y flight_mode)) & (Y TRUE)) -> (Y (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) S (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode))))))))) & (((! ((! flight_mode) & (Y flight_mode))) S ((! ((! flight_mode) & (Y flight_mode))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) -> (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) S (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode))))))))", "fretish": "Meaning not specified" } From 8ef82264f9b4a6709a9a4e78be584943fcb75afb Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 13:24:35 +0000 Subject: [PATCH 04/25] ogma-cli: Add vacuous value in CoCoSpec field. Refs #96. The file ogma-cli/examples/fret.json is used as a test, and contains no value in the CoCoSpec field, which makes the test fail even though that field is not used. This commit modifies the example to have a vacuous value in the CoCoSpec field. --- ogma-cli/examples/fret.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-cli/examples/fret.json b/ogma-cli/examples/fret.json index d581d66..5ab0fef 100644 --- a/ogma-cli/examples/fret.json +++ b/ogma-cli/examples/fret.json @@ -12,7 +12,7 @@ "Requirements": [ { "name": "behnazOne", - "CoCoSpecCode": "", + "CoCoSpecCode": "true", "ptLTL": "((H ((((! flight_mode) & (Y flight_mode)) & (Y TRUE)) -> (Y (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) S (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode))))))))) & (((! ((! flight_mode) & (Y flight_mode))) S ((! ((! flight_mode) & (Y flight_mode))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) -> (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) S (((O[=10] (((conflict_detected) & ((Y (! (conflict_detected))) | (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))))) & (! (( replanning_mode ))))) -> (O[<10] ((flight_mode & ((! (Y TRUE)) | (Y (! flight_mode)))) | (( replanning_mode ))))) & (flight_mode & ((! (Y TRUE)) | (Y (! flight_mode))))))))", "fretish": "Meaning not specified" } From ef02f0f9308fa9e7713cf1b9e0d7623273f4ee04 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 07:06:25 +0000 Subject: [PATCH 05/25] ogma-language-fret-cs: Document changes in CHANGELOG. Refs #96. --- ogma-language-fret-cs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-fret-cs/CHANGELOG.md b/ogma-language-fret-cs/CHANGELOG.md index aecc451..1280de9 100644 --- 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.X.X] - 2023-07-21 + +* Improve parsing error messages (#96). + ## [1.0.9] - 2023-05-21 * Version bump 1.0.9 (#93). From 8c6ece38c83189602ab3cca7f1029d84399f29ef Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 13:20:06 +0000 Subject: [PATCH 06/25] ogma-core: Document changes in CHANGELOG. Refs #96. --- ogma-core/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 69bd41f..4bb519d 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-core +## [1.X.X] - 2023-07-21 + +* Correct test case (#96). + ## [1.0.9] - 2023-05-21 * Version bump 1.0.9 (#93). From b1e29d0b43f179331ac1998b3f2822c5bb4e43e0 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 13:29:29 +0000 Subject: [PATCH 07/25] ogma-cli: Document changes in CHANGELOG. Refs #96. --- ogma-cli/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index 0201548..066f09c 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,5 +1,9 @@ # Revision history for ogma-cli +## [1.X.X] - 2023-07-21 + +* Correct test case (#96). + ## [1.0.9] - 2023-05-21 * Version bump 1.0.9 (#93). From 8355e07c0ca58b4f351a5a496326625dc499907e Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 08/25] ogma-extra: Version bump (1.0.10). Refs #98. --- ogma-extra/ogma-extra.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-extra/ogma-extra.cabal b/ogma-extra/ogma-extra.cabal index f870e34..45bc460 100644 --- 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 From f7bfd76d484d3ef25a53461a65c8d11777da63e3 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 09/25] ogma-language-smv: Version bump (1.0.10). Refs #98. --- ogma-language-smv/ogma-language-smv.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-smv/ogma-language-smv.cabal b/ogma-language-smv/ogma-language-smv.cabal index 99dce3d..c07b67f 100644 --- 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 From 6d94267dcd7c7f8e94a6a3da757d13062cdfe1a0 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 10/25] ogma-language-fret-reqs: Version bump (1.0.10). Refs #98. --- ogma-language-fret-reqs/ogma-language-fret-reqs.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal b/ogma-language-fret-reqs/ogma-language-fret-reqs.cabal index 89f4423..38f3e13 100644 --- 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: From 02c59cfe7e76560ce5d9b932a65a0713a05e0184 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 11/25] ogma-language-fret-cs: Version bump (1.0.10). Refs #98. --- ogma-language-fret-cs/ogma-language-fret-cs.cabal | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ogma-language-fret-cs/ogma-language-fret-cs.cabal b/ogma-language-fret-cs/ogma-language-fret-cs.cabal index 3a19652..59933aa 100644 --- 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: From 817d82e19486be56d2c24a7d13a8f4c430ea32d1 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 12/25] ogma-language-copilot: Version bump (1.0.10). Refs #98. --- ogma-language-copilot/ogma-language-copilot.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-copilot/ogma-language-copilot.cabal b/ogma-language-copilot/ogma-language-copilot.cabal index b4395c2..8ef5d27 100644 --- 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 From 62d8896274e35f1684fc416d562a142f70e37982 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 13/25] ogma-language-cocospec: Version bump (1.0.10). Refs #98. --- ogma-language-cocospec/ogma-language-cocospec.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-cocospec/ogma-language-cocospec.cabal b/ogma-language-cocospec/ogma-language-cocospec.cabal index b349e86..66c01bf 100644 --- 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 From ab34fddb6c2ca736ffa7c9577fa6048279327b5d Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 14/25] ogma-language-c: Version bump (1.0.10). Refs #98. --- ogma-language-c/ogma-language-c.cabal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ogma-language-c/ogma-language-c.cabal b/ogma-language-c/ogma-language-c.cabal index 70dd403..3c27091 100644 --- 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 From 5621182fcac8758eb77f5640aaac0f06f98fd3e2 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 15/25] ogma-core: Version bump (1.0.10). Refs #98. --- ogma-core/ogma-core.cabal | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ogma-core/ogma-core.cabal b/ogma-core/ogma-core.cabal index 79168f5..7e900fa 100644 --- 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 From c066d6185cf470f07b2af97728520f68bd447790 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:07:00 +0000 Subject: [PATCH 16/25] ogma-cli: Version bump (1.0.10). Refs #98. --- ogma-cli/ogma-cli.cabal | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ogma-cli/ogma-cli.cabal b/ogma-cli/ogma-cli.cabal index b4c8fde..85f0404 100644 --- 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 From 7e9ac06aef148e0dda6132479048f6ebb9b0c926 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 17/25] ogma-extra: Document changes in CHANGELOG. Refs #98. --- ogma-extra/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-extra/CHANGELOG.md b/ogma-extra/CHANGELOG.md index ce42b28..8e24b4c 100644 --- 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). From 586ffa923777fc92b67047268f5602fdefbeb7a5 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 18/25] ogma-language-smv: Document changes in CHANGELOG. Refs #98. --- ogma-language-smv/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-smv/CHANGELOG.md b/ogma-language-smv/CHANGELOG.md index 153a55b..51f6c08 100644 --- 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). From 6b83b844a16a85dad99ad24829e85e0c98aeef2f Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 19/25] ogma-language-fret-reqs: Document changes in CHANGELOG. Refs #98. --- ogma-language-fret-reqs/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-fret-reqs/CHANGELOG.md b/ogma-language-fret-reqs/CHANGELOG.md index 5f2b1a6..569c7f6 100644 --- 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). From b45983494206cc623dfb9c5bba14927ef8310da8 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 20/25] ogma-language-fret-cs: Document changes in CHANGELOG. Refs #98. --- ogma-language-fret-cs/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogma-language-fret-cs/CHANGELOG.md b/ogma-language-fret-cs/CHANGELOG.md index 1280de9..349ae27 100644 --- a/ogma-language-fret-cs/CHANGELOG.md +++ b/ogma-language-fret-cs/CHANGELOG.md @@ -1,7 +1,8 @@ # Revision history for ogma-language-fret-cs -## [1.X.X] - 2023-07-21 +## [1.0.10] - 2023-07-21 +* Version bump 1.0.10 (#98). * Improve parsing error messages (#96). ## [1.0.9] - 2023-05-21 From fbf5ff30c3d0f7e33e00387ec2b8f9b2faf92304 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 21/25] ogma-language-copilot: Document changes in CHANGELOG. Refs #98. --- ogma-language-copilot/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-copilot/CHANGELOG.md b/ogma-language-copilot/CHANGELOG.md index 1e80d8a..fa1d01c 100644 --- 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). From 479fa6de0b627209048dc5955f786b26abcd1551 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 22/25] ogma-language-cocospec: Document changes in CHANGELOG. Refs #98. --- ogma-language-cocospec/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-cocospec/CHANGELOG.md b/ogma-language-cocospec/CHANGELOG.md index ec239a2..f8881b0 100644 --- 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). From f76f06c5563bd299c2ac3a4e1fe3df07f217bc32 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:14 +0000 Subject: [PATCH 23/25] ogma-language-c: Document changes in CHANGELOG. Refs #98. --- ogma-language-c/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/ogma-language-c/CHANGELOG.md b/ogma-language-c/CHANGELOG.md index b4f8cc9..8c79294 100644 --- 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). From d2b083d1c80e23a035b97cfed66d538baa777387 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:13 +0000 Subject: [PATCH 24/25] ogma-core: Document changes in CHANGELOG. Refs #98. --- ogma-core/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogma-core/CHANGELOG.md b/ogma-core/CHANGELOG.md index 4bb519d..c4e0d30 100644 --- a/ogma-core/CHANGELOG.md +++ b/ogma-core/CHANGELOG.md @@ -1,7 +1,8 @@ # Revision history for ogma-core -## [1.X.X] - 2023-07-21 +## [1.0.10] - 2023-07-21 +* Version bump 1.0.10 (#98). * Correct test case (#96). ## [1.0.9] - 2023-05-21 From c2245fec134889a40497118d2d8f6e77e2f7bb45 Mon Sep 17 00:00:00 2001 From: Ivan Perez Date: Sat, 22 Jul 2023 14:09:13 +0000 Subject: [PATCH 25/25] ogma-cli: Document changes in CHANGELOG. Refs #98. --- ogma-cli/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ogma-cli/CHANGELOG.md b/ogma-cli/CHANGELOG.md index 066f09c..5df9802 100644 --- a/ogma-cli/CHANGELOG.md +++ b/ogma-cli/CHANGELOG.md @@ -1,7 +1,8 @@ # Revision history for ogma-cli -## [1.X.X] - 2023-07-21 +## [1.0.10] - 2023-07-21 +* Version bump 1.0.10 (#98). * Correct test case (#96). ## [1.0.9] - 2023-05-21