Merge pull request #7939 from wilzbach/revert-6589

Revert "fix Issue 13855 - multi-module selective import statements" merged-on-behalf-of: unknown
dlang · Feb 23, 2018 · 3955897 · 3955897
2 parents 08e3b8f + ddbdfb4
commit 3955897
Show file tree

Hide file tree

Showing 5 changed files with 1 addition and 46 deletions.
diff --git a/changelog/multi_module_selective_imports.dd b/changelog/multi_module_selective_imports.dd
diff --git a/src/dmd/parse.d b/src/dmd/parse.d
@@ -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;
         }

diff --git a/test/compilable/enh13855.d b/test/compilable/enh13855.d
diff --git a/test/fail_compilation/enh13855a.d b/test/fail_compilation/enh13855a.d
diff --git a/test/fail_compilation/enh13855b.d b/test/fail_compilation/enh13855b.d