Skip to content

remove odoc parser #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Apr 25, 2021
Merged

remove odoc parser #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ee6782b
remove odoc parser
cristianoc Apr 25, 2021
cda8f90
dce
cristianoc Apr 25, 2021
f25b190
remove toplevel open
cristianoc Apr 25, 2021
93b71e6
Remove processDoc and all the resulting dead code.
cristianoc Apr 25, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 1 addition & 81 deletions analysis/.depend
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@ src/Hover.cmx : src/Utils.cmx src/SharedTypes.cmx src/Shared.cmx \
src/References.cmx src/Query.cmx
src/Infix.cmx : src/Log.cmx src/Files.cmx
src/Log.cmx :
src/MarkdownOfOCamldoc.cmx : src/vendor/odoc_parser/root.cmx \
src/vendor/odoc_parser/paths.cmx src/vendor/odoc_parser/parser_.cmx \
src/vendor/omd/omd.cmx src/Log.cmx src/vendor/odoc_parser/location_.cmx \
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx
src/ModuleResolution.cmx : src/Infix.cmx src/Files.cmx
src/NewCompletions.cmx : src/Utils.cmx src/Uri2.cmx src/TopTypes.cmx \
src/State.cmx src/SharedTypes.cmx src/Shared.cmx src/Query.cmx \
Expand Down Expand Up @@ -45,88 +41,12 @@ src/Shared.cmx : src/PrintType.cmx src/Files.cmx
src/SharedTypes.cmx : src/Utils.cmx src/Uri2.cmx src/Shared.cmx \
src/Infix.cmx
src/State.cmx : src/Utils.cmx src/Uri2.cmx src/TopTypes.cmx \
src/SharedTypes.cmx src/Process_406.cmx src/Packages.cmx \
src/vendor/omd/omd.cmx src/MarkdownOfOCamldoc.cmx src/Log.cmx \
src/SharedTypes.cmx src/Process_406.cmx src/Packages.cmx src/Log.cmx \
src/Infix.cmx src/FindFiles.cmx src/Files.cmx src/BuildSystem.cmx
src/TopTypes.cmx : src/Uri2.cmx src/SharedTypes.cmx
src/Uri2.cmx :
src/Utils.cmx : src/Protocol.cmx
src/vendor/Json.cmx :
src/vendor/odoc_parser/ast.cmx : src/vendor/odoc_parser/paths.cmx \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/comment.cmx
src/vendor/odoc_parser/comment.cmx : src/vendor/odoc_parser/paths.cmx \
src/vendor/odoc_parser/location_.cmx
src/vendor/odoc_parser/error.cmx : src/vendor/odoc_parser/location_.cmx
src/vendor/odoc_parser/helpers.cmx : src/vendor/odoc_parser/paths.cmx
src/vendor/odoc_parser/lang.cmx : src/vendor/odoc_parser/root.cmx \
src/vendor/odoc_parser/paths.cmx src/vendor/odoc_parser/comment.cmx
src/vendor/odoc_parser/location_.cmx :
src/vendor/odoc_parser/odoc_lexer.cmx : src/vendor/odoc_parser/token.cmx \
src/vendor/odoc_parser/parse_error.cmx \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
src/vendor/odoc_parser/odoc_lexer.cmi
src/vendor/odoc_parser/odoc_lexer.cmi : src/vendor/odoc_parser/token.cmx \
src/vendor/odoc_parser/location_.cmx
src/vendor/odoc_parser/parse_error.cmx : \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx
src/vendor/odoc_parser/parser_.cmx : src/vendor/odoc_parser/syntax.cmx \
src/vendor/odoc_parser/semantics.cmx \
src/vendor/odoc_parser/odoc_lexer.cmx \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
src/vendor/odoc_parser/ast.cmx src/vendor/odoc_parser/parser_.cmi
src/vendor/odoc_parser/parser_.cmi : src/vendor/odoc_parser/paths.cmi \
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx \
src/vendor/odoc_parser/ast.cmx
src/vendor/odoc_parser/paths.cmx : src/vendor/odoc_parser/root.cmx \
src/vendor/odoc_parser/paths_types.cmx src/vendor/odoc_parser/paths.cmi
src/vendor/odoc_parser/paths.cmi : src/vendor/odoc_parser/root.cmi \
src/vendor/odoc_parser/paths_types.cmx
src/vendor/odoc_parser/paths_types.cmx : src/vendor/odoc_parser/root.cmx
src/vendor/odoc_parser/root.cmx : src/vendor/odoc_parser/root.cmi
src/vendor/odoc_parser/root.cmi :
src/vendor/odoc_parser/semantics.cmx : src/vendor/odoc_parser/token.cmx \
src/vendor/odoc_parser/paths.cmx src/vendor/odoc_parser/parse_error.cmx \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
src/vendor/odoc_parser/comment.cmx src/vendor/odoc_parser/ast.cmx \
src/vendor/odoc_parser/semantics.cmi
src/vendor/odoc_parser/semantics.cmi : src/vendor/odoc_parser/paths.cmi \
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx \
src/vendor/odoc_parser/ast.cmx
src/vendor/odoc_parser/syntax.cmx : src/vendor/odoc_parser/token.cmx \
src/vendor/odoc_parser/parse_error.cmx \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/helpers.cmx \
src/vendor/odoc_parser/error.cmx src/vendor/odoc_parser/comment.cmx \
src/vendor/odoc_parser/ast.cmx src/vendor/odoc_parser/syntax.cmi
src/vendor/odoc_parser/syntax.cmi : src/vendor/odoc_parser/token.cmx \
src/vendor/odoc_parser/location_.cmx src/vendor/odoc_parser/error.cmx \
src/vendor/odoc_parser/ast.cmx
src/vendor/odoc_parser/token.cmx : src/vendor/odoc_parser/comment.cmx
src/vendor/omd/html_characters.cmx :
src/vendor/omd/omd.cmx : src/vendor/omd/omd_representation.cmx \
src/vendor/omd/omd_parser.cmx src/vendor/omd/omd_lexer.cmx \
src/vendor/omd/omd_backend.cmx src/vendor/omd/omd.cmi
src/vendor/omd/omd.cmi : src/vendor/omd/omd_representation.cmi
src/vendor/omd/omd_backend.cmx : src/vendor/omd/omd_utils.cmx \
src/vendor/omd/omd_representation.cmx src/vendor/omd/omd_backend.cmi
src/vendor/omd/omd_backend.cmi : src/vendor/omd/omd_utils.cmi \
src/vendor/omd/omd_representation.cmi
src/vendor/omd/omd_html.cmx :
src/vendor/omd/omd_lexer.cmx : src/vendor/omd/omd_utils.cmx \
src/vendor/omd/omd_representation.cmx src/vendor/omd/omd_lexer.cmi
src/vendor/omd/omd_lexer.cmi : src/vendor/omd/omd_representation.cmi
src/vendor/omd/omd_parser.cmx : src/vendor/omd/omd_utils.cmx \
src/vendor/omd/omd_representation.cmx src/vendor/omd/omd_lexer.cmx \
src/vendor/omd/omd_backend.cmx src/vendor/omd/omd_parser.cmi
src/vendor/omd/omd_parser.cmi : src/vendor/omd/omd_utils.cmi \
src/vendor/omd/omd_representation.cmi
src/vendor/omd/omd_representation.cmx : src/vendor/omd/omd_utils.cmx \
src/vendor/omd/omd_representation.cmi
src/vendor/omd/omd_representation.cmi :
src/vendor/omd/omd_types.cmx :
src/vendor/omd/omd_utils.cmx : src/vendor/omd/omd_utils.cmi
src/vendor/omd/omd_utils.cmi :
src/vendor/omd/omd_xtxt.cmx : src/vendor/omd/omd_xtxt.cmi
src/vendor/omd/omd_xtxt.cmi :
src/vendor/res_outcome_printer/res_comment.cmx : \
src/vendor/res_outcome_printer/res_comment.cmi
src/vendor/res_outcome_printer/res_comment.cmi :
Expand Down
2 changes: 1 addition & 1 deletion analysis/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
SHELL = /bin/bash
MAKEFLAGS += --jobs 4
INCLUDES = -I src -I src/vendor/odoc_parser -I src/vendor/omd -I src/vendor/res_outcome_printer -I src/vendor
INCLUDES = -I src -I src/vendor/res_outcome_printer -I src/vendor

