This commit is contained in:
Hackerpilot 2014-04-14 14:07:33 -07:00
parent 7c49a32de0
commit 5f62054f38
1 changed files with 17 additions and 2 deletions

View File

@ -4522,8 +4522,18 @@ q{(int a, ...)
if (!currentIs(tok!"]")) if (!currentIs(tok!"]"))
{ {
node.lower = parseAssignExpression(); node.lower = parseAssignExpression();
if (node.lower is null)
{
error("assignExpression expected");
return null;
}
expect(tok!".."); expect(tok!"..");
node.upper = parseAssignExpression(); node.upper = parseAssignExpression();
if (node.upper is null)
{
error("assignExpression expected");
return null;
}
} }
if (expect(tok!"]") is null) return null; if (expect(tok!"]") is null) return null;
return node; return node;
@ -4777,8 +4787,13 @@ q{(int a, ...)
mixin(traceEnterAndExit!(__FUNCTION__)); mixin(traceEnterAndExit!(__FUNCTION__));
auto node = allocate!StructInitializer; auto node = allocate!StructInitializer;
expect(tok!"{"); expect(tok!"{");
node.structMemberInitializers = parseStructMemberInitializers(); if (currentIs(tok!"}"))
expect(tok!"}"); advance();
else
{
node.structMemberInitializers = parseStructMemberInitializers();
expect(tok!"}");
}
return node; return node;
} }