Changeset 3023:604e19595093

Timestamp:

02/20/12 15:57:55 (3 months ago)

Author:

Etienne Millon <etienne . millon AT eads . net>

Branch:

default

Message:

ptrtype: introduce type schemes

Location:

src/ptrtype

Files:

• infer.ml (modified) (1 diff)
• npk2tpk.ml (modified) (1 diff)
• tyspeak.ml (modified) (2 diffs)
• tyspeak.mli (modified) (1 diff)

src/ptrtype/infer.ml

@@ -312 +312 @@
     ; T.args = extract_types fdec.T.args
     ; T.position = fdec.T.position
-    ; T.fdectype = te
+    ; T.fdectype = T.Forall ([], te)
     }
   in

src/ptrtype/npk2tpk.ml

@@ -104 +104 @@
     ; T.body = c_blk f.N.body
     ; T.position = f.N.position
-    ; T.fdectype = nil_ty
+    ; T.fdectype = T.Forall ([], nil_ty)
     }
   in

src/ptrtype/tyspeak.ml

@@ -43 +43 @@
   body : 'ty blk;
   position: Newspeak.location;
-  fdectype : 'ty;
+  fdectype : 'ty scheme;
 }
+
+and 'ty scheme = Forall of int list * 'ty
 
 and 'ty globals = (string, 'ty) Hashtbl.t
@@ -332 +334 @@
     Buffer.contents buf
 
+let string_of_scheme sty (Forall (bv, t)) =
+  let s_forall =
+    if bv == [] then
+      ""
+    else
+      String.concat " " (List.map string_of_int bv) ^ " . "
+  in
+  s_forall ^ sty t
+
+
 let string_of_fundec sty name declaration =
   Printf.sprintf
     "%s : %s\n%s %s%s%s {\n%s}\n"
        name
-       (sty declaration.fdectype)
+       (string_of_scheme sty declaration.fdectype)
        (string_of_ret sty declaration.rets)
        (string_of_loc_as_prefix declaration.position)

src/ptrtype/tyspeak.mli

@@ -76 +76 @@
   body : 'ty blk;
   position: Newspeak.location;
-  fdectype : 'ty;
+  fdectype : 'ty scheme;
 }
+
+and 'ty scheme = Forall of int list * 'ty
 
 and 'ty globals = (string, 'ty) Hashtbl.t