X-Git-Url: https://git.xandkar.net/?a=blobdiff_plain;f=compiler%2Fsrc%2Flib%2Ftiger%2Ftiger_error.mli;h=9090ad481cea6192139ad93a45b97bad5ad88f4c;hb=54e838f482844369048d4f88e87a092a87162b72;hp=6383a62f77ed32df9aeea9bc66f5d3aef17200b7;hpb=5da420a8c9d88111ef4ccabd6b0a0c65cddb73af;p=tiger.ml.git

diff --git a/compiler/src/lib/tiger/tiger_error.mli b/compiler/src/lib/tiger/tiger_error.mli
index 6383a62..9090ad4 100644
--- a/compiler/src/lib/tiger/tiger_error.mli
+++ b/compiler/src/lib/tiger/tiger_error.mli
@@ -1,48 +1,67 @@
+module Abs = Tiger_absyn
+module Pos = Tiger_position
+module Sym = Tiger_symbol
+module Typ = Tiger_env_type
+
 type t =
-  | Invalid_syntax    of Tiger_position.t
-  | Unknown_id        of {id    : Tiger_symbol.t; pos : Tiger_position.t}
-  | Unknown_type      of {ty_id : Tiger_symbol.t; pos : Tiger_position.t}
-  | Id_not_a_function of {id    : Tiger_symbol.t; pos : Tiger_position.t}
+  | Invalid_syntax    of Pos.t
+  | Unknown_id        of {id    : Sym.t; pos : Pos.t}
+  | Unknown_type      of {ty_id : Sym.t; pos : Pos.t}
+  | Id_is_a_function  of {id    : Sym.t; pos : Pos.t}
+  | Id_not_a_function of {id    : Sym.t; pos : Pos.t}
+  | No_such_field_in_record of {field : Sym.t; record : Typ.t; pos : Pos.t}
+  | Exp_not_a_record  of {ty    : Typ.t; pos : Pos.t}
+  | Exp_not_an_array  of {ty    : Typ.t; pos : Pos.t}
+  | Wrong_type of
+      { expected : Typ.t
+      ; given    : Typ.t
+      ; pos      : Pos.t
+      }
   | Wrong_type_of_expression_in_var_dec of
-      { var_id   : Tiger_symbol.t
-      ; expected : Tiger_env_type.t
-      ; given    : Tiger_env_type.t
-      ; pos      : Tiger_position.t
+      { var_id   : Sym.t
+      ; expected : Typ.t
+      ; given    : Typ.t
+      ; pos      : Pos.t
       }
   | Wrong_type_used_as_record of
-      { ty_id    : Tiger_symbol.t
-      ; ty       : Tiger_env_type.t
-      ; pos      : Tiger_position.t
+      { ty_id    : Sym.t
+      ; ty       : Typ.t
+      ; pos      : Pos.t
+      }
+  | Wrong_type_used_as_array of
+      { ty_id    : Sym.t
+      ; ty       : Typ.t
+      ; pos      : Pos.t
       }
   | Wrong_type_of_field_value of
-      { field_id : Tiger_symbol.t
-      ; expected : Tiger_env_type.t
-      ; given    : Tiger_env_type.t
-      ; pos      : Tiger_position.t
+      { field_id : Sym.t
+      ; expected : Typ.t
+      ; given    : Typ.t
+      ; pos      : Pos.t
       }
   | Wrong_type_of_arg of
-      { func     : Tiger_symbol.t
-      ; expected : Tiger_env_type.t
-      ; given    : Tiger_env_type.t
-      ; pos      : Tiger_position.t
+      { func     : Sym.t
+      ; expected : Typ.t
+      ; given    : Typ.t
+      ; pos      : Pos.t
       }
   | Wrong_number_of_args of
-      { func     : Tiger_symbol.t
+      { func     : Sym.t
       ; expected : int
       ; given    : int
-      ; pos      : Tiger_position.t
+      ; pos      : Pos.t
       }
   | Invalid_operand_type of
-      { oper  : Tiger_absyn.oper
+      { oper  : Abs.oper
       ; valid : string list
-      ; given : Tiger_env_type.t
-      ; pos   : Tiger_position.t
+      ; given : Typ.t
+      ; pos   : Pos.t
       }
   | Different_operand_types of
-      { oper  : Tiger_absyn.oper
-      ; left  : Tiger_env_type.t
-      ; right : Tiger_env_type.t
-      ; pos   : Tiger_position.t
+      { oper  : Abs.oper
+      ; left  : Typ.t
+      ; right : Typ.t
+      ; pos   : Pos.t
       }
 
 exception T of t
@@ -51,4 +70,11 @@ val raise : t -> 'a
 
 val to_string : t -> string
 
-val is_unknown_id : t -> bool
+val is_unknown_id   : t -> bool
+val is_unknown_type : t -> bool
+val is_wrong_type   : t -> bool
+val is_wrong_number_of_args : t -> bool
+val is_invalid_syntax : t -> bool
+val is_not_a_record : t -> bool
+val is_not_an_array : t -> bool
+val is_no_such_field_in_record : t -> bool