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

Unified Diff: frog/leg/scanner/listener.dart

Issue 9632018: Switch-implementation. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Add missing handling of default in unparser. Created 8 years, 9 months 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 side-by-side diff with in-line comments
Download patch
Index: frog/leg/scanner/listener.dart
diff --git a/frog/leg/scanner/listener.dart b/frog/leg/scanner/listener.dart
index f7e85323f5629a372240342f07e6088277ee9fed..058c0fa5b66b0513c59c2f7c47425607bb2b61b4 100644
--- a/frog/leg/scanner/listener.dart
+++ b/frog/leg/scanner/listener.dart
@@ -395,8 +395,9 @@ class Listener {
void handleSuperExpression(Token token) {
}
- void handleSwitchCase(Token colon, Token caseKeyword, int statementCount,
- Token endToken) {
+ void handleSwitchCase(Token labelToken, int expressionCount,
+ Token defaultKeyword, int statementCount,
+ Token firstToken, Token endToken) {
}
void handleThisExpression(Token token) {
@@ -1303,18 +1304,26 @@ class NodeListener extends ElementListener {
}
void endSwitchBlock(int caseCount, Token beginToken, Token endToken) {
- pushNode(makeNodeList(caseCount, beginToken, endToken, null));
+ Link<Node> nodes = const EmptyLink<Node>();
+ while (caseCount > 0) {
+ SwitchCase switchCase = popNode();
+ nodes = nodes.prepend(switchCase);
+ caseCount--;
+ }
+ pushNode(new NodeList(beginToken, nodes, endToken, null));
}
- void handleSwitchCase(Token colon, Token caseKeyword, int statementCount,
- Token endToken) {
+ void handleSwitchCase(Token labelToken, int expressionCount,
+ Token defaultKeyword, int statementCount,
+ Token firstToken, Token endToken) {
NodeList statements = makeNodeList(statementCount, null, null, null);
- Expression expression = popNode();
+ NodeList expressions = makeNodeList(expressionCount, null, null, null);
Identifier label = null;
- if (colon !== null) {
+ if (labelToken !== null) {
label = popNode();
}
- pushNode(new SwitchCase(label, expression, statements, caseKeyword));
+ pushNode(new SwitchCase(label, expressions, defaultKeyword, statements,
+ firstToken));
}
void handleDefaultCase(Token colon, Token defaultKeyword, int statementCount,

Powered by Google App Engine
This is Rietveld 408576698