Changeset 15297 for src/Pugs/Run

Timestamp:

02/18/07 15:59:02 (21 months ago)

Author:

audreyt

Message:

* Revert the previous patch; everything back to normal.

Files:

• src/Pugs/Run/Perl5.hs (modified) (4 diffs)

src/Pugs/Run/Perl5.hs

@@ -14 +14 @@
 import Foreign.C.String
 import Foreign.Marshal.Array
-import qualified Data.ByteString.Char8 as Str
 
 foreign export ccall "pugs_Eval"
@@ -71 +70 @@
     args    <- mapM deVal =<< peekArray0 nullVal argsPtr
     let subExp = case sub of
-            VStr str -> case cast str of
-                name@('&':_)    -> _Var name
-                name            -> _Var ('&':name)
+            VStr name@('&':_)   -> _Var name
+            VStr name           -> _Var ('&':name)
             _                   -> Val sub
     -- warn "Applying:" (subExp, inv, args, envLexical env)
@@ -120 +118 @@
     env     <- askPerl5Env
     VStr x  <- runEvalIO env $ fmap VInt (fromVal val)
-    newCString (cast x)
+    newCString x
 
 mkSvRef :: PerlSV -> IO PugsVal
@@ -134 +132 @@
 pvnToVal cstr len = do
     str <- peekCStringLen (cstr, fromEnum len)
-    ptr <- mkVal $ _VStr (decodeUTF8 str)
+    ptr <- mkVal $ VStr (decodeUTF8 str)
     return ptr