Merge pull request #5143 from 9rnsr/fix15127

Issue 15127 - Parser assertion on wrong code
dlang · Sep 30, 2015 · eb1c764 · eb1c764
2 parents 5b0471d + e9ca948
commit eb1c764
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/src/parse.d b/src/parse.d
@@ -1100,8 +1100,7 @@ public:
             TemplateParameters* tpl = null;
             if (token.value == TOKlparen)
                 tpl = parseTemplateParameterList();
-            assert(token.value == TOKassign);
-            nextToken(); // skip over '='
+            check(TOKassign);   // skip over '='
             Initializer _init = parseInitializer();
             auto v = new VarDeclaration(loc, null, ident, _init);
             v.storage_class = storageClass;

diff --git a/test/fail_compilation/ice15127.d b/test/fail_compilation/ice15127.d
@@ -0,0 +1,20 @@
+/*
+TEST_OUTPUT:
+---
+fail_compilation/ice15127.d(17): Error: basic type expected, not struct
+fail_compilation/ice15127.d(17): Error: identifier expected for template value parameter
+fail_compilation/ice15127.d(17): Error: found 'struct' when expecting ')'
+fail_compilation/ice15127.d(17): Error: found 'ExampleStruct' when expecting '='
+fail_compilation/ice15127.d(17): Error: semicolon expected following auto declaration, not ')'
+fail_compilation/ice15127.d(17): Error: declaration expected, not ')'
+---
+*/
+
+struct ExampleStruct(S) { }
+
+template ExampleTemplate(K)
+{
+    enum ExampleTemplate(struct ExampleStruct(K)) = K;
+}
+
+void main() {}