Skip to content

Commit 9823128

Browse files
authored
refactor: remove [Parse_buffer.accept2] (#562)
1 parent 76dabf6 commit 9823128

File tree

3 files changed

+4
-10
lines changed

3 files changed

+4
-10
lines changed

lib/emacs.ml

+4-3
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,14 @@ let by_code f c c' =
3434
let parse s =
3535
let buf = Parse_buffer.create s in
3636
let accept = Parse_buffer.accept buf in
37-
let accept2 = Parse_buffer.accept2 buf in
3837
let eos () = Parse_buffer.eos buf in
3938
let test2 = Parse_buffer.test2 buf in
4039
let get () = Parse_buffer.get buf in
4140
let rec regexp () = regexp' [ branch () ]
4241
and regexp' left =
43-
if accept2 '\\' '|' then regexp' (branch () :: left) else Re.alt (List.rev left)
42+
if Parse_buffer.accept_s buf {|\||}
43+
then regexp' (branch () :: left)
44+
else Re.alt (List.rev left)
4445
and branch () = branch' []
4546
and branch' left =
4647
if eos () || test2 '\\' '|' || test2 '\\' ')'
@@ -69,7 +70,7 @@ let parse s =
6970
if accept '('
7071
then (
7172
let r = regexp () in
72-
if not (accept2 '\\' ')') then raise Parse_error;
73+
if not (Parse_buffer.accept_s buf {|\)|}) then raise Parse_error;
7374
Re.group r)
7475
else if accept '`'
7576
then Re.bos

lib/parse_buffer.ml

-6
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ let accept t c =
2121
r
2222
;;
2323

24-
let accept2 t c c' =
25-
let r = test2 t c c' in
26-
if r then t.pos <- t.pos + 2;
27-
r
28-
;;
29-
3024
let get t =
3125
let r = t.str.[t.pos] in
3226
t.pos <- t.pos + 1;

lib/parse_buffer.mli

-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,5 @@ val test : t -> char -> bool
1010
val test2 : t -> char -> char -> bool
1111
val get : t -> char
1212
val accept : t -> char -> bool
13-
val accept2 : t -> char -> char -> bool
1413
val accept_s : t -> string -> bool
1514
val integer : t -> int option

0 commit comments

Comments
 (0)