From c2b3f63f4b1ad7d106735c176035e8405043d060 Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Sat, 20 Apr 2024 13:46:21 -0400 Subject: [PATCH] avoid changing Expr codegen in this PR --- src/Convert/SeverityTask.hs | 6 +++--- src/Language/SystemVerilog/AST/Expr.hs | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/Convert/SeverityTask.hs b/src/Convert/SeverityTask.hs index aa9a772..774d1a9 100644 --- a/src/Convert/SeverityTask.hs +++ b/src/Convert/SeverityTask.hs @@ -94,13 +94,13 @@ severityTaskToString (Subroutine (Ident "$error") _) = severityElabTaskToStrin severityTaskToString (Subroutine (Ident "$fatal") _) = severityElabTaskToString (ElabTask SeverityFatal (Args [] [])) severityTaskToString _ = "" -timeCall :: Expr -timeCall = Call (Ident "$time") (Args [] []) +timeExpr :: Expr +timeExpr = Ident "$time" severityTaskToDisplay :: Stmt -> [Stmt] severityTaskToDisplay task@(Subroutine severity (Args taskArgs [])) = [Subroutine (Ident "$display") (Args ( - [(String ("[%0t] "++(severityTaskToString task)++":"++(trailingSpace))), timeCall] ++ args + [(String ("[%0t] "++(severityTaskToString task)++":"++(trailingSpace))), timeExpr] ++ args ) [])] where args = parseTaskArgs severity taskArgs diff --git a/src/Language/SystemVerilog/AST/Expr.hs b/src/Language/SystemVerilog/AST/Expr.hs index 0cdf5fe..6dc8dc0 100644 --- a/src/Language/SystemVerilog/AST/Expr.hs +++ b/src/Language/SystemVerilog/AST/Expr.hs @@ -24,7 +24,7 @@ module Language.SystemVerilog.AST.Expr , pattern Mux ) where -import Data.List (intercalate, isPrefixOf) +import Data.List (intercalate) import Text.Printf (printf) import Language.SystemVerilog.AST.Number (Number(..)) @@ -138,8 +138,6 @@ instance Show Expr where showString " : " . shows f . showChar ')' - showsPrec _ (Call (Ident e) (Args [] [])) | "$" `isPrefixOf` e = - shows (Ident e) showsPrec _ (Call e l ) = shows e . shows l