Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(378)

Side by Side Diff: dart/frog/leg/scanner/parser.dart

Issue 8993009: Implement string interpolation up to SSA. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge
Patch Set: Address (some) review comments and update status file Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « dart/frog/leg/scanner/listener.dart ('k') | dart/frog/leg/scanner/scanner.dart » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 /** 5 /**
6 * An event generating parser of Dart programs. This parser expects 6 * An event generating parser of Dart programs. This parser expects
7 * all tokens in a linked list. 7 * all tokens in a linked list.
8 */ 8 */
9 class Parser { 9 class Parser {
10 final Listener listener; 10 final Listener listener;
(...skipping 1041 matching lines...) Expand 10 before | Expand all | Expand 10 after
1052 } else if (optional('[]', token)) { 1052 } else if (optional('[]', token)) {
1053 listener.handleLiteralList(0, token, constKeyword, token); 1053 listener.handleLiteralList(0, token, constKeyword, token);
1054 return token.next; 1054 return token.next;
1055 } else { 1055 } else {
1056 listener.unexpected(token); 1056 listener.unexpected(token);
1057 } 1057 }
1058 } 1058 }
1059 1059
1060 Token parseMapLiteralEntry(Token token) { 1060 Token parseMapLiteralEntry(Token token) {
1061 listener.beginLiteralMapEntry(token); 1061 listener.beginLiteralMapEntry(token);
1062 token = parseString(token); 1062 // Assume the listener rejects non-string keys.
1063 token = parseExpression(token);
1063 token = expect(':', token); 1064 token = expect(':', token);
1064 token = parseExpression(token); 1065 token = parseExpression(token);
1065 listener.endLiteralMapEntry(token); 1066 listener.endLiteralMapEntry(token);
1066 return token; 1067 return token;
1067 } 1068 }
1068 1069
1069 Token parseSendOrFunctionLiteral(Token token) { 1070 Token parseSendOrFunctionLiteral(Token token) {
1070 if (!mayParseFunctionExpressions) return parseSend(token); 1071 if (!mayParseFunctionExpressions) return parseSend(token);
1071 Token peek = peekAfterType(token); 1072 Token peek = peekAfterType(token);
1072 if (peek.kind === IDENTIFIER_TOKEN && isFunctionDeclaration(peek.next)) { 1073 if (peek.kind === IDENTIFIER_TOKEN && isFunctionDeclaration(peek.next)) {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
1130 } 1131 }
1131 1132
1132 Token parseLiteralDouble(Token token) { 1133 Token parseLiteralDouble(Token token) {
1133 listener.handleLiteralDouble(token); 1134 listener.handleLiteralDouble(token);
1134 return token.next; 1135 return token.next;
1135 } 1136 }
1136 1137
1137 Token parseLiteralString(Token token) { 1138 Token parseLiteralString(Token token) {
1138 listener.handleLiteralString(token); 1139 listener.handleLiteralString(token);
1139 token = token.next; 1140 token = token.next;
1141 int interpolationCount = 0;
1140 while (optional('\${', token)) { 1142 while (optional('\${', token)) {
1141 token = parseExpression(token.next); 1143 token = parseExpression(token.next);
1142 token = expect('}', token); 1144 token = expect('}', token);
1143 token = parseString(token); 1145 token = parseString(token);
1144 listener.handleStringInterpolationPart(token); 1146 ++interpolationCount;
1145 } 1147 }
1148 listener.handleStringInterpolationParts(interpolationCount);
1146 return token; 1149 return token;
1147 } 1150 }
1148 1151
1149 Token parseLiteralBool(Token token) { 1152 Token parseLiteralBool(Token token) {
1150 listener.handleLiteralBool(token); 1153 listener.handleLiteralBool(token);
1151 return token.next; 1154 return token.next;
1152 } 1155 }
1153 1156
1154 Token parseLiteralNull(Token token) { 1157 Token parseLiteralNull(Token token) {
1155 listener.handleLiteralNull(token); 1158 listener.handleLiteralNull(token);
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
1457 } 1460 }
1458 listener.handleContinueStatement(hasTarget, continueKeyword, token); 1461 listener.handleContinueStatement(hasTarget, continueKeyword, token);
1459 return expectSemicolon(token); 1462 return expectSemicolon(token);
1460 } 1463 }
1461 1464
1462 Token parseEmptyStatement(Token token) { 1465 Token parseEmptyStatement(Token token) {
1463 listener.handleEmptyStatement(token); 1466 listener.handleEmptyStatement(token);
1464 return expectSemicolon(token); 1467 return expectSemicolon(token);
1465 } 1468 }
1466 } 1469 }
OLDNEW
« no previous file with comments | « dart/frog/leg/scanner/listener.dart ('k') | dart/frog/leg/scanner/scanner.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698