Skip to content
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

Adapt w.r.t coq/coq#20167. #1023

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Adapt w.r.t coq/coq#20167. #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bedfe0c
Adapt w.r.t coq/coq#20167.
ppedrot Jan 31, 2025
cae233f
fix: update flake
rtetley Jan 31, 2025
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
2 changes: 1 addition & 1 deletion flake.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
inputs = {
flake-utils.url = "github:numtide/flake-utils";

coq-master = { url = "github:coq/coq/d6dd8a618cbf628a6580c9a42db0cf5f44606bea"; }; # Should be kept in sync with PIN_COQ in CI workflow
coq-master = { url = "github:coq/coq/3e7c26f8bb991e7335162647017edf21b2afd974"; }; # Should be kept in sync with PIN_COQ in CI workflow
coq-master.inputs.nixpkgs.follows = "nixpkgs";

};
Expand Down
19 changes: 16 additions & 3 deletions language-server/dm/document.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,19 @@ type diff =
| Added of pre_sentence list
| Equal of (sentence_id * pre_sentence) list


let tok_equal t1 t2 =
let open Tok in
match t1, t2 with
| KEYWORD s1, KEYWORD s2 -> CString.equal s1 s2
| IDENT s1, IDENT s2 -> CString.equal s1 s2
| FIELD s1, FIELD s2 -> CString.equal s1 s2
| NUMBER n1, NUMBER n2 -> NumTok.Unsigned.equal n1 n2
| STRING s1, STRING s2 -> CString.equal s1 s2
| LEFTQMARK, LEFTQMARK -> true
| BULLET s1, BULLET s2 -> CString.equal s1 s2
| EOI, EOI -> true
| QUOTATION(s1,t1), QUOTATION(s2,t2) -> CString.equal s1 s2 && CString.equal t1 t2
| _ -> false

let same_tokens (s1 : sentence) (s2 : pre_sentence) =
match s1.ast, s2.ast with
Expand Down Expand Up @@ -460,9 +472,10 @@ let string_of_diff doc l =

let rec stream_tok n_tok acc str begin_line begin_char =
let e = LStream.next (get_keyword_state ()) str in
if Tok.(equal e EOI) then
match e with
| Tok.EOI ->
List.rev acc
else
| _ ->
stream_tok (n_tok+1) (e::acc) str begin_line begin_char
(*
let parse_one_sentence stream ~st =
Expand Down
Loading