Skip to content

Replace list-then-empty-check patterns with short-circuiting alternatives #224

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
sim642 merged 4 commits into from
Mar 24, 2026
Merged

Replace list-then-empty-check patterns with short-circuiting alternatives #224

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73ffb77
Initial plan
Copilot Mar 19, 2026
3422861
Replace list computation + empty check with short-circuiting alternat…
Copilot Mar 19, 2026
b8ac672
Revert src/cil.ml changes
Copilot Mar 19, 2026
5550d17
Use List.exists in unrollDesignatorForNestedAnonymous
Copilot Mar 19, 2026
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
8 changes: 4 additions & 4 deletions src/check.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,9 +583,9 @@ and checkExp (isconst: bool) (e: exp) : typ =
| AddrOfLabel (gref) -> begin
(* Find a label *)
let lab =
match List.filter (function Label _ -> true | _ -> false)
match List.find_opt (function Label _ -> true | _ -> false)
!gref.labels with
Label (lab, _, _) :: _ -> lab
Some (Label (lab, _, _)) -> lab
| _ ->
ignore (warn "Address of label to block without a label");
"<missing label>"
Expand Down Expand Up @@ -748,9 +748,9 @@ and checkStmt (s: stmt) =
currentLoc := l;
(* Find a label *)
let lab =
match List.filter (function Label _ -> true | _ -> false)
match List.find_opt (function Label _ -> true | _ -> false)
!gref.labels with
Label (lab, _, _) :: _ -> lab
Some (Label (lab, _, _)) -> lab
| _ ->
ignore (warn "Goto to block without a label");
"<missing label>"
Expand Down
6 changes: 3 additions & 3 deletions src/frontc/cabs2cil.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5637,10 +5637,10 @@ and doInit
(* We have a designator *)
| _, (what, ie) :: restil when what != A.NEXT_INIT ->
let rec unrollDesignatorForNestedAnonymous (comp: compinfo) (designator: string) (whatnext: initwhat) =
let own_field = List.filter (fun fld -> fld.fname = designator) comp.cfields in
let own_field = List.find_opt (fun fld -> fld.fname = designator) comp.cfields in
Comment thread
michael-schwarz marked this conversation as resolved.
Outdated
match own_field with
| fld :: _ -> (true, Some(A.INFIELD_INIT (designator, whatnext)))
| [] ->
| Some _ -> (true, Some(A.INFIELD_INIT (designator, whatnext)))
| None ->
let anonymous_compounds = List.filter_map (fun f ->
(* f.ftype need not be unrolled here, inner anonymous struct cannot be typdef'ed *)
match f.ftype with
Expand Down
Loading