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

destruct: destructing punned record field breaks syntax #1734

Merged
merged 2 commits into from
Mar 5, 2024
Merged

destruct: destructing punned record field breaks syntax #1734

merged 2 commits into from
Mar 5, 2024

Conversation

xvw
Copy link
Collaborator

@xvw xvw commented Feb 22, 2024 •
edited
Loading

Destructing a record punning field produced invalid OCaml syntax, as described in #1661, the case where we deconstruct on a, the a is substituted by the result of the deconstruction, whereas we would like to produce a = destruct_result.

fix #1661

@xvw xvw force-pushed the 1661-destructing-punned-record-field-breaks-syntax branch 3 times, most recently from 3ddfd53 to 9b2baad Compare February 23, 2024 15:16
@xvw xvw changed the title FIX 1661: destructing punned record field breaks syntax destruct: destructing punned record field breaks syntax Feb 23, 2024
@xvw xvw force-pushed the 1661-destructing-punned-record-field-breaks-syntax branch 3 times, most recently from c2be4f1 to 3caee43 Compare February 27, 2024 17:14
voodoos
voodoos approved these changes Mar 5, 2024
View reviewed changes
Copy link
Collaborator

@voodoos voodoos left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @xvw the changes looks good to me.

src/analysis/destruct.ml Outdated Show resolved Hide resolved
src/analysis/destruct.ml Outdated Show resolved Hide resolved
voodoos
voodoos reviewed Mar 5, 2024
View reviewed changes
CHANGES.md Outdated Show resolved Hide resolved
@xvw xvw force-pushed the 1661-destructing-punned-record-field-breaks-syntax branch from bc52339 to 8ec1a19 Compare March 5, 2024 15:09
@xvw xvw force-pushed the 1661-destructing-punned-record-field-breaks-syntax branch from 8ec1a19 to 943c885 Compare March 5, 2024 15:23
@voodoos voodoos merged commit b274d31 into ocaml:master Mar 5, 2024
9 of 10 checks passed
@xvw xvw deleted the 1661-destructing-punned-record-field-breaks-syntax branch March 5, 2024 15:43
voodoos added a commit to voodoos/merlin that referenced this pull request May 13, 2024
@voodoos
[B] Fix ocaml#1661 field-erasure for destruct punning field (ocaml#1734)
66b9d9b 
from xvw/1661-destructing-punned-record-field-breaks-syntax
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 17, 2024
@voodoos
[new release] merlin (3 packages) (5.0-502)
1fded17 
CHANGES:

Fri May 17 19:59:42 CET 2024

  + merlin binary
    - Support for OCaml 5.2 (ocaml/merlin#1757)
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
    - Addition of a `merlin-lib.commands` library which disassociates the
      execution of commands from the `new_protocol`, from the binary, allowing
      it to be invoked from other projects (ocaml/merlin#1758)
    - New occurrences backend: Don't index occurrences when `merlin.hide`
      attribute is present. (ocaml/merlin#1768)
    - Use the new `uid_to_decl` table in 5.2's cmt files to get documentation.
      (ocaml/merlin#1773)
@voodoos voodoos mentioned this pull request May 17, 2024
Merged
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin (3 packages) (4.15-501)
2cf5ede 
CHANGES:

May May 31 14:02:42 CET 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin (3 packages) (4.15-414)
49ef452 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin (3 packages) (4.15-501)
f6fdba8 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
voodoos added a commit to voodoos/opam-repository that referenced this pull request May 31, 2024
@voodoos
[new release] merlin and merlin-lib v4.15-414/501
776ae45 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
@voodoos voodoos mentioned this pull request May 31, 2024
Merged
avsm pushed a commit to avsm/opam-repository that referenced this pull request Sep 5, 2024
@voodoos @avsm
[new release] merlin and merlin-lib v4.15-414/501
c9ab3f5 
CHANGES:

Fri May 31 14:02:42 CEST 2024

  + merlin binary
    - destruct: Removal of residual patterns (ocaml/merlin#1737, fixes ocaml/merlin#1560)
    - Do not erase fields' names when destructing punned record fields (ocaml/merlin#1734,
      fixes ocaml/merlin#1661)
    - Ignore SIGPIPE in the Merlin server process (ocaml/merlin#1746)
    - Fix lexing of quoted strings in comments (ocaml/merlin#1754, fixes ocaml/merlin#1753)
    - Improve cursor position detection in longidents (ocaml/merlin#1756)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@voodoos voodoos voodoos approved these changes

Assignees
No one assigned
Labels
None yet
Projects
Backport to 501
Status: 5.0-501
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Destructing punned record field breaks syntax
2 participants
@xvw @voodoos