Skip to content

Commit

Permalink
Merge pull request #5184 from 9rnsr/refactor_isDeclaration_param
Browse files Browse the repository at this point in the history 
Add enum NeedDeclaratorId aus use it for Parse.isDeclaration parameter
  • Loading branch information
@yebblies
yebblies committed Oct 11, 2015
2 parents d2c607f + 623ee32 commit 0371078
Showing 1 changed file with 31 additions and 23 deletions.
54 changes: 31 additions & 23 deletions src/parse.d
View file
Expand Up @@ -1475,7 +1475,7 @@ public:
nextToken();
loc = token.loc; // todo
Type spectype = null;
if (isDeclaration(&token, 2, TOKreserved, null))
if (isDeclaration(&token, NeedDeclaratorId.must, TOKreserved, null))
{
spectype = parseType(&tp_ident);
}
Expand All @@ -1493,7 +1493,7 @@ public:
if (token.value == TOKcolon) // : Type
{
nextToken();
if (isDeclaration(&token, 0, TOKreserved, null))
if (isDeclaration(&token, NeedDeclaratorId.no, TOKreserved, null))
spec = parseType();
else
spec = parseCondExp();
Expand All @@ -1502,7 +1502,7 @@ public:
if (token.value == TOKassign) // = Type
{
nextToken();
if (isDeclaration(&token, 0, TOKreserved, null))
if (isDeclaration(&token, NeedDeclaratorId.no, TOKreserved, null))
def = parseType();
else
def = parseCondExp();
Expand Down Expand Up @@ -1748,7 +1748,7 @@ public:
while (token.value != endtok)
{
// See if it is an Expression or a Type
if (isDeclaration(&token, 0, TOKreserved, null))
if (isDeclaration(&token, NeedDeclaratorId.no, TOKreserved, null))
{
// Template argument is a type
Type ta = parseType();
Expand Down Expand Up @@ -3364,7 +3364,7 @@ public:
nextToken();
return t;
}
else if (isDeclaration(&token, 0, TOKrbracket, null))
else if (isDeclaration(&token, NeedDeclaratorId.no, TOKrbracket, null))
{
// This can be one of two things:
// 1 - an associative array declaration, T[type]
Expand Down Expand Up @@ -3443,7 +3443,7 @@ public:
t = new TypeDArray(t); // []
nextToken();
}
else if (isDeclaration(&token, 0, TOKrbracket, null))
else if (isDeclaration(&token, NeedDeclaratorId.no, TOKrbracket, null))
{
// It's an associative array declaration
//printf("it's an associative array\n");
Expand Down Expand Up @@ -3578,7 +3578,7 @@ public:
nextToken();
*palt |= 2;
}
else if (isDeclaration(&token, 0, TOKrbracket, null))
else if (isDeclaration(&token, NeedDeclaratorId.no, TOKrbracket, null))
{
// It's an associative array
//printf("it's an associative array\n");
Expand Down Expand Up @@ -4459,7 +4459,7 @@ public:
/* Bugzilla 15163: If tokens can be handled as
* old C-style declaration or D expression, prefer the latter.
*/
if (isDeclaration(&token, 3, TOKreserved, null))
if (isDeclaration(&token, NeedDeclaratorId.mustIfDstyle, TOKreserved, null))
goto Ldeclaration;
else
goto Lexp;
Expand Down Expand Up @@ -4942,7 +4942,7 @@ public:
check(TOKassign);
param = new Parameter(storageClass, at, ai, null);
}
else if (isDeclaration(&token, 2, TOKassign, null))
else if (isDeclaration(&token, NeedDeclaratorId.must, TOKassign, null))
{
Identifier ai;
Type at = parseType(&ai);
Expand Down Expand Up @@ -5711,17 +5711,22 @@ public:
error(e.loc, "%s must be parenthesized when next to operator %s", e.toChars(), Token.toChars(value));
}

enum NeedDeclaratorId
{
no, // Declarator part must have no identifier
opt, // Declarator part identifier is optional
must, // Declarator part must have identifier
mustIfDstyle, // Declarator part must have identifier, but don't recognize old C-style syntax
}

/************************************
* Determine if the scanner is sitting on the start of a declaration.
* Input:
* needId 0 no identifier
* 1 identifier optional
* 2 must have identifier
* 3 must have identifier, but don't recognize old C-style syntax.
* Params:
* needId
* Output:
* if *pt is not NULL, it is set to the ending token, which would be endtok
*/
bool isDeclaration(Token* t, int needId, TOK endtok, Token** pt)
bool isDeclaration(Token* t, NeedDeclaratorId needId, TOK endtok, Token** pt)
{
//printf("isDeclaration(needId = %d)\n", needId);
int haveId = 0;
Expand All @@ -5744,9 +5749,12 @@ public:
{
goto Lisnot;
}
if (!isDeclarator(&t, &haveId, &haveTpl, endtok, needId != 3))
if (!isDeclarator(&t, &haveId, &haveTpl, endtok, needId != NeedDeclaratorId.mustIfDstyle))
goto Lisnot;
if (needId == 1 || (needId == 0 && !haveId) || ((needId == 2 || needId == 3) && haveId))
if ((needId == NeedDeclaratorId.no && !haveId) ||
(needId == NeedDeclaratorId.opt) ||
(needId == NeedDeclaratorId.must && haveId) ||
(needId == NeedDeclaratorId.mustIfDstyle && haveId))
{
if (pt)
*pt = t;
Expand Down Expand Up @@ -5907,7 +5915,7 @@ public:
if (t.value != TOKlparen)
goto Lfalse;
t = peek(t);
if (!isDeclaration(t, 0, TOKrparen, &t))
if (!isDeclaration(t, NeedDeclaratorId.no, TOKrparen, &t))
{
goto Lfalse;
}
Expand Down Expand Up @@ -5947,7 +5955,7 @@ public:
{
t = peek(t);
}
else if (isDeclaration(t, 0, TOKrbracket, &t))
else if (isDeclaration(t, NeedDeclaratorId.no, TOKrbracket, &t))
{
// It's an associative array declaration
t = peek(t);
Expand Down Expand Up @@ -6044,7 +6052,7 @@ public:
{
t = peek(t);
}
else if (isDeclaration(t, 0, TOKrbracket, &t))
else if (isDeclaration(t, NeedDeclaratorId.no, TOKrbracket, &t))
{
// It's an associative array declaration
t = peek(t);
Expand Down Expand Up @@ -6165,7 +6173,7 @@ public:
if (t.value == TOKlparen)
{
t = peek(t);
if (!isDeclaration(t, 0, TOKrparen, &t))
if (!isDeclaration(t, NeedDeclaratorId.no, TOKrparen, &t))
return false;
t = peek(t); // skip past closing ')'
goto L2;
Expand Down Expand Up @@ -6740,7 +6748,7 @@ public:
nextToken();
check(TOKlparen, "typeid");
RootObject o;
if (isDeclaration(&token, 0, TOKreserved, null))
if (isDeclaration(&token, NeedDeclaratorId.no, TOKreserved, null))
{
// argument is a type
o = parseType();
Expand Down Expand Up @@ -7085,7 +7093,7 @@ public:
static if (CCASTSYNTAX)
{
// If cast
if (isDeclaration(tk, 0, TOKrparen, &tk))
if (isDeclaration(tk, NeedDeclaratorId.no, TOKrparen, &tk))
{
tk = peek(tk); // skip over right parenthesis
switch (tk.value)
Expand Down

0 comments on commit 0371078

Please sign in to comment.