diff options
| author | Xavier Leroy <xavier.leroy@inria.fr> | 1995-07-25 11:39:21 +0000 |
|---|---|---|
| committer | Xavier Leroy <xavier.leroy@inria.fr> | 1995-07-25 11:39:21 +0000 |
| commit | 384c0ddfa7bd2da973bd6466a5596dd749d18cfd (patch) | |
| tree | e3f3968a338eb03fdd6a1efc3e61cc416538de91 | |
| parent | 7fcb1d47c53410bbeb011989c6f2b5f809e7da06 (diff) | |
Changement representation des primitives
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@145 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
| -rw-r--r-- | toplevel/topdirs.ml | 4 | ||||
| -rw-r--r-- | toplevel/toploop.ml | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/toplevel/topdirs.ml b/toplevel/topdirs.ml index ee1d28491..996a5f864 100644 --- a/toplevel/topdirs.ml +++ b/toplevel/topdirs.ml @@ -216,10 +216,10 @@ let dir_trace lid = (* Overwrite the old closure *) overwrite_closure clos new_clos; match desc.val_prim with - Not_prim -> + None -> Printtyp.longident lid; print_string " is now traced."; print_newline() - | Primitive(_,_) -> + | Some p -> open_hovbox 0; print_string "Warning: "; Printtyp.longident lid; print_string " is an external function."; print_space(); diff --git a/toplevel/toploop.ml b/toplevel/toploop.ml index 030473d10..f8099278c 100644 --- a/toplevel/toploop.ml +++ b/toplevel/toploop.ml @@ -47,17 +47,17 @@ let print_item env = function Tsig_value(id, decl) -> open_hovbox 2; begin match decl.val_prim with - Not_prim -> + None -> print_string "val "; Printtyp.ident id; print_string " :"; print_space(); Printtyp.type_scheme decl.val_type; print_string " ="; print_space(); print_value env (Symtable.get_global_value id) decl.val_type - | Primitive(p, ar) -> + | Some p -> print_string "external "; Printtyp.ident id; print_string " :"; print_space(); Printtyp.type_scheme decl.val_type; print_space(); - print_string "= \""; print_string p; print_string "\"" + print_string "= \""; print_string p.prim_name; print_string "\"" end; close_box() | Tsig_type(id, decl) -> |