From a5ebb1e8227bdbbc0ddb05b4157d7ca1ee45ba9f Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Thu, 18 Apr 2019 23:32:49 -0400 Subject: [PATCH] minor output cleanup --- src/Convert/Enum.hs | 5 ++++- src/Language/SystemVerilog/AST/Type.hs | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Convert/Enum.hs b/src/Convert/Enum.hs index a97e134..6d86884 100644 --- a/src/Convert/Enum.hs +++ b/src/Convert/Enum.hs @@ -67,10 +67,13 @@ traverseType :: Type -> Writer Enums Type traverseType (Enum t v rs) = do let baseType = toBaseType t let (tf, r) = typeRanges baseType - () <- tell $ Set.singleton (r, v) + () <- tell $ Set.singleton (map simplifyRange r, v) return $ tf (r ++ rs) traverseType other = return other +simplifyRange :: Range -> Range +simplifyRange (a, b) = (simplify a, simplify b) + -- drop any enum type casts in favor of implicit conversion from the -- converted type traverseExpr :: Expr -> Expr diff --git a/src/Language/SystemVerilog/AST/Type.hs b/src/Language/SystemVerilog/AST/Type.hs index 6d45039..ae3393e 100644 --- a/src/Language/SystemVerilog/AST/Type.hs +++ b/src/Language/SystemVerilog/AST/Type.hs @@ -43,7 +43,7 @@ data Type instance Show Type where show (Alias xx rs) = printf "%s%s" xx (showRanges rs) show (Net kw rs) = printf "%s%s" (show kw) (showRanges rs) - show (Implicit sg rs) = printf "%s%s" (show sg) (showRanges rs) + show (Implicit sg rs) = printf "%s%s" (showPad sg) (dropWhile (== ' ') $ showRanges rs) show (IntegerVector kw sg rs) = printf "%s%s%s" (show kw) (showPadBefore sg) (showRanges rs) show (IntegerAtom kw sg ) = printf "%s%s" (show kw) (showPadBefore sg) show (NonInteger kw ) = printf "%s" (show kw)