Changeset 12425 for src/Pugs/Eval

Timestamp:

08/18/06 21:01:52 (2 years ago)

Author:

audreyt

Message:

* Pugs.Eval.Var: Refactor findSyms a bit to improve

readability and possibly win on branch predictaion.

Files:

• src/Pugs/Eval/Var.hs (modified) (1 diff)

src/Pugs/Eval/Var.hs

@@ -588 +588 @@
 findSyms :: Var -> Eval [(Var, Val)]
 findSyms var
-    | Just var' <- dropVarPkg (__"OUTER") var = do
-        maybeOuter <- asks envOuter
-        case maybeOuter of
-            Just env -> local (const env) $ findSyms var'
-            Nothing  -> return []
-findSyms var = do
-    runMaybeT findAll >>= maybe (return []) return
+    | isGlobalVar var    = findWith findGlobal
+    | isQualifiedVar var = case dropVarPkg (__"OUTER") var of
+        Just var' -> do
+            maybeOuter <- asks envOuter
+            case maybeOuter of
+                Just env -> local (const env) $ findSyms var'
+                Nothing  -> return []
+        _              -> findWith findQualified
+    | otherwise         = findWith (findLexical `mplus` findPackage)
     where
-    findAll
-        | isGlobalVar var       = findGlobal
-        | isQualifiedVar var    = findQualified
-        | otherwise             = findLexical `mplus` findPackage
+    findWith f = runMaybeT f >>= maybe (return []) return
 
     -- $x should look up $x in the current pad first.