changeset 1383:0af6bd2dd149

Expand valueish again
author Adam Chlipala <adam@chlipala.net>
date Thu, 06 Jan 2011 12:31:13 -0500
parents 5cb95fb7d4d5
children 86d23010ea74
files src/especialize.sml
diffstat 1 files changed, 2 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/src/especialize.sml	Thu Jan 06 09:25:15 2011 -0500
+++ b/src/especialize.sml	Thu Jan 06 12:31:13 2011 -0500
@@ -337,20 +337,9 @@
                                   | EKAbs _ => true
                                   | ECApp (e, _) => valueish e
                                   | EKApp (e, _) => valueish e
-                                  | EApp _ =>
-                                    let
-                                        fun valueishf (e, _) =
-                                            case e of
-                                                ENamed _ => true
-                                              | EFfi _ => true
-                                              | ECApp (e, _) => valueishf e
-                                              | EApp (e, (ERel _, _)) => valueishf e
-                                              | EApp (e, (ENamed _, _)) => valueishf e
-                                              | _ => false
-                                    in
-                                        valueishf all
-                                    end
+                                  | EApp (e1, e2) => valueish e1 andalso valueish e2
                                   | ERecord xes => List.all (valueish o #2) xes
+                                  | EField (e, _, _) => valueish e
                                   | _ => false
 
                             val vts = map (fn n => #2 (List.nth (env, n))) (IS.listItems fvs)