+7 -2

src/xref2/link.ml

··· 565 565 | ModuleType v -> 566 566 ModuleType 567 567 (jump_to v 568 568 - (fun _ -> None) 568 568 + (Shape_tools.lookup_module_type_path env) 569 569 (module_type_path ~report_errors:false env)) 570 570 | Type v -> 571 571 Type 572 572 (jump_to v 573 573 - (fun _ -> None) 573 573 + (Shape_tools.lookup_type_path env) 574 574 (type_path ~report_errors:false env)) 575 575 | Constructor v -> 576 576 Constructor 577 577 (jump_to v 578 578 (fun _ -> None) 579 579 (constructor_path ~report_errors:false env)) 580 580 + | ClassType v -> 581 581 + ClassType 582 582 + (jump_to v 583 583 + (Shape_tools.lookup_class_type_path env) 584 584 + (class_type_path ~report_errors:false env)) 580 585 | i -> i 581 586 in 582 587 (info, pos))

+22 -18

src/xref2/shape_tools.cppo.ml

··· 81 81 | `Identifier (id, _) -> 82 82 shape_of_id env (id :> Odoc_model.Paths.Identifier.NonSrc.t) 83 83 84 84 - let shape_of_value_path env : 85 85 - Odoc_model.Paths.Path.Value.t -> Shape.t option = 84 84 + let shape_of_kind_path env kind : 85 85 + _ -> Shape.t option = 86 86 let proj parent kind name = 87 87 let item = Shape.Item.make name kind in 88 88 match shape_of_module_path env parent with 89 89 | Some shape -> Some (Shape.proj shape item) 90 90 | None -> None 91 91 in 92 92 - fun (path : Odoc_model.Paths.Path.Value.t) -> 92 92 + fun path -> 93 93 match path with 94 94 | `Resolved _ -> None 95 95 - | `Dot (parent, name) -> proj parent Kind.Value name 95 95 + | `Dot (parent, name) -> proj parent kind name 96 96 | `Identifier (id, _) -> shape_of_id env (id :> Odoc_model.Paths.Identifier.NonSrc.t) 97 97 - 98 97 99 98 module MkId = Identifier.Mk 100 99 ··· 151 150 | None -> None 152 151 | Some query -> lookup_shape env query 153 152 154 154 - let lookup_value_path : 155 155 - Env.t -> 156 156 - Path.Value.t -> 157 157 - Identifier.SourceLocation.t option 158 158 - = fun env path -> 159 159 - match shape_of_value_path env path with 153 153 + let lookup_module_path = fun env path -> 154 154 + match shape_of_module_path env path with 160 155 | None -> None 161 156 | Some query -> lookup_shape env query 162 157 163 163 - 164 164 - let lookup_module_path : 165 165 - Env.t -> 166 166 - Path.Module.t -> 167 167 - Identifier.SourceLocation.t option 168 168 - = fun env path -> 169 169 - match shape_of_module_path env path with 158 158 + let lookup_kind_path = fun kind env path -> 159 159 + match shape_of_kind_path env kind path with 170 160 | None -> None 171 161 | Some query -> lookup_shape env query 172 162 163 163 + let lookup_value_path = lookup_kind_path Kind.Value 164 164 + 165 165 + let lookup_type_path = lookup_kind_path Kind.Type 166 166 + 167 167 + let lookup_module_type_path = lookup_kind_path Kind.Module_type 168 168 + 169 169 + let lookup_class_type_path = lookup_kind_path Kind.Class_type 170 170 + 173 171 #else 174 172 175 173 type t = unit ··· 179 177 let lookup_value_path _ _id = None 180 178 181 179 let lookup_module_path _ _id = None 180 180 + 181 181 + let lookup_type_path _ _id = None 182 182 + 183 183 + let lookup_module_type_path _ _id = None 184 184 + 185 185 + let lookup_class_type_path _ _id = None 182 186 183 187 #endif

+16

src/xref2/shape_tools.cppo.mli

··· 19 19 Path.Value.t -> 20 20 Identifier.SourceLocation.t option 21 21 22 22 + val lookup_type_path : 23 23 + Env.t -> 24 24 + Path.Type.t -> 25 25 + Identifier.SourceLocation.t option 26 26 + 22 27 val lookup_module_path : 23 28 Env.t -> 24 29 Path.Module.t -> 25 30 Identifier.SourceLocation.t option 31 31 + 32 32 + val lookup_module_type_path : 33 33 + Env.t -> 34 34 + Path.ModuleType.t -> 35 35 + Identifier.SourceLocation.t option 36 36 + 37 37 + val lookup_class_type_path : 38 38 + Env.t -> 39 39 + Path.ClassType.t -> 40 40 + Identifier.SourceLocation.t option 41 41 +

+2

test/occurrences/double_wrapped.t/a.ml

··· 5 5 module type M = sig end 6 6 7 7 let (||>) x y = x + y 8 8 + 9 9 + let _ = x + x

+26 -1

test/occurrences/double_wrapped.t/run.t

··· 119 119 120 120 $ odoc count-occurrences -I main__A -o occurrences.txt --include-own --include-hidden 121 121 $ occurrences_print occurrences.txt | sort 122 122 + Main__A was used directly 0 times and indirectly 2 times 123 123 + Main__A.x was used directly 2 times and indirectly 0 times 122 124 string was used directly 1 times and indirectly 0 times 123 125 124 126 $ odoc count-occurrences -I . -o occurrences.txt --include-own ··· 160 162 Main__ was used directly 0 times and indirectly 2 times 161 163 Main__.C was used directly 1 times and indirectly 1 times 162 164 Main__.C.y was used directly 1 times and indirectly 0 times 163 163 - Main__A was used directly 1 times and indirectly 0 times 165 165 + Main__A was used directly 1 times and indirectly 2 times 166 166 + Main__A.x was used directly 2 times and indirectly 0 times 164 167 Main__B was used directly 1 times and indirectly 1 times 165 168 Main__B.Z was used directly 0 times and indirectly 1 times 166 169 Main__B.Z.y was used directly 1 times and indirectly 0 times 167 170 Main__C was used directly 1 times and indirectly 0 times 168 171 string was used directly 1 times and indirectly 0 times 172 172 + 173 173 + 174 174 + REMARKS! 175 175 + 176 176 + $ odoc count-occurrences -I main__B -o b_only_persistent.occ 177 177 + $ odoc count-occurrences -I main__B -o b_with_own.occ --include-own 178 178 + $ occurrences_print b_only_persistent.occ | sort > only_persistent 179 179 + $ occurrences_print b_with_own.occ | sort > with_own 180 180 + $ diff only_persistent with_own | grep Main.A.x 181 181 + < Main.A.x was used directly 1 times and indirectly 0 times 182 182 + > Main.A.x was used directly 2 times and indirectly 0 times 183 183 + 184 184 + This is because the persistent Y.x is resolved into Main.A.x. So maybe relying 185 185 + on Ident.persistent is not the good way of knowing if it is persistent or not? 186 186 + 187 187 + $ odoc count-occurrences -I main__A -o a_with_own_and_hidden.occ --include-own --include-hidden 188 188 + $ occurrences_print a_with_own_and_hidden.occ | sort 189 189 + Main__A was used directly 0 times and indirectly 2 times 190 190 + Main__A.x was used directly 2 times and indirectly 0 times 191 191 + string was used directly 1 times and indirectly 0 times 192 192 + 193 193 + That's a problem: it should be Main.A and Main.A.x