← Back to branch summary

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

« back to all changes in this revision

Viewing changes to typing/typedecl.mli

  • 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:
typing/typedecl.mli
10
10
(*                                                                     *)
11
11
(***********************************************************************)
12
12
 
13
 
(* $Id: typedecl.mli 9292 2009-06-08 04:08:14Z garrigue $ *)
 
13
(* $Id: typedecl.mli 10447 2010-05-21 03:36:52Z garrigue $ *)
14
14
 
15
15
(* Typing of type definitions and primitive definitions *)
16
16
 
50
50
       cltype_declaration * ((bool * bool) list * Location.t)) list ->
51
51
    (type_declaration * type_declaration * class_declaration *
52
52
       cltype_declaration) list
53
 
    
 
53
 
54
54
type error =
55
55
    Repeated_parameter
56
56
  | Duplicate_constructor of string
57
57
  | Too_many_constructors
58
58
  | Duplicate_label of string
59
59
  | Recursive_abbrev of string
60
 
  | Definition_mismatch of type_expr
 
60
  | Definition_mismatch of type_expr * Includecore.type_mismatch list
61
61
  | Constraint_failed of type_expr * type_expr
62
62
  | Unconsistent_constraint of (type_expr * type_expr) list
63
63
  | Type_clash of (type_expr * type_expr) list