Switch-implementation.

frog/leg/scanner/listener.dart

Index: frog/leg/scanner/listener.dart
diff --git a/frog/leg/scanner/listener.dart b/frog/leg/scanner/listener.dart
index 78acfdf7d66df458cf07fdd34db92396659a3d47..4eda1496b9970a4d289cabdf3a144029ad35b3e6 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,32 @@ class NodeListener extends ElementListener {
   }
 
   void endSwitchBlock(int caseCount, Token beginToken, Token endToken) {
-    pushNode(makeNodeList(caseCount, beginToken, endToken, null));
+    Link<Node> nodes = const EmptyLink<Node>();
+    bool isLast = true;
+    while (caseCount > 0) {
+      SwitchCase switchCase = popNode();
+      if (switchCase.isDefaultCase && !isLast) {
+        recoverableError("default not on last switch case",

[ahe, 2012/03/09 13:58:32]

As we discussed, I'd prefer pushing this check to the resolver.

[Lasse Reichstein Nielsen, 2012/03/12 13:05:23]

Done. The only problem is that I can't report the error on a Token there, only
on a Node.

+                         token: switchCase.defaultKeyword);
+      }
+      nodes = nodes.prepend(switchCase);
+      caseCount--;
+      isLast = false;
+    }
+    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,