Skip to content

fix(include-subdirs): reject conflicting generated modules - #16414

Merged
anmonteiro merged 4 commits into
ocaml:mainfrom
anmonteiro:anmonteiro/fix-unqualified-generated-module-collisions-upstream
Sep 16, 2026
Merged

anmonteiro merged 4 commits into
ocaml:mainfrom
anmonteiro:anmonteiro/fix-unqualified-generated-module-collisions-upstream

Conversation

@anmonteiro

Copy link
Copy Markdown
Collaborator

Reject generated sources that conflict with other sources for the same module. Follow-up to #16410, extracted from #13691.

Check parser-generator targets and generated source merges for duplicate implementations or interfaces. Preserve implementation/interface pairs and leave same-path conflicts to the rule conflict check.

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@anmonteiro
anmonteiro marked this pull request as ready for review September 15, 2026 13:26
@anmonteiro anmonteiro added the include-subdirs-qualified The `(include_subdirs qualified)` stanza — folder names become module qualifiers label Sep 16, 2026
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@anmonteiro
anmonteiro merged commit 215adfd into ocaml:main Sep 16, 2026
18 of 19 checks passed
@anmonteiro
anmonteiro deleted the anmonteiro/fix-unqualified-generated-module-collisions-upstream branch September 16, 2026 19:10
anmonteiro added a commit that referenced this pull request Sep 17, 2026
…bdirs qualified)` (#13691)

Allow literal directory mappings in qualified groups. Fixes #7605;
follows #16414. Dynamic mappings are split into anmonteiro#191 and
bootstrap support into anmonteiro#192.

---------

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@Alizter Alizter added this to the 3.25.0 milestone Sep 17, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

include-subdirs-qualified The `(include_subdirs qualified)` stanza — folder names become module qualifiers

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants