Changeset 3975

Timestamp:

05/27/05 16:36:18 (4 years ago)

Author:

autrijus

svk:copy_cache_prev:

5515

Message:

* refactor newSVval to handler Val->PerlSV casting.
* beginning of unifying two GCs together.

Location:

src

Files:

• Pugs/Embed/Perl5.hs (modified) (4 diffs)
• Pugs/Run/Perl5.hs (modified) (2 diffs)
• perl5/perl5.c (modified) (1 diff)
• perl5/perl5.h (modified) (1 diff)

src/Pugs/Embed/Perl5.hs

@@ -60 +60 @@
 nullSV = error "perl5 not embedded"
 
+mkSV :: IO PerlSV -> IO PerlSV
+mkSV = id
+
 #else
 
@@ -66 +69 @@
 
 module Pugs.Embed.Perl5 where
+import Pugs.Internals
 import Foreign
 import Foreign.C.Types
@@ -86 +90 @@
 foreign import ccall "perl.h boot_DynaLoader"
     boot_DynaLoader :: Ptr () -> IO ()
+foreign import ccall "perl5.h perl5_finalize"
+    perl5_finalize :: PerlSV -> IO ()
 foreign import ccall "perl5.h perl5_SvPV"
     perl5_SvPV :: PerlSV -> IO CString
@@ -173 +179 @@
 canPerl5 sv meth = withCString meth $ \cstr -> perl5_can sv cstr
 
+mkSV :: IO PerlSV -> IO PerlSV
+mkSV = id
+{- 
+action = do
+    sv <- action 
+    addFinalizer sv (perl5_finalize sv)
+    return sv
+-}
+
 evalPerl5 :: String -> PugsVal -> CInt -> IO PerlSV
-evalPerl5 str env cxt = withCString str $ \cstr -> perl5_eval cstr env cxt
+evalPerl5 str env cxt = mkSV $ withCString str $ \cstr -> perl5_eval cstr env cxt
 
 freePerl5 :: PerlInterpreter -> IO ()

src/Pugs/Run/Perl5.hs

@@ -78 +78 @@
     val <- runEvalIO env $
         evalExp (Cxt (cxtEnum cxt) $ App subExp (fmap Val inv) (map Val args))
-    case val of
-        PerlSV sv   -> return sv
-        VStr str    -> vstrToSV str
-        VBool bool  -> vintToSV (fromEnum bool)
-        VInt int    -> vintToSV int
-        VRat rat    -> vnumToSV rat
-        VNum num    -> vnumToSV num
-        _           -> mkValRef val
+    newSVval val
 
 deVal :: PugsVal -> IO Val
@@ -102 +95 @@
     -- print "1"
     val <- deVal ptr
-    case val of
-        PerlSV sv   -> return sv
-        _           -> mkValRef val
+    newSVval val
+
+newSVval :: Val -> IO PerlSV
+newSVval val = case val of
+    PerlSV sv   -> return sv
+    VStr str    -> vstrToSV str
+    VBool bool  -> vintToSV (fromEnum bool)
+    VInt int    -> vintToSV int
+    VRat rat    -> vnumToSV rat
+    VNum num    -> vnumToSV num
+    _           -> mkValRef val
 
 valToIv :: PugsVal -> IO CInt

src/perl5/perl5.c

@@ -320 +320 @@
 }
 
+void perl5_finalize ( SV* sv )
+{
+    SvREFCNT_dec(sv);
+}

src/perl5/perl5.h

@@ -15 +15 @@
 SV * perl5_eval(char *code, void *env, int cxt);
 SV * perl5_get_sv ( const char *name );
+void perl5_finalize ( SV* sv );
+