Small changes to property and formula syntax

src/Main.hs

@@ -5,9 +5,13 @@ import System.Environment (getArgs)
 import Parser (parseFile)
 import PetriNet
 import Property
+import Solver
 
-checkProperty :: PetriNet -> Property -> Bool
-checkProperty net p = True
+checkProperty :: PetriNet -> Property -> IO String
+checkProperty net p = do
+        r <- checkSat net p
+        return (if r then "Property not satisfied"
+                     else "Property satisfied")
 
 main :: IO ()
 main = do
@@ -19,6 +23,7 @@ main = do
         putStrLn $ "Analyzing " ++ showName net
         mapM_ (\p -> do
                   putStrLn $ "Checking " ++ show p
-                  putStrLn $ show $ checkProperty net p
+                  r <- checkProperty net p
+                  putStrLn r
               ) properties
 

src/Parser.hs

@@ -22,7 +22,7 @@ languageDef =
                  Token.identLetter     = alphaNum <|> char '_',
                  Token.reservedNames   = [],
                  Token.reservedOpNames = ["->", "<", "<=", "=", ">=", ">",
-                                          "+", "-", "*", "&", "|", "!"]
+                                          "+", "-", "*", "&&", "||", "!"]
                  }
 
 lexer :: Token.TokenParser u
@@ -158,12 +158,12 @@ negation = (Neg <$> (reservedOp "!" *> negation)) <|> parensForm
 conjunction :: Parser u Formula
 conjunction = do
         lhs <- negation
-        option lhs ((lhs :&:) <$> (reservedOp "&" *> conjunction))
+        option lhs ((lhs :&:) <$> (reservedOp "&&" *> conjunction))
 
 disjunction :: Parser u Formula
 disjunction = do
         lhs <- conjunction
-        option lhs ((lhs :|:) <$> (reservedOp "|" *> disjunction))
+        option lhs ((lhs :|:) <$> (reservedOp "||" *> disjunction))
 
 formula :: Parser u Formula
 formula = disjunction
@@ -175,11 +175,11 @@ propertyType =
 
 property :: Parser u Property
 property = do
-        ptype <- propertyType
+        pt <- propertyType
         reserved "property"
         name <- option "" ident
-        pformulas <- braces formula
-        return $ Property name ptype pformulas
+        form <- braces formula
+        return Property { pname=name, ptype=pt, pformula=form }
 
 parseContent :: Parser u (PetriNet,[Property])
 parseContent = do

src/Property.hs

@@ -49,7 +49,7 @@ infixr 2 :|:
 
 instance Show Formula where
         show (Atom a) = show a
-        show (Neg p) = "¬" ++ show p
+        show (Neg p) = "¬" ++ "(" ++ show p ++ ")"
         show (p :&: q) = "(" ++ show p ++ " ∧ " ++ show q ++ ")"
         show (p :|: q) = "(" ++ show p ++ " ∨ " ++ show q ++ ")"
 
@@ -59,11 +59,15 @@ instance Show PropertyType where
         show Safety = "safety"
         show Liveness = "liveness"
 
-data Property = Property String PropertyType Formula
+data Property = Property {
+        pname :: String,
+        ptype :: PropertyType,
+        pformula :: Formula
+}
 
 instance Show Property where
-        show (Property name ptype formula) =
-            show ptype ++ " property " ++
-            (if null name then "" else show name ++ " ") ++
-            "{ " ++ show formula ++ " }"
+        show p =
+            show (ptype p) ++ " property " ++
+            (if null (pname p) then "" else show (pname p) ++ " ") ++
+            "{ " ++ show (pformula p) ++ " }"
 

src/Solver.hs

@@ -48,9 +48,9 @@ buildModel net = do
         return $ M.fromList (vars `zip` syms)
 
 checkConstraints :: PetriNet -> Property -> Symbolic SBool
-checkConstraints net (Property _ _ f) = do
+checkConstraints net p = do
         model <- buildModel net
-        evaluateFormula model f
+        evaluateFormula model (pformula p)
 
 checkSat :: PetriNet -> Property -> IO Bool
 checkSat net p = do