← Back to branch summary

~ubuntu-branches/debian/sid/ocaml/sid

« back to all changes in this revision

Viewing changes to toplevel/topdirs.ml

  • Committer: Bazaar Package Importer
  • Author(s): Stéphane Glondu
  • Date: 2011-04-21 21:35:08 UTC
  • mfrom: (1.1.11 upstream) (12.1.14 sid)
  • Revision ID: james.westby@ubuntu.com-20110421213508-kg34453aqmb0moha
* Fixes related to -output-obj with g++ (in debian/patches):
  - add Declare-primitive-name-table-as-const-char
  - add Avoid-multiple-declarations-in-generated-.c-files-in
  - fix Embed-bytecode-in-C-object-when-using-custom: the closing
    brace for extern "C" { ... } was missing in some cases

Show diffs side-by-side

added added

removed removed

Lines of Context:
toplevel/topdirs.ml
10
10
(*                                                                     *)
11
11
(***********************************************************************)
12
12
 
13
 
(* $Id: topdirs.ml 9134 2008-11-19 02:35:40Z garrigue $ *)
 
13
(* $Id: topdirs.ml 9547 2010-01-22 12:48:24Z doligez $ *)
14
14
 
15
15
(* Toplevel directives *)
16
16
 
164
164
      with Ctype.Unify _ ->
165
165
        (match_printer_type ppf desc "printer_type_old", true) in
166
166
    (ty_arg, path, is_old_style)
167
 
  with 
 
167
  with
168
168
  | Not_found ->
169
169
      fprintf ppf "Unbound value %a.@." Printtyp.longident lid;
170
170
      raise Exit
172
172
      fprintf ppf "%a has a wrong type for a printing function.@."
173
173
      Printtyp.longident lid;
174
174
      raise Exit
175
 
    
 
175
 
176
176
let dir_install_printer ppf lid =
177
177
  try
178
178
    let (ty_arg, path, is_old_style) = find_printer_type ppf lid in
230
230
        | None ->
231
231
            (* Instrument the old closure *)
232
232
            traced_functions :=
233
 
              { path = path; 
 
233
              { path = path;
234
234
                closure = clos;
235
235
                actual_code = get_code_pointer clos;
236
236
                instrumented_fun =