Changeset 12366 for src/Pugs/Eval

Timestamp:

08/17/06 13:15:43 (2 years ago)

Author:

audreyt

Message:

* Eval.Var: improve the errmsg a bit by pretending it's

always a multi match failure (which it is.)

Files:

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

src/Pugs/Eval/Var.hs

@@ -159 +159 @@
         -> Eval (Either FindSubFailure VCode)
 findSub var invs args
-    | Nothing <- invs = findBuiltinSub NoSuchSub var
+    | Nothing <- invs = findBuiltinSub NoMatchingMulti var
     | not (isQualifiedVar var) = case unwrap inv of
         Val inv@VV{}     -> withExternalCall callMethodVV inv 
@@ -170 +170 @@
         findSuperSub pkg var'
     | otherwise = do
-        findBuiltinSub NoSuchSub var
+        findBuiltinSub NoMatchingMulti var
     where
     inv = fromJust invs
@@ -567 +567 @@
 findSyms :: Var -> Eval [(Var, Val)]
 findSyms var = do
-        runMaybeT (findLexical `mplus` findPackage `mplus` findGlobal) >>= \ret ->
-            case ret of
-                Nothing -> return []
-                Just xs -> return xs
+    runMaybeT (findLexical `mplus` findPackage `mplus` findGlobal)
+        >>= maybe (return []) return
     where
-        findLexical :: MaybeT Eval [(Var, Val)]
-        findLexical = do
-            lex <- lift $ asks envLexical
-            padSym lex var
-            
-        findPackage :: MaybeT Eval [(Var, Val)]
-        findPackage = do
-            glob <- lift $ askGlobal
-            pkg  <- lift $ asks envPackage
-            padSym glob var `mplus` padSym glob (toPackage pkg var)
-
-        findGlobal :: MaybeT Eval [(Var, Val)]
-        findGlobal = do
-            glob <- lift $ askGlobal
-            padSym glob (toGlobalVar var)
-
-        padSym :: Pad -> Var -> MaybeT Eval [(Var, Val)]
-        padSym pad var = do
-            case lookupPad var pad of
-                Just tvar -> lift $ do
-                    refs <- liftSTM $ mapM readTVar tvar
-                    forM refs $ \ref -> do
-                        val <- readRef ref
-                        return (var, val)
-                Nothing -> mzero
+    findLexical :: MaybeT Eval [(Var, Val)]
+    findLexical = do
+        lex <- lift $ asks envLexical
+        padSym lex var{ v_package = emptyPkg }
+        
+    findPackage :: MaybeT Eval [(Var, Val)]
+    findPackage = do
+        glob <- lift $ askGlobal
+        pkg  <- lift $ asks envPackage
+        padSym glob var `mplus` padSym glob (toPackage pkg var)
+
+    findGlobal :: MaybeT Eval [(Var, Val)]
+    findGlobal = do
+        glob <- lift $ askGlobal
+        padSym glob (toGlobalVar var)
+
+    padSym :: Pad -> Var -> MaybeT Eval [(Var, Val)]
+    padSym pad var = do
+        case lookupPad var pad of
+            Just tvar -> lift $ do
+                refs <- liftSTM $ mapM readTVar tvar
+                forM refs $ \ref -> do
+                    val <- readRef ref
+                    return (var, val)
+            Nothing -> mzero
         
 arityMatch :: VCode -> Int -> Int -> Maybe VCode