Commits

Anonymous committed fb91874

4.02 fix

Comments (0)

Files changed (1)

         | Variable_in_scope (loc, _) -> loc
         | Expecting (loc, _) -> loc
         | Other loc -> loc
+        | Not_expecting (loc, _) -> loc
         end
     | `Syntax_error loc -> loc
     | `Exn _ -> Location.none
     
   and structure_item s = 
     match s.pstr_desc with
-    | Pstr_eval e -> expression e
+    | Pstr_eval (e, _) -> expression e
     (* | Pstr_value of rec_flag * (pattern * expression) list *)
     | _ -> invalid s.pstr_loc
 
     match e.pexp_desc with
     | Pexp_constant c -> constant c
     | Pexp_tuple es -> tuple es
-    | Pexp_construct ({txt; _}, argopt, _) -> construct e.pexp_loc txt argopt
+    | Pexp_construct ({txt; _}, argopt) -> construct e.pexp_loc txt argopt
     | Pexp_variant (l, expopt) -> variant l expopt
     | Pexp_record (fields, None) -> record fields
     | Pexp_array es -> array es
 
   and constant = function
     | Const_char c -> Char c
-    | Const_string s -> String s
+    | Const_string (s, _) -> String s
     | Const_float s -> Float (float_of_string s)
     | Const_int32 i32 -> Int32 i32
     | Const_int64 i64 -> Int64 i64
 
   and object_ fields =
     Object (List.map (fun { pcf_desc; pcf_loc } -> match pcf_desc with
-    | Pcf_meth ({txt; _}, _, _, e) -> txt, expression e
+    | Pcf_method ({txt; _}, _, Cfk_concrete(_, e)) -> txt, expression e
     | _ -> invalid pcf_loc) fields)
 
   and construct loc lident argopt =