Changeset 3846 for src/Pugs/Embed/Perl5.hs

Timestamp:

05/25/05 03:10:08 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5385

Message:

* dynaloader build infrastructure landed

Files:

• src/Pugs/Embed/Perl5.hs (modified) (2 diffs)

src/Pugs/Embed/Perl5.hs

@@ -20 +20 @@
 #else
 
-{-# INCLUDE <EXTERN.h> #-}
-{-# INCLUDE <perl.h> #-}
+{-# INCLUDE <perl5.h> #-}
 
 module Pugs.Embed.Perl5 where
@@ -50 +49 @@
 foreign import ccall "wrapper"  
     mkBootCallback :: (Ptr () -> IO ()) -> IO (FunPtr (Ptr () -> IO ()))
+foreign import ccall "perl5.h perl5_init"
+    perl5_init :: CInt -> Ptr CString -> IO PerlInterpreter
 
 initPerl5 :: String -> IO PerlInterpreter
 initPerl5 str = do
-    my_perl <- perl_alloc
-    perl_construct my_perl
-    -- callback <- mkBootCallback boot_DynaLoader
     withCString "-e" $ \prog -> withCString str $ \cstr -> do
         withArray [prog, prog, cstr] $ \argv -> do
-            perl_parse my_perl nullFunPtr 3 argv nullPtr
-            perl_run my_perl
-    return my_perl
+            perl5_init 3 argv
 
 evalPerl5 :: String -> IO ()