[project @ 2003-02-12 15:01:31 by simonpj]

-------------------------------------
  Big upheaval to the way that constructors are named
	-------------------------------------

This commit enshrines the new story for constructor names.  We could never
really get External Core to work nicely before, but now it does.

The story is laid out in detail in the Commentary
	ghc/docs/comm/the-beast/data-types.html
so I will not repeat it here.

	[Manuel: the commentary isn't being updated, apparently.]

However, the net effect is that in Core and in External Core, contructors look
like constructors, and the way things are printed is all consistent.

It is a fairly pervasive change (which is why it has been so long postponed),
but I hope the question is now finally closed.

All the libraries compile etc, and I've run many tests, but doubtless there will
be some dark corners.

1 files changed, 2 insertions, 2 deletions

diff --git a/ghc/compiler/javaGen/JavaGen.lhs b/ghc/compiler/javaGen/JavaGen.lhs
index 55b2b716c1..ff0dd9163d 100644
--- a/ghc/compiler/javaGen/JavaGen.lhs
+++ b/ghc/compiler/javaGen/JavaGen.lhs
@@ -47,7 +47,7 @@ module JavaGen( javaGen ) where
 import Java
 
 import Literal	( Literal(..) )
-import Id	( Id, isDataConId_maybe, isId, idName, isDeadBinder, idPrimRep
+import Id	( Id, isDataConWorkId_maybe, isId, idName, isDeadBinder, idPrimRep
 		, isPrimOpId_maybe )
 import Name	( NamedThing(..), getOccString, isExternalName, isInternalName
 		, nameModule )
@@ -420,7 +420,7 @@ javaApp r (CoreSyn.App f a) as
 	| isValArg a = javaApp r f (a:as)
 	| otherwise  = javaApp r f as
 javaApp r (CoreSyn.Var f) as 
-  = case isDataConId_maybe f of {
+  = case isDataConWorkId_maybe f of {
 	Just dc | as `lengthIs` dataConRepArity dc
 	 -- NOTE: Saturated constructors never returning a primitive at this point
 	 --