Skip to content

feat(include-qualified): allow renaming directories with (include_subdirs qualified) - #13691

Merged
anmonteiro merged 19 commits into
ocaml:mainfrom
anmonteiro:anmonteiro/include-qualified-rename
Sep 17, 2026
Merged

anmonteiro merged 19 commits into
ocaml:mainfrom
anmonteiro:anmonteiro/include-qualified-rename

Conversation

@anmonteiro

@anmonteiro anmonteiro commented Feb 28, 2026 •

Copy link
Copy Markdown
Collaborator

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

@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from 41011d1 to 4d36d7e Compare March 1, 2026 06:59
@anmonteiro anmonteiro changed the title feat(include-qualified): allow renaming directories with (include_subdirs qualiied) feat(include-qualified): allow renaming directories with (include_subdirs qualified) Apr 27, 2026
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from 4d36d7e to 8051e4d Compare April 27, 2026 04:34
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from 096e9e1 to 1ddf25d Compare May 23, 2026 08:50
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch 2 times, most recently from 2a4bd9a to dba6bd7 Compare June 27, 2026 08:38
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch 5 times, most recently from a125433 to 731a184 Compare June 28, 2026 01:51
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from 7fa082a to 5654043 Compare July 8, 2026 05:10
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from 3b7c982 to 60abbf5 Compare July 27, 2026 01:36
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from 60abbf5 to fc911bd Compare September 8, 2026 23:51
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>
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>
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>
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>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@anmonteiro
anmonteiro force-pushed the anmonteiro/include-qualified-rename branch from e23af2f to 05b0ae4 Compare September 14, 2026 03:49
…collisions

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
anmonteiro added a commit that referenced this pull request Sep 15, 2026
Reproduce generated sources silently replacing other module sources in
unqualified groups. Found while reviewing #13691; the extracted fix is
in anmonteiro#190.

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
anmonteiro added a commit that referenced this pull request Sep 16, 2026
Reject generated sources that conflict with other sources for the same
module. Follow-up to #16410, extracted from #13691.

---------

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
…support

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@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 9d64426 into ocaml:main Sep 17, 2026
36 of 37 checks passed
anmonteiro added a commit that referenced this pull request Sep 17, 2026
Record current failures for dynamic directory remappings. Follow-up to
#13691; the implementation and child-directory limitation test will
follow separately.

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
anmonteiro added a commit that referenced this pull request Sep 17, 2026
Support bootstrap info and bootstrap compilation for renamed qualified
directories. Follow-up to #13691.

---------

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
@Alizter Alizter added this to the 3.25.0 milestone Sep 17, 2026
anmonteiro added a commit that referenced this pull request Sep 18, 2026
…16424)

Correct inherited grouping, subdirectory stanza restrictions, and Menhir
group interface documentation. Split from anmonteiro#189;
independent of #13691.

---------

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
anmonteiro added a commit that referenced this pull request Sep 18, 2026
Document qualified directory renaming and dynamic mappings from #13691
and #16420.

Signed-off-by: Antonio Nuno Monteiro <anmonteiro@gmail.com>
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.

include_subdirs qualified should allow mapping folders to module names

2 participants