Complete AST nodes for switch statement.

dart/frog/leg/tree/nodes.dart

 // Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 interface Visitor<R> {
   R visitBlock(Block node);
   R visitBreakStatement(BreakStatement node);
   R visitCatchBlock(CatchBlock node);
   R visitClassNode(ClassNode node);
   R visitConditional(Conditional node);
   R visitContinueStatement(ContinueStatement node);
+  R visitDefaultCase(DefaultCase node);
   R visitDoWhile(DoWhile node);
   R visitEmptyStatement(EmptyStatement node);
   R visitExpressionStatement(ExpressionStatement node);
   R visitFor(For node);
   R visitForInStatement(ForInStatement node);
   R visitFunctionDeclaration(FunctionDeclaration node);
   R visitFunctionExpression(FunctionExpression node);
   R visitIdentifier(Identifier node);
   R visitIf(If node);
   R visitLabelledStatement(LabelledStatement node);
@@ skipping 11 matching lines @@
   R visitNewExpression(NewExpression node);
   R visitNodeList(NodeList node);
   R visitOperator(Operator node);
   R visitParenthesizedExpression(ParenthesizedExpression node);
   R visitReturn(Return node);
   R visitScriptTag(ScriptTag node);
   R visitSend(Send node);
   R visitSendSet(SendSet node);
   R visitStringInterpolation(StringInterpolation node);
   R visitStringInterpolationPart(StringInterpolationPart node);
+  R visitSwitchCase(SwitchCase node);
   R visitSwitchStatement(SwitchStatement node);
   R visitThrow(Throw node);
   R visitTryStatement(TryStatement node);
   R visitTypeAnnotation(TypeAnnotation node);
   R visitTypedef(Typedef node);
   R visitVariableDefinitions(VariableDefinitions node);
   R visitWhile(While node);
 }
 
 Token firstBeginToken(Node first, Node second) {
@@ skipping 42 matching lines @@
   abstract Token getBeginToken();
 
   abstract Token getEndToken();
 
   Block asBlock() => null;
   BreakStatement asBreakStatement() => null;
   CatchBlock asCatchBlock() => null;
   ClassNode asClassNode() => null;
   Conditional asConditional() => null;
   ContinueStatement asContinueStatement() => null;
+  DefaultCase asDefaultCase() => null;
   DoWhile asDoWhile() => null;
   EmptyStatement asEmptyStatement() => null;
   Expression asExpression() => null;
   ExpressionStatement asExpressionStatement() => null;
   For asFor() => null;
   ForInStatement asForInStatement() => null;
   FunctionDeclaration asFunctionDeclaration() => null;
   FunctionExpression asFunctionExpression() => null;
   Identifier asIdentifier() => null;
   If asIf() => null;
@@ skipping 11 matching lines @@
   NodeList asNodeList() => null;
   Operator asOperator() => null;
   ParenthesizedExpression asParenthesizedExpression() => null;
   Return asReturn() => null;
   ScriptTag asScriptTag() => null;
   Send asSend() => null;
   SendSet asSendSet() => null;
   Statement asStatement() => null;
   StringInterpolation asStringInterpolation() => null;
   StringInterpolationPart asStringInterpolationPart() => null;
+  SwitchCase asSwitchCase() => null;
   SwitchStatement asSwitchStatement() => null;
   Throw asThrow() => null;
   TryStatement asTryStatement() => null;
   TypeAnnotation asTypeAnnotation() => null;
   Typedef asTypedef() => null;
   VariableDefinitions asVariableDefinitions() => null;
   While asWhile() => null;
 }
 
 class ClassNode extends Node {
@@ skipping 1221 matching lines @@
     expression.accept(visitor);
   }
 
   Token getBeginToken() => name.getBeginToken();
 
   Token getEndToken() => expression.getEndToken();
 }
 
 class SwitchStatement extends Statement {
   final ParenthesizedExpression parenthesizedExpression;
+  final NodeList cases;
 
   final Token switchKeyword;
-  final Token endToken;
-  // TODO(ahe): More to come...
 
-  SwitchStatement(this.parenthesizedExpression,
-                  this.switchKeyword, this.endToken);
+  SwitchStatement(this.parenthesizedExpression, this.cases,
+                  this.switchKeyword);
 
   SwitchStatement asSwitchStatement() => this;
 
   Expression get expression() => parenthesizedExpression.expression;
 
   accept(Visitor visitor) => visitor.visitSwitchStatement(this);
 
   visitChildren(Visitor visitor) {
     parenthesizedExpression.accept(visitor);
-    // TODO(ahe): Add more stuff here.
+    cases.accept(visitor);
   }
 
   Token getBeginToken() => switchKeyword;
 
-  Token getEndToken() => endToken;
+  Token getEndToken() => cases.getEndToken();
+}
+
+class SwitchCase extends Node {
+  final Identifier label;
+  final Expression expression;

[Lasse Reichstein Nielsen, 2012/03/05 19:54:04]

Only one expression per case?
How is 
 foo: case 1: case 2: stmts;
modelled?

[ahe, 2012/03/05 20:07:23]

new SwitchCase('foo', 1, []);
new SwitchCase(null, 2, stmts);

I'm currently working on generating code and I may change this.

+  final NodeList statements;
+
+  final Token caseKeyword;
+
+  SwitchCase(this.label, this.expression, this.statements, this.caseKeyword);
+
+  SwitchCase asSwitchCase() => this;
+
+  accept(Visitor visitor) => visitor.visitSwitchCase(this);
+
+  visitChildren(Visitor visitor) {
+    if (label !== null) label.accept(visitor);
+    expression.accept(visitor);
+    statements.accept(visitor);
+  }
+
+  Token getBeginToken() {
+    if (label !== null) return label.getBeginToken();
+    return caseKeyword;
+  }
+
+  Token getEndToken() => statements.getEndToken();
+}
+
+class DefaultCase extends Node {
+  final Identifier label;
+  final NodeList statements;
+
+  final Token defaultKeyword;
+
+  DefaultCase(this.label, this.statements, this.defaultKeyword);
+
+  DefaultCase asDefaultCase() => this;
+
+  accept(Visitor visitor) => visitor.visitDefaultCase(this);
+
+  visitChildren(Visitor visitor) {
+    if (label !== null) label.accept(visitor);
+    statements.accept(visitor);
+  }
+
+  Token getBeginToken() {
+    if (label === null) return label.getBeginToken();
+    return defaultKeyword;
+  }
+
+  Token getEndToken() => statements.getEndToken();
 }
 
 class GotoStatement extends Statement {
   final Identifier target;
   final Token keywordToken;
   final Token semicolonToken;
 
   GotoStatement(this.target, this.keywordToken, this.semicolonToken);
 
   visitChildren(Visitor visitor) {
@@ skipping 206 matching lines @@
   static bool isConstructorRedirect(Send node) {
     return (node.receiver === null &&
             node.selector.asIdentifier() !== null &&
             node.selector.asIdentifier().isThis()) ||
            (node.receiver !== null &&
             node.receiver.asIdentifier() !== null &&
             node.receiver.asIdentifier().isThis() &&
             node.selector.asIdentifier() !== null);
   }
 }