Skip to content

Commit 70c3eb0

Browse files
committed
Fix unchanged --'s
1 parent a86ca7d commit 70c3eb0

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

Text Parser/ParseFile.hs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ import Prelude hiding (writeFile)
1414
import GBAUtilities (stripExtension, makeError)
1515
import Data.ByteString.Char8 (pack)
1616

17+
defsFlag = "-defs"
18+
1719
main::IO ()
1820
main = do
1921
args <- getArgs
@@ -23,18 +25,18 @@ main = do
2325
let quiet = elem "--q" options
2426

2527
if elem "--help" options
26-
then putStr $ makeError toStdOut "Usage: ./ParseFile <filename.txt> [-o <outputfile.dmp>] [--defs <definitions_file.txt>] [--to-stdout] [--q] [--help]"
28+
then putStr $ makeError toStdOut "Usage: ./ParseFile <filename.txt> [-o <outputfile.dmp>] [-defs <definitions_file.txt>] [--to-stdout] [--q] [--help]"
2729
else if length params /= 1
2830
then putStr $ makeError toStdOut "Incorrect number of parameters. Use ./ParseFile --help for usage."
2931
else if elem "-o" args && getParamAfterFlag "-o" args == Nothing
3032
then putStr $ makeError toStdOut "No output file specified."
31-
else if elem "--defs" args && getParamAfterFlag "--defs" args == Nothing
33+
else if elem defsFlag args && getParamAfterFlag defsFlag args == Nothing
3234
then putStr $ makeError toStdOut "No definitions file specified."
3335
else do
3436
let inputFileName = head params
3537

36-
let definitionsFilename = if elem "--defs" args
37-
then case getParamAfterFlag "--defs" args of
38+
let definitionsFilename = if elem defsFlag args {- TODO: This is a bit of a lazy hack, it should be taken care of above tbqh -}
39+
then case getParamAfterFlag defsFlag args of
3840
Just s -> s
3941
Nothing -> "ParseDefinitions.txt" {- Should be unreachable -}
4042
else "ParseDefinitions.txt"

0 commit comments

Comments
 (0)