diff --git a/ogma-core/src/Command/FPrimeApp.hs b/ogma-core/src/Command/FPrimeApp.hs index da60c15..225c91d 100644 --- a/ogma-core/src/Command/FPrimeApp.hs +++ b/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" } diff --git a/ogma-core/src/Command/FRETComponentSpec2Copilot.hs b/ogma-core/src/Command/FRETComponentSpec2Copilot.hs index 697f427..fcf2144 100644 --- a/ogma-core/src/Command/FRETComponentSpec2Copilot.hs +++ b/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" } diff --git a/ogma-core/src/Command/ROSApp.hs b/ogma-core/src/Command/ROSApp.hs index d3e2f79..072ed13 100644 --- a/ogma-core/src/Command/ROSApp.hs +++ b/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" }