Skip to content

Fix grammar and use of pretty printing blocks for missing constructor error messages #934

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

Open
alleystoughton wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −5
Open

Fix grammar and use of pretty printing blocks for missing constructor error messages #934

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
12 changes: 7 additions & 5 deletions src/ecUserMessages.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ end = struct
ppo op in
EcPrinting.pp_list ",@ " pp1

let is_are n = if n = 1 then "is" else "are"

let pp_fxerror env fmt error =
let msg x = Format.fprintf fmt x in

Expand All @@ -224,16 +226,16 @@ end = struct
msg "this pattern matching contains duplicated branches"

| FXE_MatchPartial ids ->
msg "this pattern matching is non-exhaustive, %a are missing"
(EcPrinting.pp_list ",@ " pp_symbol) ids
msg "this pattern matching is non-exhaustive, @[%a@] %s missing"
(EcPrinting.pp_list ",@ " pp_symbol) ids (is_are (List.length ids))

| FXE_FixPartial ids ->
let ppe = EcPrinting.PPEnv.ofenv env in
let pp_match fmt ids =
Format.fprintf fmt "[%a]"
(EcPrinting.pp_list ",@" (EcPrinting.pp_opname ppe)) ids in
msg "this pattern matching is non-exhaustive, %a are missing"
(EcPrinting.pp_list ",@ " pp_match) ids
msg "this pattern matching is non-exhaustive, @[%a@] %s missing"
(EcPrinting.pp_list ",@ " pp_match) ids (is_are (List.length ids))

| FXE_FixRedundant fm ->
msg "this clause is useless: %a" (pp_fix_match env) fm
Expand All @@ -259,7 +261,7 @@ end = struct
let pp_gse_error _env fmt error =
let msg = Format.fprintf fmt in
match error with
| GSE_ExpectedTwoSided ->
| GSE_ExpectedTwoSided ->
msg "expected two sided goal"

let pp_tyerror env1 fmt error =
Expand Down