[project @ 2002-01-03 17:09:13 by simonmar]

[ghc-hetmet.git] / ghc / compiler / main / CodeOutput.lhs

diff --git a/ghc/compiler/main/CodeOutput.lhs b/ghc/compiler/main/CodeOutput.lhs
index df6337d..3953410 100644 (file)
--- a/ghc/compiler/main/CodeOutput.lhs
+++ b/ghc/compiler/main/CodeOutput.lhs
@@ -17,8 +17,10 @@ import AsmCodeGen    ( nativeCodeGen )
 import IlxGen          ( ilxGen )
 #endif
 
+#ifdef JAVA
 import JavaGen         ( javaGen )
 import qualified PrintJava
+#endif
 
 import DriverState     ( v_HCHeader )
 import TyCon           ( TyCon )
@@ -32,6 +34,7 @@ import Module         ( Module )
 import CmdLineOpts
 import ErrUtils                ( dumpIfSet_dyn, showPass )
 import Outputable
+import Pretty          ( Mode(..), printDoc )
 import CmdLineOpts     ( DynFlags, HscLang(..), dopt_OutName )
 
 import IOExts
@@ -73,8 +76,13 @@ codeOutput dflags mod_name tycons core_binds stg_binds
                               >> return stub_names
              HscC           -> outputC dflags filenm flat_abstractC stub_names
                               >> return stub_names
-             HscJava        -> outputJava dflags filenm mod_name tycons core_binds
+             HscJava        -> 
+#ifdef JAVA
+                              outputJava dflags filenm mod_name tycons core_binds
                               >> return stub_names
+#else
+                               panic "Java support not compiled into this ghc"
+#endif
             HscILX         -> 
 #ifdef ILX
                               outputIlx dflags filenm mod_name tycons stg_binds
@@ -127,8 +135,9 @@ outputAsm dflags filenm flat_absC
        let (stix_final, ncg_output_d) = _scc_ "NativeCodeGen" 
                                        nativeCodeGen flat_absC ncg_uniqs
        dumpIfSet_dyn dflags Opt_D_dump_stix "Final stix code" stix_final
-       dumpIfSet_dyn dflags Opt_D_dump_asm "Asm code" ncg_output_d
-       _scc_ "OutputAsm" doOutput filenm ( \f -> printForAsm f ncg_output_d)
+       dumpIfSet_dyn dflags Opt_D_dump_asm "Asm code" (docToSDoc ncg_output_d)
+       _scc_ "OutputAsm" doOutput filenm $
+          \f -> printDoc LeftMode f ncg_output_d
   where
 
 #else /* OMIT_NATIVE_CODEGEN */
@@ -147,6 +156,7 @@ outputAsm dflags filenm flat_absC
 %************************************************************************
 
 \begin{code}
+#ifdef JAVA
 outputJava dflags filenm mod tycons core_binds
   = doOutput filenm (\ f -> printForUser f alwaysQualify pp_java)
        -- User style printing for now to keep indentation
@@ -155,6 +165,7 @@ outputJava dflags filenm mod tycons core_binds
        -- Make sure we have up to date dead-var information
     java_code = javaGen mod [{- Should be imports-}] tycons occ_anal_binds
     pp_java   = PrintJava.compilationUnit java_code
+#endif
 \end{code}
 
 
@@ -188,7 +199,7 @@ outputForeignStubs dflags c_code h_code
 
        stub_h_file_exists
            <- outputForeignStubs_help (hscStubHOutName dflags) stub_h_output_w
-               "#include \"HsFFI.h\"\n"
+               ("#include \"HsFFI.h\"\n" ++ cplusplus_hdr) cplusplus_ftr
 
        dumpIfSet_dyn dflags Opt_D_dump_foreign
                       "Foreign export stubs" stub_c_output_d
@@ -199,7 +210,9 @@ outputForeignStubs dflags c_code h_code
            <- outputForeignStubs_help (hscStubCOutName dflags) stub_c_output_w
                ("#define IN_STG_CODE 0\n" ++ 
                 hc_header ++
-                "#include \"RtsAPI.h\"\n")
+                "#include \"RtsAPI.h\"\n" ++
+                cplusplus_hdr)
+                cplusplus_ftr
           -- we're adding the default hc_header to the stub file, but this
           -- isn't really HC code, so we need to define IN_STG_CODE==0 to
           -- avoid the register variables etc. being enabled.
@@ -214,13 +227,15 @@ outputForeignStubs dflags c_code h_code
     stub_h_output_d = pprCode CStyle h_code
     stub_h_output_w = showSDoc stub_h_output_d
 
+cplusplus_hdr = "#ifdef __cplusplus\nextern \"C\" {\n#endif\n"
+cplusplus_ftr = "#ifdef __cplusplus\n}\n#endif\n"
 
 -- Don't use doOutput for dumping the f. export stubs
 -- since it is more than likely that the stubs file will
 -- turn out to be empty, in which case no file should be created.
-outputForeignStubs_help fname "" injects     = return False
-outputForeignStubs_help fname doc_str injects
-   = do writeFile fname (injects ++ doc_str)
+outputForeignStubs_help fname ""      header footer = return False
+outputForeignStubs_help fname doc_str header footer
+   = do writeFile fname (header ++ doc_str ++ '\n':footer ++ "\n")
         return True
 \end{code}