Store Larceny state in monad transformer stack #61
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The mk field isn't necessary because it's always just the mk function.
No longer used by LarcenyState Move LarcenyM to Types
Ideally, the legacy module will allow apps to continue using existing Fills just by importing Web.Larceny.Legacy instead of Web.Larceny.Fills.
emhoracek
force-pushed
the
changing-api-to-be-more-conventional
branch
from
1c49014 to
e308389
Compare
emhoracek
commented
Apr 7, 2019
| @@ -182,8 +182,8 @@ fillChildrenWith' m = maybeFillChildrenWith' (Just <$> m) | |||
| -- > Bonnie Thunders | |||
| maybeFillChildrenWith :: Maybe (Substitutions s) -> Fill s | |||
| maybeFillChildrenWith Nothing = textFill "" | |||
| maybeFillChildrenWith (Just s) = Fill $ \_s (pth, Template tpl) l -> | |||
| tpl pth s l | |||
| maybeFillChildrenWith (Just s) = Fill $ \_attrs tpl -> do | |||
| @@ -124,17 +124,17 @@ rawTextFill' t = Fill $ \_m _t _l -> t | |||
| mapSubs :: (a -> Substitutions s) | |||
| -> [a] | |||
| -> Fill s | |||
| mapSubs f xs = Fill $ \_attrs (pth, tpl) lib -> | |||
| T.concat <$> mapM (\n -> runTemplate tpl pth (f n) lib) xs | |||
| mapSubs f xs = Fill $ \_attrs tpl -> do | |||
| liftIO $ evalStateT f (pc { _pcState = s }) | ||
| Template $ \m -> | ||
| do modify (lSubs .~ m) | ||
| -- lPath .= pth |
There was a problem hiding this comment.
Does this need to be set?
| Fill $ \attr tpl -> | ||
| do st <- get | ||
| let pth = _lPath st | ||
| liftIO $ putStrLn ("Larceny: Missing fill for blank " <> show tn <> " in template " <> show pth) |
There was a problem hiding this comment.
Start using the logger.
|
|
||
| process :: [Node] -> ProcessT s | ||
| process :: [Node] -> LarcenyM s [Text] | ||
| process [] = return [] | ||
| process (NodeElement (BindElement atr kids):nextNodes) = do |
| processBlank tagName atr kids = do | ||
| (ProcessContext pth m l _ mko _ _) <- get | ||
| m <- _lSubs <$> get |
| filled <- fillAttrs atr | ||
| sequence [ toProcessState $ unFill (fillIn (Blank tagName) m) | ||
| sequence [ unFill (fillIn (Blank tagName) m) |
| [Node] -> | ||
| LarcenyM s [Text] | ||
| processBind atr kids nextNodes = do | ||
| m <- _lSubs <$> get |
| @@ -0,0 +1,92 @@ | |||
| {-# LANGUAGE OverloadedStrings #-} | |||
|
|
|||
| module Web.Larceny.Legacy ( textFill | |||
There was a problem hiding this comment.
If this is going to be useful, need to go through and make the types the same.
| let incrementSub = | ||
| subs [("increment-and-print", | ||
| Fill $ \_ _ -> | ||
| do -- eek refactor later |
There was a problem hiding this comment.
Remove or make it a real TODO
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.