refactor lexeme and skipHorizontalSpace to ParsingUtils

Author: mengwong

languages/haskell/app/ParseMarkdown.hs

@@ -12,7 +12,6 @@ import Data.Maybe ( catMaybes, fromMaybe )
 
 import DMN.Types ( DecisionTable )
 import DMN.ParseTable ( parseTable )
-import DMN.ParseFEEL ( skipHorizontalSpace )
 
 import Text.Megaparsec
     ( MonadParsec(try, eof), satisfy, manyTill, many, (<?>), (<|>) )
@@ -25,7 +24,9 @@ import DMN.ParsingUtils
       endOfLine,
       anyChar,
       many1,
-      parseOnly )
+      parseOnly,
+      skipHorizontalSpace
+    )
 import qualified Data.Text as T
 
 import Options ( ArgOptions(input, verbose) )

languages/haskell/src/DMN/ParseFEEL.hs

@@ -82,7 +82,3 @@ escape = do
 nonEscape :: Parser Char
 nonEscape = noneOf ['\\', '\"', '\0', '\n', '\r', '\v', '\t', '\b', '\f']
 
-skipHorizontalSpace :: Parser ()
-skipHorizontalSpace = skipWhile "Horizontal space" isHorizontalSpace
--- ^ Maybe add try here?
-

languages/haskell/src/DMN/ParseTable.hs

@@ -4,7 +4,7 @@ module DMN.ParseTable where
 
 import Prelude hiding (takeWhile)
 import DMN.DecisionTable ( mkFs, trim, mkDTable )
-import DMN.ParseFEEL ( parseVarname, skipHorizontalSpace )
+import DMN.ParseFEEL ( parseVarname )
 import DMN.SFeelGrammar
 import Data.Maybe (catMaybes)
 import Data.List (transpose)
@@ -24,7 +24,7 @@ import Text.Megaparsec
       MonadParsec(try) )
 import Text.Megaparsec.Char ( char )
 import DMN.ParsingUtils
-    ( Parser, inClass, skipWhile, digit, endOfLine, endOfInput, many1 )
+    ( Parser, inClass, skipWhile, digit, endOfLine, endOfInput, many1, lexeme, skipHorizontalSpace )
 import DMN.Types
     ( ColBody(..),
       HeaderRow(..),
@@ -66,9 +66,6 @@ parseColHeader = do
 parseTypeDecl :: Parser (Maybe DMNType)
 parseTypeDecl = Mega.optional $ lexeme ":" *> parseType
 
-lexeme :: Parser a -> Parser a
-lexeme x = x <* skipHorizontalSpace
-
 parseType :: Parser DMNType
 parseType
   =   (DMN_List    <$>  (lexeme "[" *> parseType <* lexeme "]") <?> "inside list")

languages/haskell/src/DMN/ParsingUtils.hs

@@ -3,12 +3,12 @@
 module DMN.ParsingUtils
   where
 
--- import Control.Monad (void)
 import Data.Bifunctor (first)
 import Data.Char (isDigit)
 import Data.Text (Text)
--- import qualified Data.Text as T
 import Data.Void (Void)
+import Text.Megaparsec.Char ( char, string )
+import Text.Megaparsec.Char.Lexer ( scientific )
 import Text.Megaparsec
     ( (<|>),
       (<?>),
@@ -21,8 +21,6 @@ import Text.Megaparsec
       some,
       Parsec,
       MonadParsec(eof, takeWhileP) )
-import Text.Megaparsec.Char ( char, string )
-import Text.Megaparsec.Char.Lexer
 
 import GHC.Stack (HasCallStack)
 
@@ -38,6 +36,9 @@ notInClass s = not . inClass s
 skipWhile :: String -> (Char -> Bool) -> Parser ()
 skipWhile tokenLabel p = () <$ takeWhileP (Just tokenLabel) p
 
+lexeme :: Parser a -> Parser a
+lexeme x = x <* skipHorizontalSpace
+
 -- | The parser @skip p@ succeeds for any character for which the
 -- predicate @p@ returns 'True'.
 --
@@ -89,3 +90,8 @@ anyChar = anySingle
 
 notChar :: Char -> Parser Char
 notChar = anySingleBut
+
+skipHorizontalSpace :: Parser ()
+skipHorizontalSpace = skipWhile "Horizontal space" isHorizontalSpace
+-- ^ Maybe add try here?
+