Disallow data constructors from having the same name as their enclosing module purescript#172

paf31 · paf31 · commit 6e46a60f45ee · 2014-02-06T11:16:17.000-08:00
diff --git a/purescript.cabal b/purescript.cabal
@@ -1,5 +1,5 @@
 name: purescript
-version: 0.3.9
+version: 0.3.9.1
 cabal-version: >=1.8
 build-type: Simple
 license: MIT
diff --git a/src/Language/PureScript/Names.hs b/src/Language/PureScript/Names.hs
@@ -52,7 +52,7 @@ instance Show ProperName where
 -- |
 -- Module names
 --
-data ModuleName = ModuleName ProperName deriving (Eq, Ord, Data, Typeable)
+data ModuleName = ModuleName { runModuleName :: ProperName } deriving (Eq, Ord, Data, Typeable)
 
 instance Show ModuleName where
   show (ModuleName name) = show name
diff --git a/src/Language/PureScript/TypeChecker.hs b/src/Language/PureScript/TypeChecker.hs
@@ -43,13 +43,14 @@ addDataType moduleName name args dctors ctorKind = do
   env <- getEnv
   putEnv $ env { types = M.insert (moduleName, name) (ctorKind, Data) (types env) }
   forM_ dctors $ \(dctor, maybeTy) ->
-    rethrow (("Error in data constructor " ++ show name ++ ":\n") ++) $
+    rethrow (("Error in data constructor " ++ show dctor ++ ":\n") ++) $
       addDataConstructor moduleName name args dctor maybeTy
 
 addDataConstructor :: ModuleName -> ProperName -> [String] -> ProperName -> Maybe Type -> Check ()
 addDataConstructor moduleName name args dctor maybeTy = do
   env <- getEnv
   dataConstructorIsNotDefined moduleName dctor
+  when (runModuleName moduleName == dctor) $ throwError "A data constructor may not have the same name as its enclosing module."
   let retTy = foldl TypeApp (TypeConstructor (Qualified (Just moduleName) name)) (map TypeVar args)
   let dctorTy = maybe retTy (flip function retTy) maybeTy
   let polyType = mkForAll args dctorTy
