Changeset 14060

Timestamp:

10/08/06 12:38:04 (2 years ago)

Author:

audreyt

Message:

* Speed up evalVal for a marginal (<2%) win.

Files:

• src/Pugs/Monads.hs (modified) (1 diff)

src/Pugs/Monads.hs

@@ -300 +300 @@
 
 evalVal :: Val -> Eval Val
-evalVal val = do
+evalVal val@(VRef ref) = do
     lv  <- asks envLValue
-    cls <- asks envClasses
-    typ <- evalValType val
-    if lv then return val else do
-    case val of
-        VRef ref | refType ref == mkType "Scalar::Const" -> do
-            evalVal =<< readRef ref
-        VRef ref | isaType cls "Junction" typ -> do
-            evalVal =<< readRef ref
-        _ -> do
-            return val
+    if lv
+        then return val
+        else if refType ref == mkType "Scalar::Const"
+            then evalVal =<< readRef ref
+            else do
+                cls <- asks envClasses
+                typ <- evalValType val
+                if isaType cls "Junction" typ
+                    then evalVal =<< readRef ref
+                    else return val
+evalVal val = return val
 
 tempVar :: Var -> Val -> Eval a -> Eval a