dart2dart: Implementation of simple try/catch.

pkg/compiler/lib/src/dart_backend/backend_ast_to_frontend_ast.dart

 // Copyright (c) 2014, 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.
 
 library dart_tree_printer;
 
 import '../constants/values.dart' as values;
 import '../dart_types.dart' as types;
 import '../dart2jslib.dart' as dart2js;
 import '../elements/elements.dart' as elements;
@@ skipping 822 matching lines @@
           semicolon,
           stmt.expression == null ? null : makeExpression(stmt.expression));
     } else if (stmt is Switch) {
       return new tree.SwitchStatement(
           parenthesize(makeExpression(stmt.expression)),
           braceList('', stmt.cases.map(makeSwitchCase)),
           switchToken);
     } else if (stmt is Try) {
       return new tree.TryStatement(
           makeBlock(stmt.tryBlock),
-          braceList('', stmt.catchBlocks.map(makeCatchBlock)),
+          makeList(null, stmt.catchBlocks.map(makeCatchBlock)),
           stmt.finallyBlock == null ? null : makeBlock(stmt.finallyBlock),
           tryToken,
-          finallyToken);
+          stmt.finallyBlock == null ? null : finallyToken);
     } else if (stmt is VariableDeclarations) {
       return makeVariableDeclarations(stmt, useVar: true, endToken: semicolon);
     } else if (stmt is While) {
       return new tree.While(
           parenthesize(makeExpression(stmt.condition)),
           makeStatement(stmt.body, shortIf: shortIf),
           whileToken);
     } else {
       throw "Unrecognized statement: ${stmt}";
     }
@@ skipping 26 matching lines @@
                           isFinal: decl.isFinal,
                           useVar: useVar && decl.type == null),
         makeList(',',
             decl.declarations.map(makeVariableDeclaration),
             close: endToken));
   }
 
   tree.CatchBlock makeCatchBlock(CatchBlock block) {
     List<tree.VariableDefinitions> formals = [];
     if (block.exceptionVar != null) {
+      tree.Node exceptionName = makeIdentifier(block.exceptionVar.name);
+      setElement(exceptionName, block.exceptionVar.element, block.exceptionVar);
       formals.add(new tree.VariableDefinitions(
           null,
           makeEmptyModifiers(),
-          singleton(makeIdentifier(block.exceptionVar))));
+          singleton(exceptionName)));
     }
     if (block.stackVar != null) {
+      tree.Node stackTraceName = makeIdentifier(block.stackVar.name);
+      setElement(stackTraceName, block.stackVar.element, block.stackVar);
       formals.add(new tree.VariableDefinitions(
           null,
           makeEmptyModifiers(),
-          singleton(makeIdentifier(block.stackVar))));
+          singleton(stackTraceName)));
     }
     return new tree.CatchBlock(
         block.onType == null ? null : makeType(block.onType),
         block.exceptionVar == null ? null : argList(formals),
         makeBlock(block.body),
         block.onType == null ? null : onToken,
         block.exceptionVar == null ? null : catchToken);
   }
 
   tree.SwitchCase makeSwitchCase(SwitchCase caze) {
@@ skipping 417 matching lines @@
             printStringChunk(chunk.previous),
             node);
       } else {
         return node;
       }
     }
     return printStringChunk(output.chunk);
   }
 
 }