Skip to content

Make sure coqdep does not misinterpret "Importfoo" (fix #20984). #21000

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make sure coqdep does not misinterpret "Importfoo" (fix #20984). #21000

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions tools/coqdep/lib/lexer.mll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,10 +132,9 @@ and extra_dep_rule from = parse
and require_modifiers from = parse
| "(*"
{ comment lexbuf; require_modifiers from lexbuf }
| "Import" space*
{ require_file from lexbuf }
| "Export" space*
{ require_file from lexbuf }
| ("Import" | "Export") space* ("-" space*)? ((space | "(") as p)
Copy link
Contributor

Choose a reason for hiding this comment

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

all those space* should be able to tolerate comments too (comments between - and ( were already bugged before this PR, but I think something like Require Import (* hints cause TC loop *) -(hints) foo would work before this PR)

{ if p = '(' then skip_parenthesized lexbuf;
require_file from lexbuf }
| space+
{ require_modifiers from lexbuf }
| eof
Expand Down Expand Up @@ -200,8 +199,6 @@ and load_file = parse
and require_file from = parse
| "(*"
{ comment lexbuf; require_file from lexbuf }
| ("-" space*)? "("
{ skip_parenthesized lexbuf; require_file from lexbuf }
| space+
{ require_file from lexbuf }
| coq_ident
Expand Down
Loading