git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Fix #1796, don't print to stderr when using json errors
2dbb329Phil Freeman
psc/Main.hs+3−3
@@ -76,13 +76,13 @@ printWarningsAndErrors verbose True warnings errors = do
76
76
77compile :: PSCMakeOptions -> IO ()
77compile :: PSCMakeOptions -> IO ()
78compile PSCMakeOptions{..} = do
78compile PSCMakeOptions{..} = do
79− input <- globWarningOnMisses warnFileTypeNotFound pscmInput
79+ input <- globWarningOnMisses (unless pscmJSONErrors . warnFileTypeNotFound) pscmInput
80− when (null input) $ do
80+ when (null input && not pscmJSONErrors) $ do
81 hPutStrLn stderr "psc: No input files."
81 hPutStrLn stderr "psc: No input files."
82 exitFailure
82 exitFailure
83 let (jsFiles, pursFiles) = partition (isSuffixOf ".js") input
83 let (jsFiles, pursFiles) = partition (isSuffixOf ".js") input
84 moduleFiles <- readInput (InputOptions pursFiles)
84 moduleFiles <- readInput (InputOptions pursFiles)
85− inputForeign <- globWarningOnMisses warnFileTypeNotFound pscmForeignInput
85+ inputForeign <- globWarningOnMisses (unless pscmJSONErrors . warnFileTypeNotFound) pscmForeignInput
86 foreignFiles <- forM (inputForeign ++ jsFiles) (\inFile -> (inFile,) <$> readUTF8File inFile)
86 foreignFiles <- forM (inputForeign ++ jsFiles) (\inFile -> (inFile,) <$> readUTF8File inFile)
87 (makeErrors, makeWarnings) <- runMake pscmOpts $ do
87 (makeErrors, makeWarnings) <- runMake pscmOpts $ do
88 (ms, foreigns) <- parseInputs moduleFiles foreignFiles
88 (ms, foreigns) <- parseInputs moduleFiles foreignFiles