| OLD | NEW |
| 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2011, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 import 'package:async_helper/async_helper.dart'; | 5 import 'package:async_helper/async_helper.dart'; |
| 6 import 'package:compiler/compiler_new.dart'; |
| 6 import 'package:expect/expect.dart'; | 7 import 'package:expect/expect.dart'; |
| 7 import 'memory_compiler.dart'; | 8 import 'memory_compiler.dart'; |
| 8 | 9 |
| 9 // Use strict does not allow parameters or locals named "arguments" or "eval". | 10 // Use strict does not allow parameters or locals named "arguments" or "eval". |
| 10 | 11 |
| 11 const MEMORY_SOURCE_FILES = const { | 12 const MEMORY_SOURCE_FILES = const { |
| 12 'main.dart': ''' | 13 'main.dart': ''' |
| 13 class A { | 14 class A { |
| 14 final arguments; | 15 final arguments; |
| 15 final eval; | 16 final eval; |
| (...skipping 27 matching lines...) Expand all Loading... |
| 43 print(list[i].foo(i, i + 1)); | 44 print(list[i].foo(i, i + 1)); |
| 44 } | 45 } |
| 45 }''' | 46 }''' |
| 46 }; | 47 }; |
| 47 | 48 |
| 48 main() { | 49 main() { |
| 49 OutputCollector collector = new OutputCollector(); | 50 OutputCollector collector = new OutputCollector(); |
| 50 asyncTest(() async { | 51 asyncTest(() async { |
| 51 await runCompiler( | 52 await runCompiler( |
| 52 memorySourceFiles: MEMORY_SOURCE_FILES, outputProvider: collector); | 53 memorySourceFiles: MEMORY_SOURCE_FILES, outputProvider: collector); |
| 53 String jsOutput = collector.getOutput('', 'js'); | 54 String jsOutput = collector.getOutput('', OutputType.js); |
| 54 | 55 |
| 55 // Skip comments. | 56 // Skip comments. |
| 56 List<String> lines = jsOutput.split("\n"); | 57 List<String> lines = jsOutput.split("\n"); |
| 57 RegExp commentLine = new RegExp(r' *//'); | 58 RegExp commentLine = new RegExp(r' *//'); |
| 58 String filtered = | 59 String filtered = |
| 59 lines.where((String line) => !commentLine.hasMatch(line)).join("\n"); | 60 lines.where((String line) => !commentLine.hasMatch(line)).join("\n"); |
| 60 | 61 |
| 61 // TODO(floitsch): we will need to adjust this filter if we start using | 62 // TODO(floitsch): we will need to adjust this filter if we start using |
| 62 // 'eval' or 'arguments' ourselves. Currently we disallow any 'eval' or | 63 // 'eval' or 'arguments' ourselves. Currently we disallow any 'eval' or |
| 63 // 'arguments'. | 64 // 'arguments'. |
| 64 RegExp re = new RegExp(r'[^\w$](arguments|eval)[^\w$]'); | 65 RegExp re = new RegExp(r'[^\w$](arguments|eval)[^\w$]'); |
| 65 Expect.isFalse(re.hasMatch(filtered)); | 66 Expect.isFalse(re.hasMatch(filtered)); |
| 66 }); | 67 }); |
| 67 } | 68 } |
| OLD | NEW |