Details

Reviewers

simonpj
goldfire
austin
bgamari

Commits

rGHC0a16374109ad: Disambiguate record selectors by type signature

Summary

This makes DuplicateRecordFields more liberal in when it will
accept ambiguous record selectors, making use of type information in a
similar way to updates. See Note [Disambiguating record fields] for more
details (and I'll update the wiki page when I have time)...

It builds on D1331 because I'm lazy.

Test Plan

New and amended tests in overloadedrecflds

Diff Detail

Repository

rGHC Glasgow Haskell Compiler

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

adamgundry retitled this revision from to Disambiguate record selectors by type signature.Oct 28 2015, 12:07 PM

adamgundry updated this object.

adamgundry edited the test plan for this revision. (Show Details)

adamgundry added reviewers: austin, bgamari, goldfire, simonpj.

Herald added a subscriber: thomie. · View Herald TranscriptOct 28 2015, 12:07 PM

Refactoring and minor bug fixes

Handle record selectors properly in Template Haskell
Refactor disambiguateRecordBinds and make errors more uniform
Handle non-fields appearing in updates
More refactoring and fixing of comments
Refactor to make lint happy

Crumbs. The code is substantially LONGER than before. Why?

Still, it is at least modularly separated.

In D1391#40239, @simonpj wrote:

Crumbs. The code is substantially LONGER than before. Why?

Still, it is at least modularly separated.

There aren't any fundamental changes, but there are a lot more comments/definitions to clarify what's going on and I've stuck more rigidly to the 80-character restriction. I can condense it a bit if you think that is preferable.

Don't worry, I'm just bleating. Go for it.

Rebase on latest HEAD (with record pattern synonyms), separate from OverloadedLabels

Handle record selectors properly in Template Haskell
Refactor disambiguateRecordBinds and make errors more uniform
Handle non-fields appearing in updates
More refactoring and fixing of comments
Refactor to make lint happy
Merge remote-tracking branch 'origin/master' into wip/duplicate-record-fields-selector-disambiguation

Resolve conflict with Simon's lovely addUsedGRE changes

Merge remote-tracking branch 'origin/master' into wip/duplicate-record-fields-selector-disambiguation

Closed by commit rGHC0a16374109ad: Disambiguate record selectors by type signature (authored by adamgundry). · Explain WhyOct 30 2015, 9:15 AM

This revision was automatically updated to reflect the committed changes.

		Path
M		compiler/deSugar/DsExpr.hs (2 lines)
M		compiler/deSugar/DsMeta.hs (6 lines)
M		compiler/hsSyn/HsExpr.hs (8 lines)
M		compiler/hsSyn/HsPat.hs (2 lines)
M		compiler/hsSyn/HsTypes.hs (5 lines)
M		compiler/rename/RnEnv.hs (1 line)
M		compiler/rename/RnExpr.hs (11 lines)
M		compiler/rename/RnPat.hs (2 lines)
M		compiler/typecheck/TcExpr.hs (314 lines)
M		testsuite/tests/overloadedrecflds/should_fail/all.T (2 lines)
M		testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail01.stderr (14 lines)
M		testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.hs (2 lines)
M		testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail09.stderr (2 lines)
M		testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.hs (3 lines)
M		testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr (4 lines)
A	M	testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.hs (20 lines)
A	M	testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr (22 lines)
A	M	testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail14.hs (14 lines)
A	M	testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail14.stderr (5 lines)
M		testsuite/tests/overloadedrecflds/should_run/all.T (1 line)
A	M	testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.hs (21 lines)
A	M	testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.stdout (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	4742	e7d0614		Oct 28 2015, 12:07 PM	★	★
Diff 2	4770	e7d0614	Refactoring and minor bug fixes	Oct 29 2015, 4:50 PM	★	★
Diff 3	4785	8ddf417	Rebase on latest HEAD (with record pattern synonyms), separate from OverloadedLabels	Oct 30 2015, 6:51 AM	★	★
Diff 4	4786	268aa9a	Resolve conflict with Simon's lovely addUsedGRE changes	Oct 30 2015, 7:52 AM	★	★
Diff 5	4787	268aa9a	Commit rGHC0a16374109ad16d9337185f5c0a845a3f20141cb	Oct 30 2015, 9:14 AM	★	★

Commit	Tree	Parents	Author	Summary	Date
9bfd034c3c73	024a9d8a6505	0ff78400ae88 268aa9a2ee98	Adam Gundry	Merge remote-tracking branch 'origin/master' into wip/duplicate-record-fields… (Show More…)	Oct 30 2015, 7:50 AM
0ff78400ae88	9eee30ab9d32	b03242b4ac5e 8ddf41744ea8	Adam Gundry	Merge remote-tracking branch 'origin/master' into wip/duplicate-record-fields… (Show More…)	Oct 30 2015, 6:09 AM
b03242b4ac5e	9a92d70ef3fa	d3205e10c5af	Adam Gundry	Refactor to make lint happy	Oct 29 2015, 4:49 PM
d3205e10c5af	575e5792fa5b	323254e266ba	Adam Gundry	More refactoring and fixing of comments	Oct 29 2015, 4:47 PM
323254e266ba	0ee537634722	079335acea7d	Adam Gundry	Handle non-fields appearing in updates	Oct 29 2015, 4:38 PM
079335acea7d	da089d7a40e3	3e264dec42fb	Adam Gundry	Refactor disambiguateRecordBinds and make errors more uniform	Oct 29 2015, 4:31 PM
3e264dec42fb	459fb262c50e	a924e4fba9ce	Adam Gundry	Handle record selectors properly in Template Haskell	Oct 29 2015, 4:01 PM
a924e4fba9ce	04c263f5d7b1	3f5ff5969952	Adam Gundry	Disambiguate record selectors by type signature (Show More…)	Oct 28 2015, 12:00 PM
3f5ff5969952	4dc90c646aad	acf59d562a8e	Adam Gundry	Tidying	Oct 28 2015, 11:51 AM
acf59d562a8e	1269fc06ab7b	936ff425ab37	Adam Gundry	Reuse unknown subordinate error message	Oct 28 2015, 11:50 AM
936ff425ab37	b1e57ce86415	65106bb017ba	Adam Gundry	Refactoring and better error message generation	Oct 28 2015, 11:44 AM
65106bb017ba	1cff029388d9	036efda4e439	Adam Gundry	Comments on selector disambiguation	Oct 28 2015, 11:08 AM
036efda4e439	58175f2fc8a2	eca39bfe454a	Adam Gundry	Check for DuplicateRecordFields before allowing selector disambiguation	Oct 23 2015, 11:48 AM
eca39bfe454a	6cd0eef069d6	242482a94aa0	Adam Gundry	Generate sensible error when applying a selector to a bad signature	Oct 23 2015, 11:42 AM
242482a94aa0	2a47072e3c5b	c25fcfc7f1d8	Adam Gundry	Add tests for selector disambiguation	Oct 23 2015, 11:29 AM
c25fcfc7f1d8	013d24faf46f	b1884b0e62f6	Adam Gundry	Initial work on disambiguating selectors by type signature	Oct 23 2015, 11:19 AM

Disambiguate record selectors by type signature
ClosedPublic
Actions

Details

Diff Detail

Revision Contents

Diff 4787

compiler/deSugar/DsExpr.hs

compiler/deSugar/DsMeta.hs

compiler/hsSyn/HsExpr.hs

compiler/hsSyn/HsPat.hs

compiler/hsSyn/HsTypes.hs

compiler/rename/RnEnv.hs

compiler/rename/RnExpr.hs

compiler/rename/RnPat.hs

compiler/typecheck/TcExpr.hs

testsuite/tests/overloadedrecflds/should_fail/all.T

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail01.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail09.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail14.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail14.stderr

testsuite/tests/overloadedrecflds/should_run/all.T

testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.hs

testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.stdout

Disambiguate record selectors by type signatureClosedPublicActions

Details

Diff Detail

Revision Contents

Diff 4787

compiler/deSugar/DsExpr.hs

compiler/deSugar/DsMeta.hs

compiler/hsSyn/HsExpr.hs

compiler/hsSyn/HsPat.hs

compiler/hsSyn/HsTypes.hs

compiler/rename/RnEnv.hs

compiler/rename/RnExpr.hs

compiler/rename/RnPat.hs

compiler/typecheck/TcExpr.hs

testsuite/tests/overloadedrecflds/should_fail/all.T

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail01.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail04.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail09.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail12.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail13.stderr

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail14.hs

testsuite/tests/overloadedrecflds/should_fail/overloadedrecfldsfail14.stderr

testsuite/tests/overloadedrecflds/should_run/all.T

testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.hs

testsuite/tests/overloadedrecflds/should_run/overloadedrecfldsrun06.stdout

Disambiguate record selectors by type signature
ClosedPublic
Actions