Use maybe instead of fromMaybe and fmap
This commit is contained in:
parent
67abfe159e
commit
ba86c6363c
|
@ -5020,7 +5020,7 @@ checkPlusEqualsNumber params t =
|
||||||
let
|
let
|
||||||
unquotedLiteral = getUnquotedLiteral word
|
unquotedLiteral = getUnquotedLiteral word
|
||||||
isEmpty = unquotedLiteral == Just ""
|
isEmpty = unquotedLiteral == Just ""
|
||||||
isUnquotedNumber = not isEmpty && fromMaybe False (all isDigit <$> unquotedLiteral)
|
isUnquotedNumber = not isEmpty && maybe False (all isDigit) unquotedLiteral
|
||||||
isNumericalVariableName = fromMaybe False $ do
|
isNumericalVariableName = fromMaybe False $ do
|
||||||
str <- unquotedLiteral
|
str <- unquotedLiteral
|
||||||
CF.variableMayBeAssignedInteger state str
|
CF.variableMayBeAssignedInteger state str
|
||||||
|
|
|
@ -829,7 +829,7 @@ lookupStack' functionOnly get dep def ctx key = do
|
||||||
f (s:rest) = do
|
f (s:rest) = do
|
||||||
-- Go up the stack until we find the value, and add
|
-- Go up the stack until we find the value, and add
|
||||||
-- a dependency on each state (including where it was found)
|
-- a dependency on each state (including where it was found)
|
||||||
res <- fromMaybe (f rest) (return <$> get (stackState s) key)
|
res <- maybe (f rest) return (get (stackState s) key)
|
||||||
modifySTRef (dependencies s) $ S.insert $ dep key res
|
modifySTRef (dependencies s) $ S.insert $ dep key res
|
||||||
return res
|
return res
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue