projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2003-06-05 14:05:36 by reid]
[ghc-hetmet.git]
/
ghc
/
compiler
/
javaGen
/
JavaGen.lhs
diff --git
a/ghc/compiler/javaGen/JavaGen.lhs
b/ghc/compiler/javaGen/JavaGen.lhs
index
ae6d19a
..
ff0dd91
100644
(file)
--- 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 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 )
, 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
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]
-- 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
| 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
--
Just dc | as `lengthIs` dataConRepArity dc
-- NOTE: Saturated constructors never returning a primitive at this point
--