Skip to content

Use the Dolmen identifiers for constructors and ADT names #1098

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
Halbaroth merged 15 commits into from
May 16, 2024
Merged

Use the Dolmen identifiers for constructors and ADT names #1098

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
1148780
Use the Dolmen identifiers for constructors and ADT names
Halbaroth Apr 24, 2024
b9d7d94
Convenient constructors for unique identifiers
Halbaroth Apr 29, 2024
21b0d6b
poetry
Halbaroth Apr 29, 2024
bc01e94
Add a test
Halbaroth Apr 29, 2024
8fcd843
Try to fix regressions with `fpa`
Halbaroth Apr 30, 2024
588a978
Rename `Fake` to `Hstring`
Halbaroth May 10, 2024
8a933b3
Use the unit id of Dolmen
Halbaroth May 10, 2024
e1a7b1d
Restore distinct constructor for distinct records
Halbaroth May 10, 2024
00674ca
Use `Dolmen` identifiers directly in `Uid`
Halbaroth May 10, 2024
4a57d28
Use `Dolmen` identifiers for abstract types
Halbaroth May 10, 2024
2ab5103
Avoid duplication for builtin enum type
Halbaroth May 10, 2024
acd48aa
Simplify `fresh_ty` type
Halbaroth May 10, 2024
6de6eba
rebase
Halbaroth May 10, 2024
e8ab5c5
String comparison
Halbaroth May 13, 2024
c838a68
review changes
Halbaroth May 13, 2024
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 src/lib/dune
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
; structures
Commands Errors Explanation Fpa_rounding
Parsed Profiling Satml_types Symbols
Expr Var Ty Typed Xliteral ModelMap Id Objective Literal
Expr Var Ty Typed Xliteral ModelMap Id Uid Objective Literal
; util
Emap Gc_debug Hconsing Hstring Heap Lists Loc
MyUnix Numbers Uqueue
Expand Down
6 changes: 3 additions & 3 deletions src/lib/frontend/cnf.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ let rec make_term quant_basename t =
[mk_term t1; mk_term t2] ty

| TTdot (t, s) ->
E.mk_term (Sy.Op (Sy.Access s)) [mk_term t] ty
E.mk_term (Sy.Op (Sy.Access (Uid.of_hstring s))) [mk_term t] ty

| TTrecord lbs ->
let lbs = List.map (fun (_, t) -> mk_term t) lbs in
Expand Down Expand Up @@ -156,7 +156,7 @@ let rec make_term quant_basename t =
E.mk_ite cond t1 t2

| TTproject (t, s) ->
E.mk_term (Sy.destruct (Hstring.view s)) [mk_term t] ty
E.mk_term (Sy.destruct (Uid.of_hstring s)) [mk_term t] ty

| TTmatch (e, pats) ->
let e = make_term quant_basename e in
Expand Down Expand Up @@ -227,7 +227,7 @@ and make_form name_base ~toplevel f loc ~decl_kind : E.t =
make_term name_base t2]
end
| TTisConstr (t, lbl) ->
E.mk_builtin ~is_pos:true (Sy.IsConstr lbl)
E.mk_builtin ~is_pos:true (Sy.IsConstr (Uid.of_hstring lbl))
[make_term name_base t]

| _ -> assert false
Expand Down
Loading