OCAMLOPT = ocamlopt.opt
OCAMLFLAGS = -g -w +26+27+32+33+39 -bin-annot -I +compiler-libs $(INCLUDES)
Expand Down
5 changes: 2 additions & 3 deletions analysis/src/Infix.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
* You provide a function that turns an element into an optional of another element,
* and you get a list of all of the present results.
*)
let optMap : ('a -> 'b option) -> 'a list -> 'b list = fun fn items ->
let optMap : ('a -> 'b option) -> 'a list -> 'b list =
fun fn items ->
List.fold_left
(fun result item ->
match fn item with None -> result | Some res -> res :: result)
Expand All @@ -19,8 +20,6 @@ let ( |?> ) o fn = match o with None -> None | Some v -> fn v

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

let fold o d f = match o with None -> d | Some v -> f v

let logIfAbsent message x =
match x with
| None ->
Expand Down
181 changes: 0 additions & 181 deletions analysis/src/MarkdownOfOCamldoc.ml
View file
Open in desktop

This file was deleted.

10 changes: 3 additions & 7 deletions analysis/src/ProcessAttributes.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ let rec findDeprecatedAttribute attributes =
| ({Asttypes.txt = "deprecated"}, _) :: _ -> Some ""
| _ :: rest -> findDeprecatedAttribute rest

let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath ~processDoc
exported attributes =
let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath exported
attributes =
{
name;
stamp;
Expand All @@ -45,10 +45,6 @@ let newDeclared ~item ~scope ~extent ~name ~stamp ~modulePath ~processDoc
modulePath;
deprecated = findDeprecatedAttribute attributes;
docstring =
( match findDocAttribute attributes with
| None -> []
| Some d -> processDoc d );
(match findDocAttribute attributes with None -> [] | Some d -> [d]);
item;
(* scopeType = Let; *)
(* scopeStart = env.scopeStart; *)
}
Loading