Changeset 14203 for src/Pugs/Eval

Timestamp:

10/11/06 05:35:58 (2 years ago)

Author:

audreyt

Message:

* Pugs.Eval.Var: The type inferencer in inferExpType wasn't

able to look through (...)!

1+5 # inferred as Int
(1+5) # inferred as Any

Files:

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

src/Pugs/Eval/Var.hs

@@ -310 +310 @@
     doFindSub slurpLens subSyms = do
         subs' <- subs slurpLens subSyms
-        -- let foo (x, sub) = show x ++ show (map paramContext $ subParams sub)
-        -- trace (unlines $ map foo $ sort subs') return ()
+        -- traceM (unlines $ map (\(x, y) -> show (x, subParams y)) subs')
         return $ case sort subs' of
             ((_, sub):_)    -> Just sub
@@ -495 +494 @@
 inferExpType (App (Var name) invs args) = do
     sub <- findSub name invs args
-    case sub of
-        Right sub    -> return $ subReturns sub
-        Left _       -> return $ mkType "Any"
+    return (either (const anyType) subReturns sub)
 inferExpType (Ann (Cxt cxt) _) | typeOfCxt cxt /= (mkType "Any") = return $ typeOfCxt cxt
-inferExpType (Ann (Cxt _) exp) = inferExpType exp
-inferExpType (Ann (Pos _) exp) = inferExpType exp
+inferExpType (Ann _ exp) = inferExpType exp
 inferExpType (Pad _ _ exp) = inferExpType exp
 inferExpType (Sym _ _ exp) = inferExpType exp