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.

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

Jump to bottom

Revert "fix Issue 13855 - multi-module selective import statements" #7939

Merged
merged 1 commit into from
Feb 23, 2018
Merged

Revert "fix Issue 13855 - multi-module selective import statements" #7939

Show file tree
Hide file tree
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
19 changes: 0 additions & 19 deletions changelog/multi_module_selective_imports.dd
View file
Open in desktop

This file was deleted.

7 changes: 1 addition & 6 deletions src/dmd/parse.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3275,14 +3275,9 @@ final class Parser(AST) : Lexer
_alias = null;
}
s.addAlias(name, _alias);
if (token.value != TOK.comma)
break;
// recognize import pkg.mod1 : a, b, pkg.mod2;
if (peekNext2 == TOK.dot || // pkg . mod2
peekNext2 == TOK.colon) // mod2 : c
break; // parse another import
}
while (token.value == TOK.comma);
break; // no comma-separated imports of this form
}
aliasid = null;
}
Expand Down
3 changes: 0 additions & 3 deletions test/compilable/enh13855.d
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions test/fail_compilation/enh13855a.d
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions test/fail_compilation/enh13855b.d
View file
Open in desktop

This file was deleted.