05.11., 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Commit da341783 authored by Philipp J. Meyer's avatar Philipp J. Meyer

Used Show instance for property types

parent 596b762b
...@@ -94,26 +94,28 @@ data PropertyType = SafetyType ...@@ -94,26 +94,28 @@ data PropertyType = SafetyType
data ConstraintProperty = UniqueTerminalMarkingConstraint data ConstraintProperty = UniqueTerminalMarkingConstraint
instance Show ConstraintProperty where
show UniqueTerminalMarkingConstraint = "unique terminal marking"
data PropertyContent = Safety (Formula Place) data PropertyContent = Safety (Formula Place)
| Liveness (Formula Transition) | Liveness (Formula Transition)
| Structural Structure | Structural Structure
| Constraint ConstraintProperty | Constraint ConstraintProperty
-- TODO: use Show instance
showPropertyType :: PropertyContent -> String showPropertyType :: PropertyContent -> String
showPropertyType (Safety _) = "safety" showPropertyType (Safety _) = "safety"
showPropertyType (Liveness _) = "liveness" showPropertyType (Liveness _) = "liveness"
showPropertyType (Structural _) = "structural" showPropertyType (Structural _) = "structural"
showPropertyType (Constraint _) = "constraint" showPropertyType (Constraint _) = "constraint"
showConstraintProperty :: ConstraintProperty -> String
showConstraintProperty UniqueTerminalMarkingConstraint = "unique terminal marking"
showPropertyContent :: PropertyContent -> String showPropertyContent :: PropertyContent -> String
showPropertyContent (Safety f) = show f showPropertyContent (Safety f) = show f
showPropertyContent (Liveness f) = show f showPropertyContent (Liveness f) = show f
showPropertyContent (Structural s) = show s showPropertyContent (Structural s) = show s
showPropertyContent (Constraint c) = showConstraintProperty c showPropertyContent (Constraint c) = show c
instance Show PropertyContent where
show pc = showPropertyType pc ++ " (" ++ showPropertyContent pc ++ ")"
data Property = Property { data Property = Property {
pname :: String, pname :: String,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment