Skip to content

Commit a66401d

Browse files
cristianoccristianoc
authored
Merge pull request #138 from rescript-lang/no_odoc
remove odoc parser
2 parents f099209 + 93b71e6 commit a66401d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

55 files changed

+81
-18861
lines changed

‎analysis/.depend‎

Lines changed: 1 addition & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ src/Hover.cmx : src/Utils.cmx src/SharedTypes.cmx src/Shared.cmx \
1212
src/References.cmx src/Query.cmx
1313
src/Infix.cmx : src/Log.cmx src/Files.cmx
1414
src/Log.cmx :
15-
src/MarkdownOfOCamldoc.cmx : src/vendor/odoc_parser/root.cmx \
16-
src/vendor/odoc_parser/paths.cmx src/vendor/odoc_parser/parser_.cmx \
17-
src/vendor/omd/omd.cmx src/Log.cmx src/vendor/odoc_parser/location_.cmx \
18-
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx
1915
src/ModuleResolution.cmx : src/Infix.cmx src/Files.cmx
2016
src/NewCompletions.cmx : src/Utils.cmx src/Uri2.cmx src/TopTypes.cmx \
2117
src/State.cmx src/SharedTypes.cmx src/Shared.cmx src/Query.cmx \
@@ -45,88 +41,12 @@ src/Shared.cmx : src/PrintType.cmx src/Files.cmx
4541
src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx \
4642
src/Infix.cmx
4743
src/State.cmx : src/Utils.cmx src/Uri2.cmx src/TopTypes.cmx \
48-
src/SharedTypes.cmx src/Process_406.cmx src/Packages.cmx \
49-
src/vendor/omd/omd.cmx src/MarkdownOfOCamldoc.cmx src/Log.cmx \
44+
src/SharedTypes.cmx src/Process_406.cmx src/Packages.cmx src/Log.cmx \
5045
src/Infix.cmx src/FindFiles.cmx src/Files.cmx src/BuildSystem.cmx
5146
src/TopTypes.cmx : src/Uri2.cmx src/SharedTypes.cmx
5247
src/Uri2.cmx :
5348
src/Utils.cmx : src/Protocol.cmx
5449
src/vendor/Json.cmx :
55-
src/vendor/odoc_parser/ast.cmx : src/vendor/odoc_parser/paths.cmx \
56-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/comment.cmx
57-
src/vendor/odoc_parser/comment.cmx : src/vendor/odoc_parser/paths.cmx \
58-
src/vendor/odoc_parser/location_.cmx
59-
src/vendor/odoc_parser/error.cmx : src/vendor/odoc_parser/location_.cmx
60-
src/vendor/odoc_parser/helpers.cmx : src/vendor/odoc_parser/paths.cmx
61-
src/vendor/odoc_parser/lang.cmx : src/vendor/odoc_parser/root.cmx \
62-
src/vendor/odoc_parser/paths.cmx src/vendor/odoc_parser/comment.cmx
63-
src/vendor/odoc_parser/location_.cmx :
64-
src/vendor/odoc_parser/odoc_lexer.cmx : src/vendor/odoc_parser/token.cmx \
65-
src/vendor/odoc_parser/parse_error.cmx \
66-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
67-
src/vendor/odoc_parser/odoc_lexer.cmi
68-
src/vendor/odoc_parser/odoc_lexer.cmi : src/vendor/odoc_parser/token.cmx \
69-
src/vendor/odoc_parser/location_.cmx
70-
src/vendor/odoc_parser/parse_error.cmx : \
71-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx
72-
src/vendor/odoc_parser/parser_.cmx : src/vendor/odoc_parser/syntax.cmx \
73-
src/vendor/odoc_parser/semantics.cmx \
74-
src/vendor/odoc_parser/odoc_lexer.cmx \
75-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
76-
src/vendor/odoc_parser/ast.cmx src/vendor/odoc_parser/parser_.cmi
77-
src/vendor/odoc_parser/parser_.cmi : src/vendor/odoc_parser/paths.cmi \
78-
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx \
79-
src/vendor/odoc_parser/ast.cmx
80-
src/vendor/odoc_parser/paths.cmx : src/vendor/odoc_parser/root.cmx \
81-
src/vendor/odoc_parser/paths_types.cmx src/vendor/odoc_parser/paths.cmi
82-
src/vendor/odoc_parser/paths.cmi : src/vendor/odoc_parser/root.cmi \
83-
src/vendor/odoc_parser/paths_types.cmx
84-
src/vendor/odoc_parser/paths_types.cmx : src/vendor/odoc_parser/root.cmx
85-
src/vendor/odoc_parser/root.cmx : src/vendor/odoc_parser/root.cmi
86-
src/vendor/odoc_parser/root.cmi :
87-
src/vendor/odoc_parser/semantics.cmx : src/vendor/odoc_parser/token.cmx \
88-
src/vendor/odoc_parser/paths.cmx src/vendor/odoc_parser/parse_error.cmx \
89-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
90-
src/vendor/odoc_parser/comment.cmx src/vendor/odoc_parser/ast.cmx \
91-
src/vendor/odoc_parser/semantics.cmi
92-
src/vendor/odoc_parser/semantics.cmi : src/vendor/odoc_parser/paths.cmi \
93-
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx \
94-
src/vendor/odoc_parser/ast.cmx
95-
src/vendor/odoc_parser/syntax.cmx : src/vendor/odoc_parser/token.cmx \
96-
src/vendor/odoc_parser/parse_error.cmx \
97-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/helpers.cmx \
98-
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx \
99-
src/vendor/odoc_parser/ast.cmx src/vendor/odoc_parser/syntax.cmi
100-
src/vendor/odoc_parser/syntax.cmi : src/vendor/odoc_parser/token.cmx \
101-
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
102-
src/vendor/odoc_parser/ast.cmx
103-
src/vendor/odoc_parser/token.cmx : src/vendor/odoc_parser/comment.cmx
104-
src/vendor/omd/html_characters.cmx :
105-
src/vendor/omd/omd.cmx : src/vendor/omd/omd_representation.cmx \
106-
src/vendor/omd/omd_parser.cmx src/vendor/omd/omd_lexer.cmx \
107-
src/vendor/omd/omd_backend.cmx src/vendor/omd/omd.cmi
108-
src/vendor/omd/omd.cmi : src/vendor/omd/omd_representation.cmi
109-
src/vendor/omd/omd_backend.cmx : src/vendor/omd/omd_utils.cmx \
110-
src/vendor/omd/omd_representation.cmx src/vendor/omd/omd_backend.cmi
111-
src/vendor/omd/omd_backend.cmi : src/vendor/omd/omd_utils.cmi \
112-
src/vendor/omd/omd_representation.cmi
113-
src/vendor/omd/omd_html.cmx :
114-
src/vendor/omd/omd_lexer.cmx : src/vendor/omd/omd_utils.cmx \
115-
src/vendor/omd/omd_representation.cmx src/vendor/omd/omd_lexer.cmi
116-
src/vendor/omd/omd_lexer.cmi : src/vendor/omd/omd_representation.cmi
117-
src/vendor/omd/omd_parser.cmx : src/vendor/omd/omd_utils.cmx \
118-
src/vendor/omd/omd_representation.cmx src/vendor/omd/omd_lexer.cmx \
119-
src/vendor/omd/omd_backend.cmx src/vendor/omd/omd_parser.cmi
120-
src/vendor/omd/omd_parser.cmi : src/vendor/omd/omd_utils.cmi \
121-
src/vendor/omd/omd_representation.cmi
122-
src/vendor/omd/omd_representation.cmx : src/vendor/omd/omd_utils.cmx \
123-
src/vendor/omd/omd_representation.cmi
124-
src/vendor/omd/omd_representation.cmi :
125-
src/vendor/omd/omd_types.cmx :
126-
src/vendor/omd/omd_utils.cmx : src/vendor/omd/omd_utils.cmi
127-
src/vendor/omd/omd_utils.cmi :
128-
src/vendor/omd/omd_xtxt.cmx : src/vendor/omd/omd_xtxt.cmi
129-
src/vendor/omd/omd_xtxt.cmi :
13050
src/vendor/res_outcome_printer/res_comment.cmx : \
13151
src/vendor/res_outcome_printer/res_comment.cmi
13252
src/vendor/res_outcome_printer/res_comment.cmi :

‎analysis/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SHELL = /bin/bash
22
MAKEFLAGS += --jobs 4
3-
INCLUDES = -I src -I src/vendor/odoc_parser -I src/vendor/omd -I src/vendor/res_outcome_printer -I src/vendor
3+
INCLUDES = -I src -I src/vendor/res_outcome_printer -I src/vendor
44

55
OCAMLOPT = ocamlopt.opt
66
OCAMLFLAGS = -g -w +26+27+32+33+39 -bin-annot -I +compiler-libs $(INCLUDES)

‎analysis/src/Infix.ml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
* You provide a function that turns an element into an optional of another element,
44
* and you get a list of all of the present results.
55
*)
6-
let optMap : ('a -> 'b option) -> 'a list -> 'b list = fun fn items ->
6+
let optMap : ('a -> 'b option) -> 'a list -> 'b list =
7+
fun fn items ->
78
List.fold_left
89
(fun result item ->
910
match fn item with None -> result | Some res -> res :: result)
@@ -19,8 +20,6 @@ let ( |?> ) o fn = match o with None -> None | Some v -> fn v
1920

2021
let ( |?>> ) o fn = match o with None -> None | Some v -> Some (fn v)
2122

22-
let fold o d f = match o with None -> d | Some v -> f v
23-
2423
let logIfAbsent message x =
2524
match x with
2625
| None ->

‎analysis/src/MarkdownOfOCamldoc.ml‎

Lines changed: 0 additions & 181 deletions
This file was deleted.

‎analysis/src/ProcessAttributes.ml‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ let rec findDeprecatedAttribute attributes =
3434
| ({Asttypes.txt = "deprecated"}, _) :: _ -> Some ""
3535
| _ :: rest -> findDeprecatedAttribute rest
3636

37-
let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath ~processDoc
38-
exported attributes =
37+
let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath exported
38+
attributes =
3939
{
4040
name;
4141
stamp;
@@ -45,10 +45,6 @@ let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath ~processDoc
4545
modulePath;
4646
deprecated = findDeprecatedAttribute attributes;
4747
docstring =
48-
( match findDocAttribute attributes with
49-
| None -> []
50-
| Some d -> processDoc d );
48+
(match findDocAttribute attributes with None -> [] | Some d -> [d]);
5149
item;
52-
(* scopeType = Let; *)
53-
(* scopeStart = env.scopeStart; *)
5450
}

0 commit comments

Comments
 (0)