Use newtypes to retain more information

src/INAST.hs

@@ -29,19 +29,19 @@ insuranceNetworkParser = many1 line
                   , INASTExprInsurerId <$> insurerId ]
     -- <lesser-than> ::= "<" <integer>
     lt :: Parser INASTLt
-    lt = "<" *> integer
+    lt = INASTLt <$> ("<" *> integer)
     -- <greater-than> ::= ">" <integer>
     gt :: Parser INASTGt
-    gt = ">" *> integer
+    gt = INASTGt <$> (">" *> integer)
     -- <equals> ::= "=" <integer>
     eq :: Parser INASTEq
-    eq = "=" *> integer
+    eq = INASTEq <$> ("=" *> integer)
     -- <insurer-id> ::= "I" <integer>
     insurerId :: Parser INASTInsurerId
-    insurerId = "I" *> integer
+    insurerId = INASTInsurerId <$> ("I" *> integer)
     -- <percent> ::= <integer> "%"
     percent :: Parser INASTPercent
-    percent = integer <* "%"
+    percent = INASTPercent <$> integer <* "%"
     -- <integer> ::= <digit> | <non-zero-digit> <integer>
     -- Overapproximation of the grammar
     integer :: Parser Int
@@ -58,8 +58,13 @@ data INASTExpr = INASTExprLt INASTLt
                | INASTExprInsurerId INASTInsurerId
   deriving (Show)
 
-type INASTLt = Int
+newtype INASTLt = INASTLt Int
-type INASTGt = Int
+  deriving (Show)
-type INASTEq = Int
+newtype INASTGt = INASTGt Int
-type INASTInsurerId = Int
+  deriving (Show)
-type INASTPercent = Int
+newtype INASTEq = INASTEq Int
+  deriving (Show)
+newtype INASTInsurerId = INASTInsurerId Int
+  deriving (Show)
+newtype INASTPercent = INASTPercent Int
+  deriving (Show)