git.iko.soy/rowtype-yoga/purescript-native
on golang help sign in
Resolves #1268. JavaScript (FFI) files can be specified without `--ffi`.

The ffi flag still works, however.

commit612bff2b911686fb30fd60a0ef510b9df0e7153d authorMichael Gilliland <mjg.py3@gmail.com> dateMon 24 Aug 2015, 22:37 (11 years ago) parent54cd8d9
1 file changed+5−3
psc/Main.hs+5−3
psc/Main.hs+5−3
@@ -24,6 +24,7 @@ import Control.Monad
2424import Control.Monad.Error.Class (MonadError(..))
2525import Control.Monad.Writer.Strict
2626
27+import Data.List (isSuffixOf, partition)
2728import Data.Version (showVersion)
2829import qualified Data.Map as M
2930
@@ -56,9 +57,10 @@ compile (PSCMakeOptions inputGlob inputForeignGlob outputDir opts usePrefix) = d
5657 when (null input) $ do
5758 hPutStrLn stderr "psc: No input files."
5859 exitFailure
59− moduleFiles <- readInput (InputOptions input)
60+ let (jsFiles, pursFiles) = partition (isSuffixOf ".js") input
61+ moduleFiles <- readInput (InputOptions pursFiles)
6062 inputForeign <- globWarningOnMisses warnFileTypeNotFound inputForeignGlob
61− foreignFiles <- forM inputForeign (\inFile -> (inFile,) <$> readFile inFile)
63+ foreignFiles <- forM (inputForeign ++ jsFiles) (\inFile -> (inFile,) <$> readFile inFile)
6264 case runWriterT (parseInputs moduleFiles foreignFiles) of
6365 Left errs -> do
6466 hPutStrLn stderr (P.prettyPrintMultipleErrors (P.optionsVerboseErrors opts) errs)
@@ -79,7 +81,7 @@ compile (PSCMakeOptions inputGlob inputForeignGlob outputDir opts usePrefix) = d
7981 exitSuccess
8082
8183warnFileTypeNotFound :: String -> IO ()
82−warnFileTypeNotFound = hPutStrLn stderr . ((++) "psc: No files found using pattern: ")
84+warnFileTypeNotFound = hPutStrLn stderr . ("psc: No files found using pattern: " ++)
8385
8486globWarningOnMisses :: (String -> IO ()) -> [FilePath] -> IO [FilePath]
8587globWarningOnMisses warn = concatMapM globWithWarning