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

Dep: revert sorting #3654

Merged
merged 2 commits into from
Jan 6, 2025
Merged

Dep: revert sorting #3654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0ad8046
Dep: revert sorting
mtzguido Jan 6, 2025
39eb87c
snap
mtzguido Jan 6, 2025
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
20 changes: 6 additions & 14 deletions ocaml/fstar-lib/generated/FStarC_Parser_Dep.ml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions src/parser/FStarC.Parser.Dep.fst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1763,27 +1763,19 @@ let print_full (outc : out_channel) (deps:deps) : unit =
let pr str = ignore <| FStarC.StringBuffer.add str sb in
let norm_path s = replace_chars (replace_chars s '\\' "/") ' ' "\\ " in
let print_entry (target : string) (all_deps : list string) : unit =
(* Print a target with dependencies. NOTE: we sort the dependencies,
but keep the first element unchanged as it's distinguished by $<. *)
let all_deps =
match all_deps with
| h::t -> h :: Class.Ord.sort t
| [] -> []
in
(* Print a target with dependencies. *)
pr target; pr ":";
all_deps |> List.iter (fun f -> pr " \\\n\t" ; pr (norm_path f));
pr "\n\n"
in
let print_all tag files =
(* Print a variable defined as a list of files *)
let files = Class.Ord.sort files in
pr (pre_tag^tag);
pr "=";
files |> List.iter (fun f -> pr " \\\n\t"; pr (norm_path f));
pr "\n\n"
in
let keys = deps_keys deps.dep_graph in
let keys = Class.Ord.sort keys in
let no_fstar_stubs_file (s:string) : string =
(* If the original filename begins with FStar.Stubs, then remove that,
consistent with what extraction will actually do.
Expand Down
Loading