Skip to content

Redux: Qualify types as necessary in errors and warnings #4409

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

Open
MonoidMusician wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Redux: Qualify types as necessary in errors and warnings #4409

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
2d040d6
wip
hdgarrood May 22, 2022
ddf09ec
Exhaustiveness to compile
MonoidMusician Oct 24, 2022
1a8bf47
Commit test output
MonoidMusician Oct 24, 2022
cd75a8a
Merge remote-tracking branch 'origin/master' into mm/diagnostic-quali…
MonoidMusician Oct 24, 2022
ab63110
Fix merge
MonoidMusician Oct 24, 2022
1471122
Add tests for conflicting types with same name
MonoidMusician Oct 27, 2022
2b431ff
Work on requalifying typeclasses in error messages
MonoidMusician Oct 27, 2022
53a0fe4
Commit new test output
MonoidMusician Oct 27, 2022
d483513
Move requalifyTypesInErrors from Make.hs to Requalify.hs
MonoidMusician Oct 27, 2022
3d05987
Quantified shadowing test
MonoidMusician Oct 27, 2022
e1eb50d
Add specific error for constructors that could not be unified
MonoidMusician Oct 27, 2022
8da7e96
Commit test output
MonoidMusician Oct 27, 2022
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
Prev Previous commit
Next Next commit
Fix merge
  • Loading branch information
@MonoidMusician
MonoidMusician committed Oct 24, 2022
commit ab63110d09638608d81904eb4c172e7a9083a37a
23 changes: 11 additions & 12 deletions src/Language/PureScript/Sugar/Names/Requalify.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module Language.PureScript.Sugar.Names.Requalify
) where

import Debug.Trace
import Prelude.Compat
import Prelude
import Control.Monad
import qualified Data.Map as M
import Data.Maybe
Expand All @@ -24,7 +24,7 @@ import Language.PureScript.Names
import Language.PureScript.Types
import Language.PureScript.Sugar.Names.Env

type ReverseImportMap a = M.Map (ModuleName, a) (Maybe ModuleName)
type ReverseImportMap a = M.Map (ModuleName, a) QualifiedBy

-- | Like an Imports record, except this only contains type and type operator
-- names, and is reversed - while an Imports record maps local names to fully
Expand All @@ -35,7 +35,7 @@ data ReverseImports = ReverseImports
{ reverseImportsTypes :: ReverseImportMap (ProperName 'TypeName)
, reverseImportsTypeOps :: ReverseImportMap (OpName 'TypeOpName)
}
deriving (Show, Read)
deriving (Show)

buildReverseImports :: Imports -> ReverseImports
buildReverseImports Imports { importedTypes, importedTypeOps } =
Expand All @@ -52,14 +52,13 @@ buildReverseImports Imports { importedTypes, importedTypeOps } =
M.toList importedTypeOps
}

preferShortest :: Maybe ModuleName -> Maybe ModuleName -> Maybe ModuleName
preferShortest mx my = do
x <- mx
y <- my
Just $
if T.length (runModuleName x) > T.length (runModuleName y)
preferShortest :: QualifiedBy -> QualifiedBy -> QualifiedBy
preferShortest (ByModuleName x) (ByModuleName y) = do
ByModuleName $
if T.length (runModuleName x) < T.length (runModuleName y)
then x
else y
preferShortest _ y = y

-- | Given an entry from an ImportMap from an Imports (see Sugar.Names.Env)
-- which maps a local name to a fully qualified name, produce an entry for
Expand All @@ -77,7 +76,7 @@ buildReverseImports Imports { importedTypes, importedTypeOps } =
--
-- We make exceptions for anything that has special cases in the type
-- pretty-printer such as Record and Function
toReverseAssoc :: Ord a => Set (Qualified a) -> (Qualified a, [ImportRecord a]) -> Maybe ((ModuleName, a), Maybe ModuleName)
toReverseAssoc :: Ord a => Set (Qualified a) -> (Qualified a, [ImportRecord a]) -> Maybe ((ModuleName, a), QualifiedBy)
toReverseAssoc exceptions (Qualified localModName name, importRecords) =
case importRecords of
[] ->
Expand All @@ -88,7 +87,7 @@ buildReverseImports Imports { importedTypes, importedTypeOps } =
-- TODO need to check the whole list including provenance? eg in the
-- case of two open imports with overlap and we're warning but it still
-- compiles
fullModName <- mFullModName
fullModName <- toMaybeModuleName mFullModName
pure ((fullModName, name), localModName)

typeExceptions :: Set (Qualified (ProperName 'TypeName))
Expand Down Expand Up @@ -122,6 +121,6 @@ requalify ReverseImports { reverseImportsTypes, reverseImportsTypeOps } =
where
reverseLookup :: Ord a => ReverseImportMap a -> Qualified a -> Maybe (Qualified a)
reverseLookup revMap (Qualified mFullModName name) = do
fullModName <- mFullModName
fullModName <- toMaybeModuleName mFullModName
mLocalModName <- M.lookup (fullModName, name) revMap
pure $ Qualified mLocalModName name
6 changes: 3 additions & 3 deletions tests/purs/failing/FoldableInstance4.out
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ in module FoldableInstance4
at tests/purs/failing/FoldableInstance4.purs:8:1 - 8:27 (line 8, column 1 - line 8, column 27)

No type class instance was found for
 
 Data.Foldable.Foldable (Function t3)
 
 
 Data.Foldable.Foldable (Prim.Function t3)
 
The instance head contains unknown type variables. Consider adding a type annotation.

while applying a function foldl
Expand Down