Merge pull request #6415 from ibuclaw/issue17074

Fix Issue 17074: extern(C++, keyword) crashes compiler
dlang · Jan 11, 2017 · b35ec9c · b35ec9c
2 parents 45c886f + e451607
commit b35ec9c
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 0 deletions.
diff --git a/src/parse.d b/src/parse.d
@@ -2185,7 +2185,10 @@ final class Parser : Lexer
                                     }
                                 }
                                 else
+                                {
                                     error("identifier expected for C++ namespace");
+                                    idents = null;  // error occurred, invalidate list of elements.
+                                }
                                 break;
                             }
                         }

diff --git a/test/fail_compilation/ice17074.d b/test/fail_compilation/ice17074.d
@@ -0,0 +1,39 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice17074.d(9): Error: identifier expected for C++ namespace
+fail_compilation/ice17074.d(9): Error: found 'cast' when expecting ')'
+fail_compilation/ice17074.d(9): Error: declaration expected, not ')'
+---
+*/
+extern(C++, cast) void ice_keyword();
+
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice17074.d(19): Error: identifier expected for C++ namespace
+fail_compilation/ice17074.d(19): Error: found '__overloadset' when expecting ')'
+fail_compilation/ice17074.d(19): Error: declaration expected, not ')'
+---
+*/
+extern(C++, std.__overloadset) void ice_std_keyword();
+
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice17074.d(29): Error: identifier expected for C++ namespace
+fail_compilation/ice17074.d(29): Error: found '...' when expecting ')'
+fail_compilation/ice17074.d(29): Error: declaration expected, not ')'
+---
+*/
+extern(C++, ...) void ice_token();
+
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice17074.d(39): Error: identifier expected for C++ namespace
+fail_compilation/ice17074.d(39): Error: found '*' when expecting ')'
+fail_compilation/ice17074.d(39): Error: declaration expected, not ')'
+---
+*/
+extern(C++, std.*) void ice_std_token();
-Original file line number
+Diff line change
@@ Expand Up / @@ -2185,7 +2185,10 @@ final class Parser : Lexer @@
                                         }
                                     }
                                     else
+                                    {
                                         error("identifier expected for C++ namespace");
+                                        idents = null;  // error occurred, invalidate list of elements.
+                                    }
                                     break;
                                 }
                             }
@@ Expand Down @@