From ecaaec9c001ebe30f343a8a90601c56cf169d0a2 Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Fri, 4 Jun 2021 15:24:19 -0400 Subject: [PATCH] minor codegen cleanup --- src/Language/SystemVerilog/AST/Expr.hs | 11 +++++------ src/Language/SystemVerilog/AST/ShowHelp.hs | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Language/SystemVerilog/AST/Expr.hs b/src/Language/SystemVerilog/AST/Expr.hs index 5ae724c..5163fdf 100644 --- a/src/Language/SystemVerilog/AST/Expr.hs +++ b/src/Language/SystemVerilog/AST/Expr.hs @@ -126,7 +126,7 @@ data Args deriving (Eq, Ord) instance Show Args where - show (Args pnArgs kwArgs) = "(" ++ (commas strs) ++ ")" + show (Args pnArgs kwArgs) = '(' : commas strs ++ ")" where strs = (map show pnArgs) ++ (map showKwArg kwArgs) showKwArg (x, e) = printf ".%s(%s)" x (show e) @@ -177,10 +177,10 @@ showAssignment val = " = " ++ show val showRanges :: [Range] -> String showRanges [] = "" -showRanges l = " " ++ (concatMap showRange l) +showRanges l = ' ' : concatMap showRange l showRange :: Range -> String -showRange (h, l) = printf "[%s:%s]" (show h) (show l) +showRange (h, l) = '[' : show h ++ ':' : show l ++ "]" showUniOpPrec :: Expr -> ShowS showUniOpPrec (e @ UniOp{}) = (showParen True . shows) e @@ -198,6 +198,5 @@ showParams params = indentedParenList $ map showParam params showParam :: ParamBinding -> String showParam ("*", Right Nil) = ".*" -showParam (i, arg) = - printf fmt i (either show show arg) - where fmt = if i == "" then "%s%s" else ".%s(%s)" +showParam ("", arg) = showEither arg +showParam (i, arg) = printf ".%s(%s)" i (showEither arg) diff --git a/src/Language/SystemVerilog/AST/ShowHelp.hs b/src/Language/SystemVerilog/AST/ShowHelp.hs index d265adc..2ce67aa 100644 --- a/src/Language/SystemVerilog/AST/ShowHelp.hs +++ b/src/Language/SystemVerilog/AST/ShowHelp.hs @@ -57,4 +57,4 @@ showEither (Right v) = show v showBlock :: (Show a, Show b) => [a] -> [b] -> String showBlock a [] = indent $ show a showBlock [] b = indent $ show b -showBlock a b = indent $ show a ++ "\n" ++ show b +showBlock a b = indent $ show a ++ '\n' : show b