Skip to content
Snippets Groups Projects

Consistently use `set_` prefix.

Merged Robbert Krebbers requested to merge robbert/set_rename into master
All threads resolved!

The MR closes #24 (closed).

  • Consistently set_ prefixes (instead of collection_).
  • Rename the Collection type class into Set_. Likewise, SimpleCollection is called SemiSet, and FinCollection is called FinSet, and CollectionMonad is called MonadSet.
  • Rename collections.v and fin_collections.v into sets.v and fin_sets.v, respectively.
  • Rename set A := A → Prop (theories/set.v) into propset, and likewise bset into boolset.
  • Consistently prefer X_to_Y for conversion functions, e.g. list_to_map instead of the former map_of_list.

Sed script uses

This MR is the result of the following sed script. It only had one bug, it wrongly replaced Vector.of_list into Vector.set_of_list. Note that I'm not using \b all the time because I also wanted to fix up lemma names.

sed '
s/SimpleCollection/SemiSet/g;
s/FinCollection/FinSet/g;
s/CollectionMonad/MonadSet/g;
s/Collection/Set\_/g;
s/collection\_simple/set\_semi\_set/g;
s/fin\_collection/fin\_set/g;
s/collection\_monad\_simple/monad\_set\_semi\_set/g;
s/collection\_equiv/set\_equiv/g;
s/\bbset/boolset/g;
s/mkBSet/BoolSet/g;
s/mkSet/PropSet/g;
s/set\_equivalence/set\_equiv\_equivalence/g;
s/collection\_subseteq/set\_subseteq/g;
s/collection\_disjoint/set\_disjoint/g;
s/collection\_fold/set\_fold/g;
s/collection\_map/set\_map/g;
s/collection\_size/set\_size/g;
s/collection\_filter/set\_filter/g;
s/collection\_guard/set\_guard/g;
s/collection\_choose/set\_choose/g;
s/collection\_ind/set\_ind/g;
s/collection\_wf/set\_wf/g;
s/map\_to\_collection/map\_to\_set/g;
s/map\_of\_collection/set\_to\_map/g;
s/map\_of\_list/list\_to\_map/g;
s/map\_of\_to_list/list\_to\_map\_to\_list/g;
s/map\_to\_of\_list/map\_to\_list\_to\_map/g;
s/\bof\_list/list\_to\_set/g;
s/\bof\_option/option\_to\_set/g;
s/elem\_of\_of\_list/elem\_of\_list\_to\_set/g;
s/elem\_of\_of\_option/elem\_of\_option\_to\_set/g;
s/collection\_not\_subset\_inv/set\_not\_subset\_inv/g;
s/seq\_set/set\_seq/g;
s/collections/sets/g;
s/collection/set/g;
s/to\_gmap/gset\_to\_gmap/g;
s/of\_bools/bools\_to\_natset/g;
s/to_bools/natset\_to\_bools/g;
' -i $(find -name "*.v")

Impact on dependencies

I have patches for Iris, lambdarust, Iron, fri-coq and iris-examples. The amount of renaming that had to be done was fairly minimal, and was mostly done automatically using the above sed script.

  • Iris: 42 lines changed
  • Iris-examples: 8 lines changed
  • Iron: no changes needed
  • Lambdarust: 17 lines changed
  • Fri-coq: 83 lines changed (mostly changing set into propset by hand)
Edited by Robbert Krebbers

Merge request reports

Approval is optional

Merged by Robbert KrebbersRobbert Krebbers 6 years ago (Feb 20, 2019 4:48pm UTC)

Merge details

Pipeline #14844 failed

Pipeline failed for 2cf0cd35 on master

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Ralf Jung
  • Ralf Jung
  • Robbert Krebbers added 2 commits

    added 2 commits

    • ba314f45 - Consistently use `set_` prefix.
    • a3ac6324 - Better names for convertion functions from `gset` and `coPset`.

    Compare with previous version

  • Robbert Krebbers changed the description

    changed the description

  • Update: I updated the constructors of propset and boolset to become PropSet and BoolSet respectively (used to be mkSet and mkBSet).

  • Robbert Krebbers added 6 commits

    added 6 commits

    Compare with previous version

  • Robbert Krebbers added 13 commits

    added 13 commits

    • f5da0c1a...22d4a0cd - 10 commits from branch master
    • b7e31ce2 - Consistently use `set` and `map` names.
    • 31e0d1f6 - Better names for convertion functions from `gset` and `coPset`.
    • 6f5a8ecb - Rename `of_bools`/`to_bools` into `bools_to_natset`/`natset_to_bools`.

    Compare with previous version

  • Robbert Krebbers changed the description

    changed the description

  • Ralf Jung resolved all discussions

    resolved all discussions

  • Dan Frumin
  • added 1 commit

    Compare with previous version

  • Robbert Krebbers resolved all discussions

    resolved all discussions

  • Ok, I'm going to merge this. Once !45 (merged) is also merged, and I have ported the dependencies I have access to, I will add an entry to the CHANGELOG with the sed script.

  • Robbert Krebbers resolved all discussions

    resolved all discussions

  • mentioned in issue #25 (closed)

  • mentioned in commit 2cf0cd35

  • Please register or sign in to reply
    Loading