Open
Conversation
Contributor
Author
|
Fixes: #73 |
adithyaov
reviewed
Jun 19, 2023
Comment on lines
+31
to
+87
| data StrSegment | ||
| = StrText String | ||
| | StrVar String | ||
| deriving (Show, Eq) | ||
|
|
||
| formatSpace :: String -> String | ||
| formatSpace = foldr go "" | ||
| where | ||
| go x acc = x:if x == ' ' then dropWhile (' ' ==) acc else acc | ||
|
|
||
| -- | Replace a newline by a space and convert multiple spaces to single space | ||
| -- | ||
| -- >>> :set -XQuasiQuotes | ||
| -- >>> import Streamly.Internal.System | ||
| -- >>> trim " abc \n bbb \n ccc " | ||
| -- " abc bbb ccc " | ||
| -- | ||
| trim :: String -> String | ||
| trim = formatSpace <$> (unwords . fmap formatSpace . lines) | ||
|
|
||
| haskellIdentifier :: Monad m => Parser Char m String | ||
| haskellIdentifier = | ||
| let p = Parser.alphaNum <|> Parser.char '\'' <|> Parser.char '_' | ||
| in Parser.some p Fold.toList | ||
|
|
||
| strParser :: Monad m => Parser Char m [StrSegment] | ||
| strParser = Parser.many content Fold.toList | ||
|
|
||
| where | ||
|
|
||
| plainText = StrText . trim <$> Parser.takeWhile1 (/= '#') Fold.toList | ||
| escHash = StrText . (: []) <$> (Parser.char '#' *> Parser.char '#') | ||
| lineCont = StrText [] <$ (Parser.char '#' *> Parser.char '\n') | ||
| var = StrVar <$> | ||
| ( Parser.char '#' | ||
| *> Parser.char '{' | ||
| *> haskellIdentifier | ||
| <* Parser.char '}' | ||
| ) | ||
| plainHash = StrText . (: []) <$> Parser.char '#' | ||
|
|
||
| -- order is important | ||
| content = plainText <|> escHash <|> lineCont <|> var <|> plainHash | ||
|
|
||
| strSegmentExp :: StrSegment -> Q Exp | ||
| strSegmentExp (StrText text) = stringE text | ||
| strSegmentExp (StrVar name) = do | ||
| valueName <- lookupValueName name | ||
| case valueName of | ||
| Just vn -> varE vn | ||
| Nothing -> | ||
| fail | ||
| $ "cmd quote: Haskell symbol `" ++ name | ||
| ++ "` is not in scope" | ||
|
|
||
| strExp :: [StrSegment] -> Q Exp | ||
| strExp xs = appE [| concat |] $ listE $ map strSegmentExp xs |
Member
There was a problem hiding this comment.
You don't need all this. This is replicated.
adithyaov
reviewed
Jun 19, 2023
Comment on lines
+36
to
+49
| formatSpace :: String -> String | ||
| formatSpace = foldr go "" | ||
| where | ||
| go x acc = x:if x == ' ' then dropWhile (' ' ==) acc else acc | ||
|
|
||
| -- | Replace a newline by a space and convert multiple spaces to single space | ||
| -- | ||
| -- >>> :set -XQuasiQuotes | ||
| -- >>> import Streamly.Internal.System | ||
| -- >>> trim " abc \n bbb \n ccc " | ||
| -- " abc bbb ccc " | ||
| -- | ||
| trim :: String -> String | ||
| trim = formatSpace <$> (unwords . fmap formatSpace . lines) |
Member
There was a problem hiding this comment.
You only need formatSpace and trim.
Member
There was a problem hiding this comment.
We already have idiomatic code to do this:
-- | Replace newlines followed by any number of spaces with a single space.
oneLine :: String -> String
oneLine = unwords . fmap (dropWhile isSpace) . lines
adithyaov
reviewed
Jun 19, 2023
|
|
||
| expandVars :: String -> Q Exp | ||
| expandVars ln = | ||
| case runIdentity $ Stream.parse strParser (Stream.fromList ln) of |
Member
There was a problem hiding this comment.
You can import strParser from Unicode.String. If not exported, you can export it internally.
After runIdentity, you can use trim and formatSpace
Member
There was a problem hiding this comment.
Let's import as much as we can from streamly-core instead of writing it again.
adithyaov
reviewed
Jun 19, 2023
| Right x -> | ||
| strExp x | ||
|
|
||
| -- | A QuasiQuoter that treats the input as a string literal: |
Member
There was a problem hiding this comment.
You'll need to change the documentation.
Member
There was a problem hiding this comment.
You can point it to the str documentation and add the doc for the changes that you made.
harendra-kumar
requested changes
Jul 22, 2023
|
|
||
| expandVars :: String -> Q Exp | ||
| expandVars ln = | ||
| case runIdentity $ Stream.parse strParser (Stream.fromList ln) of |
Member
There was a problem hiding this comment.
Let's import as much as we can from streamly-core instead of writing it again.
Comment on lines
+36
to
+49
| formatSpace :: String -> String | ||
| formatSpace = foldr go "" | ||
| where | ||
| go x acc = x:if x == ' ' then dropWhile (' ' ==) acc else acc | ||
|
|
||
| -- | Replace a newline by a space and convert multiple spaces to single space | ||
| -- | ||
| -- >>> :set -XQuasiQuotes | ||
| -- >>> import Streamly.Internal.System | ||
| -- >>> trim " abc \n bbb \n ccc " | ||
| -- " abc bbb ccc " | ||
| -- | ||
| trim :: String -> String | ||
| trim = formatSpace <$> (unwords . fmap formatSpace . lines) |
Member
There was a problem hiding this comment.
We already have idiomatic code to do this:
-- | Replace newlines followed by any number of spaces with a single space.
oneLine :: String -> String
oneLine = unwords . fmap (dropWhile isSpace) . lines
| -- | ||
| {-# LANGUAGE TemplateHaskell #-} | ||
|
|
||
| module Streamly.Internal.System |
Member
There was a problem hiding this comment.
Put this in the command module rather than creating a new module.
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.