Changeset 20058 for src/Pugs/Eval.hs

Timestamp:

03/04/08 22:06:31 (9 months ago)

Author:

gbacon

Message:

Build the library, but the executable still doesn't link. Why aren't we building an Executable with cabal?

Files:

• src/Pugs/Eval.hs (modified) (3 diffs)

src/Pugs/Eval.hs

@@ -185 +185 @@
 evalRef ref = do
     if refType ref == (mkType "Thunk") then forceRef ref else do
-    val <- catchT $ \esc -> do
+    val <- catchT $ \(esc :: Val -> Eval ()) -> do
         MkEnv{ envContext = cxt, envLValue = lv } <- ask
         let typ = typeOfCxt cxt
@@ -281 +281 @@
             Nothing
                 | SType <- sig      -> return . VType . cast $ if isQualifiedVar var
-                    then cast $ Buf.join (__"::") [cast pkg, cast name]
+                    then cast $ Buf.intercalate (__"::") [cast pkg, cast name]
                     else name
                 | isGlobalVar var || pkg `notElem` [emptyPkg, callerPkg, outerPkg, contextPkg] -> do
@@ -1484 +1484 @@
                     --- not scalarRef! -- use the new "transparent IType" thing!
                     case showType (typeOfSigilVar var) of
-                        "Hash"  -> ($ v) . fix $ \redo x -> case x of
+                        "Hash"  -> ($ v) . fix $ \(redo :: Val -> Eval Val) x -> case x of
                             VRef (MkRef (IHash h)) -> return (VRef $ hashRef h) 
                             VRef ref@(MkRef IScalar{}) -> redo =<< readRef ref
                             _ -> fmap (VRef . hashRef) (fromVal v :: Eval VHash)
-                        "Array" -> ($ v) . fix $ \redo x -> case x of
+                        "Array" -> ($ v) . fix $ \(redo :: Val -> Eval Val) x -> case x of
                             VRef (MkRef (IArray a)) -> return (VRef $ arrayRef a) 
                             VRef ref@(MkRef IScalar{}) -> redo =<< readRef ref