tuned comments, stripped ID, deleted superfluous code
authorhaftmann
Wed, 18 Feb 2009 08:23:11 +0100
changeset 29962 bd4dc7fa742d
parent 29961 c7849326100e
child 29963 590e0db3a267
tuned comments, stripped ID, deleted superfluous code
src/Tools/code/code_funcgr.ML
src/Tools/code/code_thingol.ML
--- a/src/Tools/code/code_funcgr.ML	Wed Feb 18 08:23:11 2009 +0100
+++ b/src/Tools/code/code_funcgr.ML	Wed Feb 18 08:23:11 2009 +0100
@@ -1,8 +1,7 @@
 (*  Title:      Tools/code/code_funcgr.ML
-    ID:         $Id$
     Author:     Florian Haftmann, TU Muenchen
 
-Retrieving, normalizing and structuring defining equations in graph
+Retrieving, normalizing and structuring code equations in graph
 with explicit dependencies.
 *)
 
--- a/src/Tools/code/code_thingol.ML	Wed Feb 18 08:23:11 2009 +0100
+++ b/src/Tools/code/code_thingol.ML	Wed Feb 18 08:23:11 2009 +0100
@@ -109,7 +109,7 @@
         let val (xs', x') = unfoldr dest x2 in (x1::xs', x') end;
 
 
-(** language core - types, patterns, expressions **)
+(** language core - types, terms **)
 
 type vname = string;
 
@@ -131,31 +131,6 @@
   | ICase of ((iterm * itype) * (iterm * iterm) list) * iterm;
     (*see also signature*)
 
-(*
-  variable naming conventions
-
-  bare names:
-    variable names          v
-    class names             class
-    type constructor names  tyco
-    datatype names          dtco
-    const names (general)   c (const)
-    constructor names       co
-    class parameter names   classparam
-    arbitrary name          s
-
-    v, c, co, classparam also annotated with types etc.
-
-  constructs:
-    sort                    sort
-    type parameters         vs
-    type                    ty
-    type schemes            tysm
-    term                    t
-    (term as pattern)       p
-    instance (class, tyco)  inst
- *)
-
 val op `$$ = Library.foldl (op `$);
 val op `|--> = Library.foldr (op `|->);
 
@@ -543,16 +518,8 @@
           Global ((class, tyco), yss)
       | class_relation (Local (classrels, v), subclass) superclass =
           Local ((subclass, superclass) :: classrels, v);
-    fun norm_typargs ys =
-      let
-        val raw_sort = map snd ys;
-        val sort = Sorts.minimize_sort algebra raw_sort;
-      in
-        map_filter (fn (y, class) =>
-          if member (op =) sort class then SOME y else NONE) ys
-      end;
     fun type_constructor tyco yss class =
-      Global ((class, tyco), map norm_typargs yss);
+      Global ((class, tyco), (map o map) fst yss);
     fun type_variable (TFree (v, sort)) =
       let
         val sort' = proj_sort sort;