0084109 · rowtype-yoga/purescript-native

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

on golang help sign in

Revert "Fix error in check - expand type synonyms first"

0084109Phil Freeman13 years ago

src/Language/PureScript/TypeChecker/Types.hs+3−3

@@ -591,9 +591,6 @@ check' val u@(TUnknown _) = do

591 ty' <- replaceAllVarsWithUnknowns ty

592 ty' ~~ u

593 return val'

594−check' val (SaturatedTypeSynonym name args) = do

595− ty <- expandTypeSynonym name args

596− check val ty

597check' v@(NumericLiteral _) Number = return $ TypedValue v Number

594check' v@(NumericLiteral _) Number = return $ TypedValue v Number

598check' v@(StringLiteral _) String = return $ TypedValue v String

595check' v@(StringLiteral _) String = return $ TypedValue v String

599check' v@(BooleanLiteral _) Boolean = return $ TypedValue v Boolean

596check' v@(BooleanLiteral _) Boolean = return $ TypedValue v Boolean

@@ -660,6 +657,9 @@ check' (Constructor c) ty = do

660 repl <- replaceAllTypeSynonyms ty1

657 repl <- replaceAllTypeSynonyms ty1

661 repl `subsumes` ty

658 repl `subsumes` ty

662 return $ TypedValue (Constructor c) ty

659 return $ TypedValue (Constructor c) ty

660+check' val (SaturatedTypeSynonym name args) = do

661+ ty <- expandTypeSynonym name args

662+ check val ty

663check' val ty = throwError $ prettyPrintValue val ++ " does not have type " ++ prettyPrintType ty

664

665checkProperties :: [(String, Value)] -> Type -> Bool -> Subst [(String, Value)]