diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Command/Run.hs | 2 | ||||
| -rw-r--r-- | src/Eval.hs | 2 | ||||
| -rw-r--r-- | src/Range.hs (renamed from src/Expression.hs) | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/Command/Run.hs b/src/Command/Run.hs index f200738..886aa85 100644 --- a/src/Command/Run.hs +++ b/src/Command/Run.hs @@ -22,10 +22,10 @@ import System.FilePath.Glob import Command import Config import Eval -import Expression import Job import Job.Types import Output +import Range import Repo import Terminal diff --git a/src/Eval.hs b/src/Eval.hs index 9ac11a5..e083788 100644 --- a/src/Eval.hs +++ b/src/Eval.hs @@ -30,9 +30,9 @@ import System.FilePath import Config import Destination import Expr -import Expression import Job.Types import Output +import Range import Repo data EvalInput = EvalInput diff --git a/src/Expression.hs b/src/Range.hs index 3897ede..ad99db8 100644 --- a/src/Expression.hs +++ b/src/Range.hs @@ -1,4 +1,4 @@ -module Expression ( +module Range ( DeclaredRef(..), StaticRef', WatchedRef(..), @@ -268,18 +268,18 @@ updateWatchedTags wt@WatchedTags {..} = do updateWatchedTags wt -type ExprParser = Parsec Void Text +type RangeParser = Parsec Void Text parseRangeExpression :: Text -> Either String DeclaredRangeExpression parseRangeExpression = bimap errorBundlePretty id . runParser parser "" where - parser :: ExprParser DeclaredRangeExpression + parser :: RangeParser DeclaredRangeExpression parser = do range <- parseRange eof return range - parseRange :: ExprParser DeclaredRangeExpression + parseRange :: RangeParser DeclaredRangeExpression parseRange = do range <- parseRevision choice @@ -292,14 +292,14 @@ parseRangeExpression = bimap errorBundlePretty id . runParser parser "" return range ] - parseTextRef :: ExprParser Text + parseTextRef :: RangeParser Text parseTextRef = do fmap T.concat $ some $ choice [ takeWhile1P Nothing (\x -> isAlphaNum x || x `elem` [ '_', '-', '/' ]) , try $ string "." <* notFollowedBy (char '.') ] - parseRevision :: ExprParser DeclaredRangeExpression + parseRevision :: RangeParser DeclaredRangeExpression parseRevision = do tok <- parseTextRef |