languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-11-02 10:49:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

Refactor parseType in preparation for bigger changes.

Browse source 
R=danrubel@google.com

Review-Url: https://codereview.chromium.org/2951463002 .
This commit is contained in:
Peter von der Ahé 2017-06-22 12:47:51 +02:00
parent 232684aac0
commit 94a44e0290
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
pkg/front_end/lib/src/fasta/parser/parser.dart
View file

@ -201,8 +201,8 @@ enum Assert {
/// Parse methods are generally named `parseGrammarProductionSuffix`. The
/// suffix can be one of `opt`, or `star`. `opt` means zero or one matches,
/// `star` means zero or more matches. For example, [parseMetadataStar]
/// corresponds to this grammar snippet: `metadata*`, and [parseTypeOpt]
/// corresponds to: `type?`.
/// corresponds to this grammar snippet: `metadata*`, and [parseArgumentsOpt]
/// corresponds to: `arguments?`.
///
/// ## Implementation Notes
///
@ -622,7 +622,7 @@ class Parser {
token = expect('=', token);
token = parseType(token);
} else {
token = parseReturnTypeOpt(token.next);
token = parseType(token.next, isOptional: true);
token = parseIdentifier(token, IdentifierContext.typedefDeclaration);
token = parseTypeVariablesOpt(token);
token = parseFormalParameters(token, MemberKind.FunctionTypeAlias);
@ -641,19 +641,6 @@ class Parser {
return token;
}
Token parseReturnTypeOpt(Token token) {
if (identical(token.stringValue, 'void')) {
if (isGeneralizedFunctionType(token.next)) {
return parseType(token);
} else {
listener.handleVoidKeyword(token);
return token.next;
}
} else {
return parseTypeOpt(token);
}
}
Token parseFormalParametersOpt(Token token, MemberKind kind) {
if (optional('(', token)) {
return parseFormalParameters(token, kind);
@ -833,20 +820,6 @@ class Parser {
}
}
Token parseTypeOpt(Token token) {
if (isGeneralizedFunctionType(token)) {
// Function type without return type.
return parseType(token);
}
token = listener.injectGenericCommentTypeAssign(token);
Token peek = peekAfterIfType(token);
if (peek != null && (peek.isIdentifier || optional('this', peek))) {
return parseType(token);
}
listener.handleNoType(token);
return token;
}
bool isValidTypeReference(Token token) {
int kind = token.kind;
if (IDENTIFIER_TOKEN == kind) return true;
@ -1166,7 +1139,33 @@ class Parser {
(optional('<', token.next) || optional('(', token.next));
}
Token parseType(Token token) {
Token parseType(Token token, {bool isOptional: false}) {
if (isOptional) {
do {
if (optional("void", token)) {
if (isGeneralizedFunctionType(token.next)) {
// This is a type, parse it.
break;
} else {
listener.handleVoidKeyword(token);
return token.next;
}
} else {
if (isGeneralizedFunctionType(token)) {
// Function type without return type, parse it.
break;
}
token = listener.injectGenericCommentTypeAssign(token);
Token peek = peekAfterIfType(token);
if (peek != null && (peek.isIdentifier || optional('this', peek))) {
// This is a type followed by an identifier, parse it.
break;
}
listener.handleNoType(token);
return token;
}
} while (false);
}
Token begin = token;
if (isGeneralizedFunctionType(token)) {
// A function type without return type.
@ -1400,7 +1399,7 @@ class Parser {
if (type == null) {
listener.handleNoType(name);
} else {
parseReturnTypeOpt(type);
parseType(type, isOptional: true);
}
Token token =
parseIdentifier(name, IdentifierContext.topLevelFunctionDeclaration);
@ -1800,11 +1799,7 @@ class Parser {
listener.handleModifiers(count);
Token beforeType = token;
if (returnTypeAllowed) {
token = parseReturnTypeOpt(token);
} else {
token = typeRequired ? parseType(token) : parseTypeOpt(token);
}
token = parseType(token, isOptional: returnTypeAllowed || !typeRequired);
if (typeRequired && beforeType == token) {
reportRecoverableErrorCode(token, codeTypeRequired);
}
@ -2109,7 +2104,7 @@ class Parser {
if (type == null) {
listener.handleNoType(name);
} else {
parseReturnTypeOpt(type);
parseType(type, isOptional: true);
}
Token token;
if (optional('operator', name)) {
@ -2243,7 +2238,7 @@ class Parser {
Token beginToken = token;
listener.beginFunction(token);
listener.handleModifiers(0);
token = parseReturnTypeOpt(token);
token = parseType(token, isOptional: true);
listener.beginFunctionName(token);
token = parseIdentifier(token, IdentifierContext.functionExpressionName);
listener.endFunctionName(beginToken, token);

5
pkg/kernel/lib/text/ast_to_text.dart
View file

@ -1409,7 +1409,12 @@ class Printer extends Visitor<Null> {
visitFunctionDeclaration(FunctionDeclaration node) {
writeIndentation();
writeWord('function');
if (node.function != null) {
writeFunction(node.function, name: getVariableName(node.variable));
} else {
writeWord(getVariableName(node.variable));
endLine('...;');
}
}
void writeVariableDeclaration(VariableDeclaration node,