ogma-core: Adjust to optional fields in JSON Spec. Refs #122.

A prior commit has modified the JSON Spec parsing library to make some
fields in input JSON files optional. This will make the library more
versatile.

This commit modifies the existing modules that use the JSON parsing
library to use the new interface with optional types for some JSON
Format spec fields.

ogma-core/src/Command/FPrimeApp.hs

@@ -741,15 +741,15 @@ ecCannotCopyTemplate = 1
 -- | JSONPath selectors for a FRET file
 fretFormat :: JSONFormat
 fretFormat = JSONFormat
-  { specInternalVars    = "..Internal_variables[*]"
+  { specInternalVars    = Just "..Internal_variables[*]"
   , specInternalVarId   = ".name"
   , specInternalVarExpr = ".assignmentCopilot"
-  , specInternalVarType = ".type"
-  , specExternalVars    = "..Other_variables[*]"
+  , specInternalVarType = Just ".type"
+  , specExternalVars    = Just "..Other_variables[*]"
   , specExternalVarId   = ".name"
-  , specExternalVarType = ".type"
+  , specExternalVarType = Just ".type"
   , specRequirements    = "..Requirements[*]"
   , specRequirementId   = ".name"
-  , specRequirementDesc = ".fretish"
+  , specRequirementDesc = Just ".fretish"
   , specRequirementExpr = ".ptLTL"
   }

ogma-core/src/Command/FRETComponentSpec2Copilot.hs

@@ -159,16 +159,16 @@ fretComponentSpec2CopilotResult options fp result = case result of
 -- | JSONPath selectors for a FRET file
 fretFormat :: Bool -> JSONFormat
 fretFormat useCoCoSpec = JSONFormat
-  { specInternalVars    = "..Internal_variables[*]"
+  { specInternalVars    = Just "..Internal_variables[*]"
   , specInternalVarId   = ".name"
   , specInternalVarExpr = ".assignmentCopilot"
-  , specInternalVarType = ".type"
-  , specExternalVars    = "..Other_variables[*]"
+  , specInternalVarType = Just ".type"
+  , specExternalVars    = Just "..Other_variables[*]"
   , specExternalVarId   = ".name"
-  , specExternalVarType = ".type"
+  , specExternalVarType = Just ".type"
   , specRequirements    = "..Requirements[*]"
   , specRequirementId   = ".name"
-  , specRequirementDesc = ".fretish"
+  , specRequirementDesc = Just ".fretish"
   , specRequirementExpr = if useCoCoSpec then ".CoCoSpecCode" else ".ptLTL"
   }
 

ogma-core/src/Command/ROSApp.hs

@@ -716,15 +716,15 @@ ecCannotCopyTemplate = 1
 -- | JSONPath selectors for a FRET file
 fretFormat :: JSONFormat
 fretFormat = JSONFormat
-  { specInternalVars    = "..Internal_variables[*]"
+  { specInternalVars    = Just "..Internal_variables[*]"
   , specInternalVarId   = ".name"
   , specInternalVarExpr = ".assignmentCopilot"
-  , specInternalVarType = ".type"
-  , specExternalVars    = "..Other_variables[*]"
+  , specInternalVarType = Just ".type"
+  , specExternalVars    = Just "..Other_variables[*]"
   , specExternalVarId   = ".name"
-  , specExternalVarType = ".type"
+  , specExternalVarType = Just ".type"
   , specRequirements    = "..Requirements[*]"
   , specRequirementId   = ".name"
-  , specRequirementDesc = ".fretish"
+  , specRequirementDesc = Just ".fretish"
   , specRequirementExpr = ".ptLTL"
   }