Merge pull request #119 from callumenator/mixin-fix

Allow typeof expression in template mixin
2014-02-21 21:52:43 -08:00 · 2014-02-21 21:52:43 -08:00 · 8060fbb565
parent 20d90c412a faf17b8afe
commit 8060fbb565
1 changed files with 1 additions and 1 deletions
--- a/stdx/d/parser.d
+++ b/stdx/d/parser.d
@ -3384,7 +3384,7 @@ invariant() foo();
    {
        mixin(traceEnterAndExit!(__FUNCTION__));
        auto node = new MixinDeclaration;
-        if (peekIs(tok!"identifier"))
+        if (peekIs(tok!"identifier") || peekIs(tok!"typeof"))
            node.templateMixinExpression = parseTemplateMixinExpression();
        else if (peekIs(tok!"("))
            node.mixinExpression = parseMixinExpression();