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.

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

Fixes #1691 (and removes partial match warning) #1692

Merged
merged 8 commits into from
Jul 2, 2024
Merged

Fixes #1691 (and removes partial match warning) #1692

merged 8 commits into from
Jul 2, 2024

Conversation

yav
Copy link
Member

@yav yav commented Jun 28, 2024

No description provided.

Copy link
Contributor

@RyanGlScott RyanGlScott left a comment

Choose a reason for hiding this comment

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

LGTM, aside from some minor spelling and style suggestions.

CHANGES.md Outdated Show resolved Hide resolved
src/Cryptol/ModuleSystem/Renamer/ImplicitImports.hs Outdated Show resolved Hide resolved
Comment on lines -172 to +174
NormalName -> ModName m AnonModArgName
AnonModArgName -> panic "modNameArg" ["Name is not normal"]
AnonIfaceModName -> panic "modNameArg" ["Name is not normal"]
NormalName -> ModName m AnonModArgName
_ -> panic "modNameArg" ["Name is not normal"]
Copy link
Contributor

Choose a reason for hiding this comment

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

I generally prefer enumerating the data constructors instead of using a wildcard pattern, as this makes it harder to forget this code later if we ever change the definition of MaybeAnon. I'll defer to your judgment on which is better, however.

Comment on lines -182 to +183
AnonModArgName -> panic "modNameIfaceMod" ["Name is not normal"]
AnonIfaceModName -> panic "modNameIfaceMod" ["Name is not normal"]
_ -> panic "modNameIfaceMod" ["Name is not normal"]
Copy link
Contributor

Choose a reason for hiding this comment

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

A similar comment about wildcard patterns here.

@RyanGlScott
Copy link
Contributor

Also, there is a test suite failure on Windows:

      issue1455_3.icry: [Failed]
21,28d20
< Submodules
< ==========
<     
<   From Inst3
<   ----------
<        
<     import of F at issue1455\G.cry:5:1--5:9
<      
278,283d269
<      
<   From Inst3::import of F at issue1455\G.cry:5:1--5:9
<   ---------------------------------------------------
<        
<     a : [4]
<     b : [8]

# If output is OK:
cp D:\a\cryptol\cryptol\output\.\tests\issues\issue1455_3.icry.stdout \
     D:\a\cryptol\cryptol\tests\issues\issue1455_3.icry.stdout.mingw32

yav and others added 4 commits July 1, 2024 09:34
Co-authored-by: Ryan Scott <rscott@galois.com>
Co-authored-by: Ryan Scott <rscott@galois.com>
# Conflicts:
#	CHANGES.md
@yav yav merged commit 623ea9b into master Jul 2, 2024
45 checks passed
@yav yav deleted the issue_1691 branch July 2, 2024 02:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants