b2b15b3 · rowtype-yoga/purescript-native

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

Fix #533

commitb2b15b31a26f3b471a48b2a363a77156998c240c authorPhil Freeman <paf31@cantab.net> dateSat 20 Sep 2014, 13:47 (12 years ago) parentcaa1dc6

4 files changed+12−1

compare with golang

unifiedsplit

examples/failing/OverlappingArguments.purs+3 examples/failing/OverlappingBinders.purs+4 src/Language/PureScript/Sugar/CaseDeclarations.hs+3−1 src/Language/PureScript/TypeChecker/Types.hs+2

examples/failing/OverlappingArguments.pursnew file+3

@@ -0,0 +1,3 @@

1+module OverlappingArguments where

3+f x x = x

examples/failing/OverlappingBinders.pursnew file+4

@@ -0,0 +1,4 @@

1+module OverlappingBinders where

3+f x = case x of

4+ (y:y@(z:zs)) -> y

src/Language/PureScript/Sugar/CaseDeclarations.hs+3−1

@@ -20,7 +20,7 @@ module Language.PureScript.Sugar.CaseDeclarations (

2020) where

2121

2222import Data.Monoid ((<>))

23−import Data.List (groupBy)

23+import Data.List (nub, groupBy)

2424

2525import Control.Applicative

2626import Control.Monad ((<=<), forM, join, unless, replicateM)

@@ -31,6 +31,7 @@ import Language.PureScript.Declarations

3131import Language.PureScript.Environment

3232import Language.PureScript.Errors

3333import Language.PureScript.Supply

34+import Language.PureScript.TypeChecker.Monad (guardWith)

3435

3536-- |

3637-- Replace all top-level binders in a module with case expressions.

@@ -82,6 +83,7 @@ toDecls :: [Declaration] -> SupplyT (Either ErrorStack) [Declaration]

8283toDecls [ValueDeclaration ident nameKind bs Nothing val] | all isVarBinder bs = do

8384 let args = map (\(VarBinder arg) -> arg) bs

8485 body = foldr (Abs . Left) val args

86+ guardWith (strMsg "Overlapping function argument names") $ length (nub args) == length args

8587 return [ValueDeclaration ident nameKind [] Nothing body]

8688toDecls ds@(ValueDeclaration ident _ bs _ _ : _) = do

8789 let tuples = map toTuple ds

src/Language/PureScript/TypeChecker/Types.hs+2

@@ -785,6 +785,8 @@ inferBinder val (PositionedBinder pos binder) =

785785checkBinders :: [Type] -> Type -> [CaseAlternative] -> UnifyT Type Check [CaseAlternative]

786786checkBinders _ _ [] = return []

787787checkBinders nvals ret (CaseAlternative binders grd val : bs) = do

788+ guardWith (strMsg "Overlapping binders in case statement") $

789+ let ns = concatMap binderNames binders in length (nub ns) == length ns

788790 Just moduleName <- checkCurrentModule <$> get

789791 m1 <- M.unions <$> zipWithM inferBinder nvals binders

790792 r <- bindLocalVariables moduleName [ (name, ty, Defined) | (name, ty) <- M.toList m1 ] $ do