fix #353 - Syntax error on templatized variable declarations

dlang-community · May 27, 2019 · 4c0e521 · 4c0e521
1 parent 22ebe99
commit 4c0e521
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/src/dparse/parser.d b/src/dparse/parser.d
@@ -2303,10 +2303,19 @@ class Parser
                     error("no identifier for declarator");
                 return null;
             }
-            if (peekIs(tok!"("))
-                mixin (nullCheck!`node.functionDeclaration = parseFunctionDeclaration(t, false)`);
-            else
-                mixin (nullCheck!`node.variableDeclaration = parseVariableDeclaration(t, false)`);
+            const b2 = setBookmark();
+            node.variableDeclaration = parseVariableDeclaration(t, false);
+            if (node.variableDeclaration is null)
+            {
+                goToBookmark(b2);
+                node.functionDeclaration = parseFunctionDeclaration(t, false);
+            }
+            else abandonBookmark(b2);
+            if (!node.variableDeclaration && !node.functionDeclaration)
+            {
+                error("invalid variable declaration or function declaration", false);
+                return null;
+            }
             break;
         case tok!"version":
             if (peekIs(tok!"("))

diff --git a/test/pass_files/declarations.d b/test/pass_files/declarations.d
@@ -97,8 +97,12 @@ __traits(getMember, Foo, "Bar") fooBar;
 const(__traits(getMember, Foo, "Bar")) fooBar;
 alias FooBar = __traits(getMember, Foo, "Bar");
 const fooBar = cast(__traits(getMember, Foo, "Bar")) __traits(getMember, Foo, "bar");
+int twice(int x) = 2 * x;
+const int twice(int x) = 2 * x;
+immutable int twice(int x) = 2 * x;
 
 void foo()
 {
     __traits(getMember, Foo, "Bar") fooBar;
+    immutable int twice(int x) = 2 * x;
 }