app/Main.hs

@@ -28,13 +28,13 @@ parseInputLine :: Int -> String -> Either ParseError Expression
 parseInputLine n s = parseFullString ("stdin:" ++ show n) s
 
 title :: [String] -> String
-title ns = " " ++ intercalate " # " ns
+title ns = " " ++ intercalate " | " ns
 
 header :: [Int] -> String
-header ws = intercalate "#" . map (flip replicate '#' . (+2) ) $ ws
+header ws = intercalate "|" . map (flip replicate '-' . (+2) ) $ ws
 
 row :: [Int] -> [Bool] -> String
-row ws rs = intercalate "#" $ (zipWith row' ws rs)
+row ws rs = intercalate "|" $ (zipWith row' ws rs)
     where
         row' :: Int -> Bool -> String
         row' w b = replicate (left+1) ' ' ++ (if b then "1" else "0") ++ replicate (right+1) ' '

src/Lib.hs

@@ -34,7 +34,7 @@ import Data.Functor.Identity
 
 data Expression = Constant Bool | Binary BinaryOperator Expression Expression | Unary UnaryOperator Expression | Variable String
     deriving Show
-data BinaryOperator = LogicalAnd | LogicalOr | LogicalEquality
+data BinaryOperator = LogicalAnd | LogicalOr
     deriving Show
 data UnaryOperator  = LogicalNot
     deriving Show
@@ -44,9 +44,9 @@ def = emptyDef{ commentStart = ""
               , commentEnd = ""
               , identStart = letter <|> char '_'
               , identLetter = alphaNum <|> char '_'
-              , opStart = oneOf "&|~="
-              , opLetter = oneOf "&|~="
-              , reservedOpNames = ["&", "|", "~", "="]
+              , opStart = oneOf "&|~"
+              , opLetter = oneOf "&|~"
+              , reservedOpNames = ["&", "|", "~"]
               , reservedNames = ["true", "false"]
               }
 
@@ -61,9 +61,6 @@ exprparser = buildExpressionParser table term <?> "expression"
 
 table :: [[Operator String u Identity Expression]]
 table = [
-            [
-                Infix (m_reservedOp "=" >> return (Binary LogicalEquality)) AssocLeft
-            ],
             [
                 Prefix (m_reservedOp "~" >> return (Unary LogicalNot))
             ],
@@ -92,9 +89,8 @@ collectVariableNames (Unary _ right)       = collectVariableNames right
 collectVariableNames (Variable name)       = Set.singleton name
 
 evaluate :: Map String Bool -> Expression -> Bool
-evaluate _  (Constant b)                   = b
-evaluate vs (Unary    LogicalNot      e)   = not (evaluate vs e)
-evaluate vs (Binary   LogicalAnd      l r) = evaluate vs l && evaluate vs r
-evaluate vs (Binary   LogicalOr       l r) = evaluate vs l || evaluate vs r
-evaluate vs (Binary   LogicalEquality l r) = evaluate vs l == evaluate vs r
-evaluate vs (Variable name)                = maybe False id (Map.lookup name vs)
+evaluate _  (Constant b)              = b
+evaluate vs (Unary    LogicalNot e)   = not (evaluate vs e)
+evaluate vs (Binary   LogicalAnd l r) = evaluate vs l && evaluate vs r
+evaluate vs (Binary   LogicalOr  l r) = evaluate vs l || evaluate vs r
+evaluate vs (Variable name)           = maybe False id (Map.lookup name vs)