Warn about using <=/>=, and don't warn about -gt 1.2 in ksh/zsh

This commit is contained in:
Vidar Holen 2014-03-16 14:51:46 -07:00
parent 67f4a0d6eb
commit 2a9c9ae0ad
1 changed files with 45 additions and 10 deletions

View File

@ -830,27 +830,62 @@ prop_checkNumberComparisons4 = verify checkNumberComparisons "[[ $foo > 2.72 ]]"
prop_checkNumberComparisons5 = verify checkNumberComparisons "[[ $foo -le 2.72 ]]" prop_checkNumberComparisons5 = verify checkNumberComparisons "[[ $foo -le 2.72 ]]"
prop_checkNumberComparisons6 = verify checkNumberComparisons "[[ 3.14 -eq $foo ]]" prop_checkNumberComparisons6 = verify checkNumberComparisons "[[ 3.14 -eq $foo ]]"
prop_checkNumberComparisons7 = verifyNot checkNumberComparisons "[[ 3.14 == $foo ]]" prop_checkNumberComparisons7 = verifyNot checkNumberComparisons "[[ 3.14 == $foo ]]"
checkNumberComparisons _ (TC_Binary id typ op lhs rhs) = do prop_checkNumberComparisons8 = verify checkNumberComparisons "[[ foo <= bar ]]"
when (op `elem` ["<", ">", "<=", ">=", "\\<", "\\>", "\\<=", "\\>="]) $ do prop_checkNumberComparisons9 = verify checkNumberComparisons "[ foo \\>= bar ]"
when (isNum lhs || isNum rhs) $ err id 2071 $ "\"" ++ op ++ "\" is for string comparisons. Use " ++ (eqv op) ++" ." prop_checkNumberComparisons10= verify checkNumberComparisons "#!/bin/zsh -x\n[ foo >= bar ]]"
mapM_ checkDecimals [lhs, rhs] checkNumberComparisons params (TC_Binary id typ op lhs rhs) = do
if (isNum lhs || isNum rhs)
then do
when (isLtGt op) $
err id 2071 $
op ++ " is for string comparisons. Use " ++ (eqv op) ++ " instead."
when (isLeGe op) $
err id 2071 $ op ++ " is not a valid operator. " ++
"Use " ++ (eqv op) ++ " ."
else do
when (isLeGe op || isLtGt op) $
mapM_ checkDecimals [lhs, rhs]
when (isLeGe op) $
err id 2122 $ op ++ " is not a valid operator. " ++
"Use '! a " ++ (invert op) ++ " b' instead."
when (op `elem` ["-lt", "-gt", "-le", "-ge", "-eq"]) $ do when (op `elem` ["-lt", "-gt", "-le", "-ge", "-eq"]) $ do
mapM_ checkDecimals [lhs, rhs] mapM_ checkDecimals [lhs, rhs]
where where
checkDecimals hs = when (isFraction hs) $ err (getId hs) 2072 $ decimalError isLtGt = flip elem ["<", "\\<", ">", "\\>"]
decimalError = "Decimals are not supported. Either use integers only, or use bc or awk to compare." isLeGe = flip elem ["<=", "\\<=", ">=", "\\>="]
isNum t = case deadSimple t of [v] -> all isDigit v
_ -> False supportsDecimals =
isFraction t = case deadSimple t of [v] -> isJust $ matchRegex floatRegex v let sh = shellType params in
_ -> False sh == Ksh || sh == Zsh
checkDecimals hs =
when (isFraction hs && not supportsDecimals) $
err (getId hs) 2072 decimalError
decimalError = "Decimals are not supported. " ++
"Either use integers only, or use bc or awk to compare."
isNum t =
case deadSimple t of
[v] -> all isDigit v
_ -> False
isFraction t =
case deadSimple t of
[v] -> isJust $ matchRegex floatRegex v
_ -> False
eqv ('\\':s) = eqv s eqv ('\\':s) = eqv s
eqv "<" = "-lt" eqv "<" = "-lt"
eqv ">" = "-gt" eqv ">" = "-gt"
eqv "<=" = "-le" eqv "<=" = "-le"
eqv ">=" = "-ge" eqv ">=" = "-ge"
eqv _ = "the numerical equivalent" eqv _ = "the numerical equivalent"
invert ('\\':s) = invert s
invert "<=" = ">"
invert ">=" = "<"
floatRegex = mkRegex "^[0-9]+\\.[0-9]+$" floatRegex = mkRegex "^[0-9]+\\.[0-9]+$"
checkNumberComparisons _ _ = return () checkNumberComparisons _ _ = return ()