From 1f03c64e9f5166ec6e9fc84b034057e7868b683f Mon Sep 17 00:00:00 2001 From: Zachary Snow Date: Thu, 8 Jul 2021 18:54:48 -0400 Subject: [PATCH] convert Token to use record syntax --- src/Language/SystemVerilog/Parser/Tokens.hs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/Language/SystemVerilog/Parser/Tokens.hs b/src/Language/SystemVerilog/Parser/Tokens.hs index e86e439..66e70df 100644 --- a/src/Language/SystemVerilog/Parser/Tokens.hs +++ b/src/Language/SystemVerilog/Parser/Tokens.hs @@ -10,23 +10,11 @@ module Language.SystemVerilog.Parser.Tokens ( Token (..) , TokenName (..) , Position (..) - , tokenString - , tokenName - , tokenPosition , pattern TokenEOF ) where import Text.Printf -tokenString :: Token -> String -tokenString (Token _ s _) = s - -tokenName :: Token -> TokenName -tokenName (Token kw _ _) = kw - -tokenPosition :: Token -> Position -tokenPosition (Token _ _ pos) = pos - pattern TokenEOF :: Token pattern TokenEOF = Token Unknown "" (Position "" 0 0) @@ -36,8 +24,11 @@ data Position instance Show Position where show (Position f l c) = printf "%s:%d:%d" f l c -data Token - = Token TokenName String Position +data Token = Token + { tokenName :: TokenName + , tokenString :: String + , tokenPosition :: Position + } data TokenName = KW_dollar_bits