Changeset 16625

Timestamp:

06/03/07 21:24:28 (18 months ago)

Author:

gaal

Message:

* separate internals functions for loading yaml strings and files

Location:

src/Pugs

Files:

• Prim.hs (modified) (2 diffs)
• Prim/Eval.hs (modified) (3 diffs)

src/Pugs/Prim.hs

@@ -303 +303 @@
         Perl5ErrorString str    -> fail str
         Perl5ErrorObject err    -> throwError (PerlSV err)
-op1 "Pugs::Internals::eval_p6y" = op1EvalP6Y
+op1 "Pugs::Internals::evalfile_p6y" = op1EvalFileP6Y
+op1 "Pugs::Internals::eval_p6y"     = op1EvalP6Y
 op1 "Pugs::Internals::eval_haskell" = op1EvalHaskell
 op1 "Pugs::Internals::eval_yaml" = evalYaml
@@ -1944 +1945 @@
 \\n   Any       pre     Pugs::Internals::eval_haskell unsafe (Str)\
 \\n   Any       pre     Pugs::Internals::eval_p6y unsafe (Str)\
+\\n   Any       pre     Pugs::Internals::evalfile_p6y unsafe (Str)\
 \\n   Any       pre     Pugs::Internals::eval_yaml    safe   (Str)\
 \\n   Any       pre     Pugs::Internals::emit_yaml    unsafe   (rw!Any)\

src/Pugs/Prim/Eval.hs

@@ -2 +2 @@
 module Pugs.Prim.Eval (
     -- used by Pugs.Prim
-    op1EvalHaskell, op1EvalP6Y,
+    op1EvalHaskell, op1EvalP6Y, op1EvalFileP6Y,
     opEval, opEvalFile,
     opRequire, requireInc,
@@ -20 +20 @@
 import DrIFT.YAML
 import Data.Yaml.Syck
+import qualified Data.ByteString.Char8 as Bytes
+
+type Bytes        = Bytes.ByteString
 
 data EvalError = EvalErrorFatal
@@ -123 +126 @@
                        , evalResult=EvalResultLastValue}
 
-op1EvalP6Y :: Val -> Eval Val
-op1EvalP6Y fileName = do
+
+op1EvalP6Y, op1EvalFileP6Y :: Val -> Eval Val
+
+op1EvalFileP6Y fileName = do
     fileName' <- fromVal fileName
+    file      <- io $ Bytes.readFile fileName'
+    op1EvalP6Y' file
+
+op1EvalP6Y bytecode = do
+    bytecode' <- fromVal bytecode
+    op1EvalP6Y' $ Bytes.pack bytecode' -- XXX: is this the right pack function?
+
+op1EvalP6Y' :: Bytes -> Eval Val
+op1EvalP6Y' bytecode = do
     yml  <- io $ (`catchIO` (return . Left . show)) $
-        fmap Right (parseYamlFile fileName')
+        fmap Right (parseYamlBytes bytecode)
     case yml of
         Right MkNode{ n_elem=ESeq (v:_) }
             | MkNode{ n_elem=EStr vnum } <- v
             , vnum /= (packBuf $ show compUnitVersion) -> do
-                err "incompatible version number for compilation unit"
+                err $ "incompatible version number for compilation unit: found " ++
+                    unpackBuf vnum ++ ", expecting " ++ (show compUnitVersion)
         Right yml' -> do
             globTVar    <- asks envGlobal