madlang 2.0.0.0 → 2.0.0.1

raw patch · 3 files changed

+8/−7 lines, 3 filesdep ~madlang

Dependency ranges changed: madlang

Files

• madlang.cabal +3/−3
• src/Text/Madlibs/Exec/Main.hs +1/−1
• src/Text/Madlibs/Internal/Types.hs +4/−3

@@ -1,5 +1,5 @@ name: madlang-version: 2.0.0.0+version: 2.0.0.1 cabal-version: >=1.10 build-type: Simple license: BSD3@@ -63,7 +63,7 @@     main-is: Main.hs     build-depends:         base >=4.9.1.0 && <4.10,-        madlang >=2.0.0.0 && <2.1+        madlang >=2.0.0.1 && <2.1     default-language: Haskell2010     hs-source-dirs: app @@ -72,7 +72,7 @@     main-is: Spec.hs     build-depends:         base >=4.9.1.0 && <4.10,-        madlang >=2.0.0.0 && <2.1,+        madlang >=2.0.0.1 && <2.1,         hspec >=2.4.2 && <2.5,         megaparsec >=5.2.0 && <5.3,         text >=1.2.2.1 && <1.3,

@@ -82,7 +82,7 @@         (Run reps _) -> do             replicateM_ (maybe 1 id reps) $ runFile ins filepath >>= TIO.putStrLn -- fix so it parses once!! either show run $ parsed          (Debug _) -> do-            putStrLn . (either show (drawTree . tokToTree)) =<< makeTree ins filepath -- parsed+            putStrLn . (either show (drawTree . tokToTree 1.0)) =<< makeTree ins filepath -- parsed             --print parsed         (Lint _) -> do             putStrLn $ either show (const "No errors found.") parsed

@@ -27,9 +27,10 @@ data RandTok = List [(Prob, RandTok)] | Value T.Text     deriving (Show, Eq) -tokToTree :: RandTok -> Tree String-tokToTree (Value a) = Node (show a) []-tokToTree (List xs) = Node "++" (map (tokToTree . snd) xs)+tokToTree :: Prob -> RandTok -> Tree String+tokToTree p (Value a) = Node ((take 4 . show . min 1.0) p ++ " " ++ show a) []+tokToTree p (List [(_,Value a)]) = Node ((take 4 . show . min 1.0) p ++ " " ++ show a) []+tokToTree p (List xs) = Node (take 4 . show . min 1.0 $ p) (map (\(prob, val) -> tokToTree prob val) xs) -- (on (tokToTree .* fst -.* snd) (flip ($))) xs)  -- | Neat 2-dimensional drawing of a parsed tree. {--