Refactored treatment of closure variables in dart2js CPS.

pkg/analyzer2dart/test/sexpr_data.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.
 
 /// Test data for sexpr_test.
 library test.sexpr.data;
 
 import 'test_helper.dart';
 
 class TestSpec extends TestSpecBase {
   // A [String] or a [Map<String, String>].
   final output;
 
-  const TestSpec(String input, this.output) : super(input);
+  /// True if the test should be skipped when testing analyzer2dart.
+  final bool skipInAnalyzerFrontend;
+
+  const TestSpec(String input, this.output,
+                 {this.skipInAnalyzerFrontend: false}) : super(input);
 }
 
 const List<Group> TEST_DATA = const [
   const Group('Empty main', const [
     const TestSpec('''
 main() {}
 ''', '''
 (FunctionDefinition main ( return)
   (LetPrim v0 (Constant NullConstant))
   (InvokeContinuation return v0))
@@ skipping 1323 matching lines @@
 (FunctionDefinition main (args return)
   (LetCont (k0 v0)
     (LetCont (k1 v1)
       (LetCont (k2 v2)
         (InvokeContinuation return v2))
       (InvokeStatic field  k2))
     (InvokeStatic field v0 k1))
   (InvokeMethod args length  k0))
 '''),
   ]),
+
+  const Group('Closure variables', const <TestSpec>[
+    const TestSpec('''
+main(x,foo) {
+  print(x);
+  getFoo() => foo;
+  print(getFoo());
+}
+''', '''
+(FunctionDefinition main {foo} (x foo return)
+  (LetCont (k0 v0)
+    (LetPrim v1 (CreateFunction
+      (FunctionDefinition getFoo ( return)
+        (LetPrim v2 (GetClosureVariable foo))
+        (InvokeContinuation return v2))))
+    (LetCont (k1 v3)
+      (LetCont (k2 v4)
+        (LetPrim v5 (Constant NullConstant))
+        (InvokeContinuation return v5))
+      (InvokeStatic print v3 k2))
+    (InvokeMethod v1 call  k1))
+  (InvokeStatic print x k0))
+''', skipInAnalyzerFrontend: true)
+  ]),
 ];