Changeset 17043

Timestamp:

07/14/07 04:05:02 (15 months ago)

Author:

audreyt

Message:

* Pugs.Eval: Eliminate all dead code paths discovered by the

excellent ghc -fhpc (Haskell Program Coverage) too.

Files:

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

src/Pugs/Eval.hs

@@ -297 +297 @@
                             if lv then evalExp (Sym SOur var mempty Noop (Var var)) else retEmpty
 
-_scalarContext :: Cxt
-_scalarContext = CxtItem $ mkType "Scalar"
-
 reduceStmts :: Exp -> Exp -> Eval Val
 reduceStmts Noop rest           = reduce rest
@@ -422 +419 @@
         fmap VCode (recloseCode code)
 
-reduceSyn "()" [exp] = reduce exp
-
 reduceSyn "named" [keyExp, valExp] = do
     key <- enterEvalContext cxtItemAny keyExp
@@ -463 +458 @@
 
     -- Close over outer lexical scope.
-    -- error "XXX - clone should operate on sub now"
-    -- newBody <- transformExp cloneBodyStates $ subBody sub
     -- add &?BLOCK &?ROUTINE etc here
     started     <- if isCompileTime env then return Nothing else fmap Just (stm $ newTVar False)
     inner       <- clonePad (subInnerPad sub) 
---  lpads       <- cloneLexPads (subOuterPads sub)
---  warn "mooooose" $ envLexPads env
     return $ VCode sub
         { subCont       = cont
@@ -477 +468 @@
         }
     where
-    cloneLexPads chain = forM chain $ \lpad -> case lpad of
-        PRuntime p      -> do
-            p'  <- snapPad p
-            return (PRuntime p')
-        _               -> return lpad
---    cloneBodyStates (Pad scope pad exp) | scope <= SMy = do
---        pad' <- clonePad pad
---        return $ Pad scope pad' exp
-    cloneBodyStates x = return x -- XXX!
-    snapPad pad = stm $ do
-        fmap listToPad $ forM (padToList pad) $ \(var, entry) -> do
-            case entry of
-                PELexical{} -> do
-                    store <- newTVar =<< readTVar (pe_store entry)
-                    return (var, entry{ pe_store = store })
-                _   -> return (var, entry)
     clonePad pad = stm $ do
         fmap listToPad $ forM (padToList pad) $ \(var, entry) -> do
@@ -654 +629 @@
                 then evalVal refVal
                 else readRef ref
-
-reduceSyn "::=" exps = reduce (Syn ":=" exps)
 
 reduceSyn ":=" exps
@@ -880 +853 @@
     to   <- fromVal =<< reduce toExp
     return $ VSubst (MkTrans from to)
-
--- XXX - Runtime mixin
-reduceSyn "is" (lhs:_) = reduce lhs
-reduceSyn "does" (lhs:_) = reduce lhs
 
 reduceSyn "package" [kind, exp] = reduceSyn "namespace" [kind, exp, emptyExp]
@@ -1461 +1430 @@
                 _           -> evalVal val
     where
-    tryRecBind :: Var -> Pad -> Pad -> Eval ()
-    tryRecBind var pad pad2 = case lookupPad var pad of
-        Just{} -> case lookupPad var pad2 of
-            Just c  -> do
-                ref <- fromVal (VCode origSub)
-                stm $ writeTVar (pe_store c) ref
-            _  -> return ()
-        _  -> return ()
     applyMacroResult :: Val -> Eval Val
     applyMacroResult (VObject o)