Simplify parseArgs

This commit is contained in:
Joseph C. Sible 2020-12-28 17:14:18 -05:00
parent eaccd3d02c
commit 46f177b5be
1 changed files with 3 additions and 5 deletions

View File

@ -687,12 +687,10 @@ getModifiedVariableCommand base@(T_SimpleCommand id cmdPrefix (T_NormalWord _ (T
parseArgs :: Maybe (Token, Token, String, DataType) parseArgs :: Maybe (Token, Token, String, DataType)
parseArgs = do parseArgs = do
args <- getGnuOpts "d:n:O:s:u:C:c:t" rest args <- getGnuOpts "d:n:O:s:u:C:c:t" rest
let names = map snd $ filter (\(x,y) -> null x) args case [y | ("",(_,y)) <- args] of
if null names [] ->
then
return (base, base, "MAPFILE", DataArray SourceExternal) return (base, base, "MAPFILE", DataArray SourceExternal)
else do first:_ -> do
(_, first) <- listToMaybe names
name <- getLiteralString first name <- getLiteralString first
guard $ isVariableName name guard $ isVariableName name
return (base, first, name, DataArray SourceExternal) return (base, first, name, DataArray SourceExternal)