Skip to content

Error positions for FFI related errors #3276

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
garyb merged 3 commits into from
Mar 11, 2018
Merged

Error positions for FFI related errors #3276

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
088f0c1
Add source span for UnnecessaryFFIModule
garyb Mar 11, 2018
8197e5f
Add source spans for more FFI warnings
garyb Mar 11, 2018
7187e4d
Add error test for MissingFFIImplementations
garyb Mar 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions examples/failing/MissingFFIImplementations.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
exports.yes = true;
5 changes: 5 additions & 0 deletions examples/failing/MissingFFIImplementations.purs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
-- @shouldFailWith MissingFFIImplementations
module Main where

foreign import yes :: Boolean
foreign import no :: Boolean
2 changes: 1 addition & 1 deletion src/Language/PureScript/Ide/Rebuild.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ shushProgress ma _ =
-- files though)
shushCodegen :: P.MakeActions P.Make -> MakeActionsEnv -> P.MakeActions P.Make
shushCodegen ma MakeActionsEnv{..} =
ma { P.codegen = \_ _ _ -> pure () }
ma { P.codegen = \_ _ _ _ -> pure () }

-- | Returns a topologically sorted list of dependent ExternsFiles for the given
-- module. Throws an error if there is a cyclic dependency within the
Expand Down
20 changes: 10 additions & 10 deletions src/Language/PureScript/Make.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ data MakeActions m = MakeActions
, readExterns :: ModuleName -> m (FilePath, Externs)
-- ^ Read the externs file for a module as a string and also return the actual
-- path for the file.
, codegen :: CF.Module CF.Ann -> Environment -> Externs -> SupplyT m ()
, codegen :: SourceSpan -> CF.Module CF.Ann -> Environment -> Externs -> SupplyT m ()
-- ^ Run the code generator for the module and write any required output files.
, progress :: ProgressMessage -> m ()
-- ^ Respond to a progress update.
Expand Down Expand Up @@ -154,7 +154,7 @@ rebuildModule MakeActions{..} externs m@(Module _ _ moduleName _ _) = do
corefn = CF.moduleToCoreFn env' mod'
[renamed] = renameInModules [corefn]
exts = moduleToExternsFile mod' env'
evalSupplyT nextVar' . codegen renamed env' . encode $ exts
evalSupplyT nextVar' . codegen ss renamed env' . encode $ exts
return exts

-- | Compiles in "make" mode, compiling each module separately to a @.js@ file and an @externs.json@ file.
Expand Down Expand Up @@ -344,16 +344,16 @@ buildMakeActions outputDir filePathMap foreigns usePrefix =
let path = outputDir </> T.unpack (runModuleName mn) </> "externs.json"
(path, ) <$> readTextFile path

codegen :: CF.Module CF.Ann -> Environment -> Externs -> SupplyT Make ()
codegen m _ exts = do
codegen :: SourceSpan -> CF.Module CF.Ann -> Environment -> Externs -> SupplyT Make ()
codegen modSS m _ exts = do
let mn = CF.moduleName m
foreignInclude <- case mn `M.lookup` foreigns of
Just path
| not $ requiresForeign m -> do
tell $ errorMessage $ UnnecessaryFFIModule mn path
tell $ errorMessage' modSS $ UnnecessaryFFIModule mn path
return Nothing
| otherwise -> do
checkForeignDecls m path
checkForeignDecls modSS m path
return $ Just $ Imp.App Nothing (Imp.Var Nothing "require") [Imp.StringLiteral Nothing "./foreign"]
Nothing | requiresForeign m -> throwError . errorMessage $ MissingFFIModule mn
| otherwise -> return Nothing
Expand Down Expand Up @@ -425,8 +425,8 @@ buildMakeActions outputDir filePathMap foreigns usePrefix =

-- | Check that the declarations in a given PureScript module match with those
-- in its corresponding foreign module.
checkForeignDecls :: CF.Module ann -> FilePath -> SupplyT Make ()
checkForeignDecls m path = do
checkForeignDecls :: SourceSpan -> CF.Module ann -> FilePath -> SupplyT Make ()
checkForeignDecls modSS m path = do
jsStr <- lift $ readTextFile path
js <- either (errorParsingModule . Bundle.UnableToParseModule) pure $ JS.parse (BU8.toString (B.toStrict jsStr)) path

Expand All @@ -439,12 +439,12 @@ checkForeignDecls m path = do

let unusedFFI = foreignIdents S.\\ importedIdents
unless (null unusedFFI) $
tell . errorMessage . UnusedFFIImplementations mname $
tell . errorMessage' modSS . UnusedFFIImplementations mname $
S.toList unusedFFI

let missingFFI = importedIdents S.\\ foreignIdents
unless (null missingFFI) $
throwError . errorMessage . MissingFFIImplementations mname $
throwError . errorMessage' modSS . MissingFFIImplementations mname $
S.toList missingFFI

where
Expand Down