X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2FjavaGen%2FJavaGen.lhs;h=ff0dd9163dd02dc216d5c69145d1a8f40cffa40c;hb=7a69908aee3b965bbd081dec581ed2d41a3f284a;hp=ae6d19a4ca76e9a4e22bd3c31645ea6707533d31;hpb=d254a44b8392ff0a4327f1916ef921887ce78769;p=ghc-hetmet.git

diff --git a/ghc/compiler/javaGen/JavaGen.lhs b/ghc/compiler/javaGen/JavaGen.lhs
index ae6d19a..ff0dd91 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 )
@@ -228,7 +228,7 @@ javaLit (MachInt i)  = Literal (IntLit (fromInteger i))
 javaLit (MachChar c) = Literal (CharLit c)
 javaLit (MachStr fs) = Literal (StringLit str)
    where
-	str = concatMap renderString (_UNPK_ fs) ++ "\\000"
+	str = concatMap renderString (unpackFS fs) ++ "\\000"
 	-- This should really handle all the chars 0..31.
 	renderString '\NUL' = "\\000"
 	renderString other  = [other]
@@ -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
 	 --