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

Jump to bottom

refactor: rename [deriv] suffixes #451

Merged
merged 1 commit into from
Sep 11, 2024
Merged

refactor: rename [deriv] suffixes #451

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 14 additions & 14 deletions lib/automata.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -584,15 +584,15 @@ let prepend_marks =
fun m -> List.map ~f:(fun (s, x) -> s, prepend_marks_expr_lst m x)
;;

let rec deriv_1 all_chars categories marks cat x rem =
let rec deriv_expr all_chars categories marks cat x rem =
match x.def with
| Cst s -> Cset.prepend s [ E.texp marks eps_expr ] rem
| Alt l -> deriv_2 all_chars categories marks cat l rem
| Alt l -> deriv_alt all_chars categories marks cat l rem
| Seq (kind, y, z) ->
let y = deriv_1 all_chars categories marks cat y [ all_chars, [] ] in
let y = deriv_expr all_chars categories marks cat y [ all_chars, [] ] in
deriv_seq all_chars categories cat kind y z rem
| Rep (rep_kind, kind, y) ->
let y = deriv_1 all_chars categories marks cat y [ all_chars, [] ] in
let y = deriv_expr all_chars categories marks cat y [ all_chars, [] ] in
List.fold_right ~init:rem y ~f:(fun (s, z) rem ->
let z', marks' =
match Desc.first_match z with
Expand All @@ -615,22 +615,22 @@ let rec deriv_1 all_chars categories marks cat x rem =
then Cset.prepend all_chars [ E.TMatch marks ] rem
else rem

and deriv_2 all_chars categories marks cat l rem =
and deriv_alt all_chars categories marks cat l rem =
match l with
| [] -> rem
| y :: r ->
deriv_1
deriv_expr
all_chars
categories
marks
cat
y
(deriv_2 all_chars categories marks cat r rem)
(deriv_alt all_chars categories marks cat r rem)

and deriv_seq all_chars categories cat kind y z rem =
if List.exists y ~f:(fun (_s, xl) -> Desc.exists_tmatch xl)
then (
let z' = deriv_1 all_chars categories Marks.empty cat z [ all_chars, [] ] in
let z' = deriv_expr all_chars categories Marks.empty cat z [ all_chars, [] ] in
List.fold_right ~init:rem y ~f:(fun (s, y) rem ->
match Desc.first_match y with
| None -> Cset.prepend s (E.tseq kind y z []) rem
Expand All @@ -657,22 +657,22 @@ and deriv_seq all_chars categories cat kind y z rem =
Cset.prepend s (E.tseq kind xl z []) rem)
;;

let rec deriv_3 all_chars categories cat x rem =
let rec deriv_e all_chars categories cat x rem =
match x with
| E.TSeq (kind, y, z) ->
let y' = deriv_4 all_chars categories cat y [ all_chars, [] ] in
let y' = deriv_desc all_chars categories cat y [ all_chars, [] ] in
deriv_seq all_chars categories cat kind y' z rem
| E.TExp (marks, e) -> deriv_1 all_chars categories marks cat e rem
| E.TExp (marks, e) -> deriv_expr all_chars categories marks cat e rem
| E.TMatch _ -> Cset.prepend all_chars [ x ] rem

and deriv_4 all_chars categories cat l rem =
and deriv_desc all_chars categories cat l rem =
match l with
| [] -> rem
| y :: r -> deriv_3 all_chars categories cat y (deriv_4 all_chars categories cat r rem)
| y :: r -> deriv_e all_chars categories cat y (deriv_desc all_chars categories cat r rem)
;;

let deriv (tbl_ref : Working_area.t) all_chars categories (st : State.t) =
let der = deriv_4 all_chars categories st.category st.desc [ all_chars, [] ] in
let der = deriv_desc all_chars categories st.category st.desc [ all_chars, [] ] in
simpl_tr
(List.fold_right der ~init:[] ~f:(fun (s, expr) rem ->
let expr' = remove_duplicates tbl_ref.seen expr eps_expr in
Expand Down
Loading