16f0260 · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

Fix type synonym issue #165

commit16f0260d511adebec7b04778e2820a636af1608e authorPhil Freeman <paf31@cantab.net> dateSun 2 Feb 2014, 17:21 (13 years ago) parent8b3e18b

2 files changed+23−1

unifiedsplit

examples/passing/ObjectSynonym.pursnew file+15

@@ -0,0 +1,15 @@

1+module ObjectSynonym where

3+type Inner = Number

5+inner :: Inner

6+inner = 0

8+type Outer = { inner :: Inner }

10+outer :: Outer

11+outer = { inner: inner }

12+

13+module Main where

14+

15+main = Trace.trace "Done"

src/Language/PureScript/TypeChecker/Types.hs+8−1

@@ -814,7 +814,8 @@ check' v@(Var var) ty = do

814814 Just moduleName <- checkCurrentModule <$> get

815815 ty1 <- lookupVariable moduleName var

816816 repl <- replaceAllTypeSynonyms ty1

817− v' <- subsumes (Just v) repl ty

817+ ty' <- replaceAllTypeSynonyms ty

818+ v' <- subsumes (Just v) repl ty'

818819 case v' of

819820 Nothing -> throwError "Unable to check type subsumption"

820821 Just v'' -> return v''

@@ -973,6 +974,12 @@ subsumes' val (TypeApp (TypeApp f1 arg1) ret1) (TypeApp (TypeApp f2 arg2) ret2)

973974 subsumes Nothing arg2 arg1

974975 subsumes Nothing ret1 ret2

975976 return val

977+subsumes' val (SaturatedTypeSynonym name tyArgs) ty2 = do

978+ ty1 <- expandTypeSynonym name tyArgs

979+ subsumes val ty1 ty2

980+subsumes' val ty1 (SaturatedTypeSynonym name tyArgs) = do

981+ ty2 <- expandTypeSynonym name tyArgs

982+ subsumes val ty1 ty2

976983subsumes' (Just val) (ConstrainedType constraints ty1) ty2 = do

977984 env <- getEnv

978985 dicts <- getTypeClassDictionaries