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

Metaquot: Embed errors in the AST instead of raising #397

Merged
merged 10 commits into from Mar 22, 2023
Merged

Metaquot: Embed errors in the AST instead of raising #397

Changes from 5 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
fc717ec
minor changes
Burnleydev1 Mar 14, 2023
1611a02
Added some code to change the error from raising to embedding it in t…
Burnleydev1 Mar 15, 2023
02fa1d5
remove function that contains error rasing in the previous fix
Burnleydev1 Mar 16, 2023
de338b5
added changes for
Burnleydev1 Mar 16, 2023
389e05a
did formating of the code using
Burnleydev1 Mar 16, 2023
79e1f81
multiple errors are now reported in metaquot
Burnleydev1 Mar 16, 2023
1b47093
edited changelog to describe changes made
Burnleydev1 Mar 21, 2023
1c371ec
edited changelog to describe changes made
Burnleydev1 Mar 21, 2023
f8fb918
Merge branch 'main' into embedded_errors
Burnleydev1 Mar 21, 2023
31eb192
removed spacings included in previous changes.
Burnleydev1 Mar 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 13 additions & 4 deletions metaquot/ppxlib_metaquot.ml
View file
Open in desktop
Expand Up @@ -108,7 +108,10 @@ module Expr = Make (struct
assert_no_attributes attrs;
e
| _ ->
Location.raise_errorf ~loc:(loc_of_extension ext) "expression expected"
Ast_builder.Default.(
pexp_extension ~loc:(loc_of_extension ext)
(Location.error_extensionf ~loc:(loc_of_extension ext)
"expression expected"))
end)

module Patt = Make (struct
Expand All @@ -125,12 +128,18 @@ module Patt = Make (struct

let annotate p core_type = ppat_constraint ~loc:core_type.ptyp_loc p core_type

let cast ext =
let cast ext : Ppxlib.pattern =
Burnleydev1 marked this conversation as resolved.
Show resolved Hide resolved
match snd ext with
| PPat (p, None) -> p
| PPat (_, Some e) ->
Location.raise_errorf ~loc:e.pexp_loc "guard not expected here"
| _ -> Location.raise_errorf ~loc:(loc_of_extension ext) "pattern expected"
Ast_builder.Default.(
ppat_extension ~loc:e.pexp_loc
(Location.error_extensionf ~loc:e.pexp_loc "guard not expected here"))
| _ ->
Ast_builder.Default.(
ppat_extension ~loc:(loc_of_extension ext)
(Location.error_extensionf ~loc:(loc_of_extension ext)
"pattern expected"))
end)

let () =
Expand Down