| OLD | NEW | 
|---|
| 1 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file | 1 // Copyright (c) 2017, 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 'dart:async'; | 5 import 'dart:async'; | 
| 6 import 'dart:io'; | 6 import 'dart:io'; | 
| 7 | 7 | 
| 8 import 'package:front_end/compiler_options.dart'; | 8 import 'package:front_end/compiler_options.dart'; | 
| 9 import 'package:front_end/dependency_grapher.dart'; | 9 import 'package:front_end/dependency_grapher.dart'; | 
| 10 import 'package:path/path.dart' as pathos; | 10 import 'package:path/path.dart' as pathos; | 
| (...skipping 22 matching lines...) Expand all  Loading... | 
| 33   'lib/src': new SubpackageRules(mayImportAnalyzer: true, allowedDependencies: [ | 33   'lib/src': new SubpackageRules(mayImportAnalyzer: true, allowedDependencies: [ | 
| 34     'lib', | 34     'lib', | 
| 35     'lib/src/base', | 35     'lib/src/base', | 
| 36     'lib/src/fasta', | 36     'lib/src/fasta', | 
| 37     'lib/src/fasta/source', | 37     'lib/src/fasta/source', | 
| 38   ]), | 38   ]), | 
| 39   'lib/src/base': new SubpackageRules( | 39   'lib/src/base': new SubpackageRules( | 
| 40       mayImportAnalyzer: true, allowedDependencies: ['lib']), | 40       mayImportAnalyzer: true, allowedDependencies: ['lib']), | 
| 41   'lib/src/codegen': new SubpackageRules(), | 41   'lib/src/codegen': new SubpackageRules(), | 
| 42   'lib/src/fasta': new SubpackageRules(allowedDependencies: [ | 42   'lib/src/fasta': new SubpackageRules(allowedDependencies: [ | 
|  | 43     'lib', | 
| 43     'lib/src/fasta/builder', | 44     'lib/src/fasta/builder', | 
| 44     'lib/src/fasta/dill', | 45     'lib/src/fasta/dill', | 
| 45     'lib/src/fasta/kernel', | 46     'lib/src/fasta/kernel', | 
| 46     'lib/src/fasta/parser', | 47     'lib/src/fasta/parser', | 
| 47     'lib/src/fasta/scanner', | 48     'lib/src/fasta/scanner', | 
| 48     'lib/src/fasta/testing', | 49     'lib/src/fasta/testing', | 
| 49     'lib/src/fasta/util', | 50     'lib/src/fasta/util', | 
| 50     'lib/src/scanner', | 51     'lib/src/scanner', | 
| 51   ]), | 52   ]), | 
| 52   'lib/src/fasta/builder': new SubpackageRules(allowedDependencies: [ | 53   'lib/src/fasta/builder': new SubpackageRules(allowedDependencies: [ | 
| 53     'lib/src/fasta', | 54     'lib/src/fasta', | 
| 54     'lib/src/fasta/parser', | 55     'lib/src/fasta/parser', | 
| 55     'lib/src/fasta/source', | 56     'lib/src/fasta/source', | 
| 56     'lib/src/fasta/type_inference', | 57     'lib/src/fasta/type_inference', | 
| 57     'lib/src/fasta/util', | 58     'lib/src/fasta/util', | 
| 58   ]), | 59   ]), | 
| 59   'lib/src/fasta/dill': new SubpackageRules(allowedDependencies: [ | 60   'lib/src/fasta/dill': new SubpackageRules(allowedDependencies: [ | 
| 60     'lib/src/fasta', | 61     'lib/src/fasta', | 
| 61     'lib/src/fasta/kernel', | 62     'lib/src/fasta/kernel', | 
| 62   ]), | 63   ]), | 
| 63   'lib/src/fasta/kernel': new SubpackageRules(allowedDependencies: [ | 64   'lib/src/fasta/kernel': new SubpackageRules(allowedDependencies: [ | 
|  | 65     'lib', | 
| 64     'lib/src/fasta', | 66     'lib/src/fasta', | 
| 65     'lib/src/base', | 67     'lib/src/base', | 
| 66     'lib/src/fasta/builder', | 68     'lib/src/fasta/builder', | 
| 67     'lib/src/fasta/dill', | 69     'lib/src/fasta/dill', | 
| 68     'lib/src/fasta/parser', | 70     'lib/src/fasta/parser', | 
| 69     'lib/src/fasta/scanner', | 71     'lib/src/fasta/scanner', | 
| 70     'lib/src/fasta/source', | 72     'lib/src/fasta/source', | 
| 71     'lib/src/fasta/type_inference', | 73     'lib/src/fasta/type_inference', | 
| 72     'lib/src/fasta/util', | 74     'lib/src/fasta/util', | 
| 73   ]), | 75   ]), | 
| 74   'lib/src/fasta/parser': new SubpackageRules(allowedDependencies: [ | 76   'lib/src/fasta/parser': new SubpackageRules(allowedDependencies: [ | 
| 75     'lib/src/fasta', | 77     'lib/src/fasta', | 
| 76     'lib/src/fasta/scanner', | 78     'lib/src/fasta/scanner', | 
| 77     'lib/src/fasta/util', | 79     'lib/src/fasta/util', | 
| 78     'lib/src/scanner', | 80     'lib/src/scanner', | 
| 79   ]), | 81   ]), | 
| 80   'lib/src/fasta/scanner': new SubpackageRules(allowedDependencies: [ | 82   'lib/src/fasta/scanner': new SubpackageRules(allowedDependencies: [ | 
| 81     'lib/src/fasta', | 83     'lib/src/fasta', | 
| 82     // fasta scanner produces analyzer scanner tokens | 84     // fasta scanner produces analyzer scanner tokens | 
| 83     'lib/src/scanner', | 85     'lib/src/scanner', | 
| 84     'lib/src/fasta/util', | 86     'lib/src/fasta/util', | 
| 85   ]), | 87   ]), | 
| 86   'lib/src/fasta/source': new SubpackageRules(allowedDependencies: [ | 88   'lib/src/fasta/source': new SubpackageRules(allowedDependencies: [ | 
|  | 89     'lib', | 
| 87     'lib/src/fasta', | 90     'lib/src/fasta', | 
| 88     'lib/src/base', | 91     'lib/src/base', | 
| 89     'lib/src/fasta/builder', | 92     'lib/src/fasta/builder', | 
| 90     'lib/src/fasta/dill', | 93     'lib/src/fasta/dill', | 
| 91     'lib/src/fasta/kernel', | 94     'lib/src/fasta/kernel', | 
| 92     'lib/src/fasta/parser', | 95     'lib/src/fasta/parser', | 
| 93     'lib/src/fasta/scanner', | 96     'lib/src/fasta/scanner', | 
| 94     'lib/src/fasta/type_inference', | 97     'lib/src/fasta/type_inference', | 
| 95     'lib/src/fasta/util', | 98     'lib/src/fasta/util', | 
| 96   ]), | 99   ]), | 
| (...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 271       if (subpackageRules[subpackage].allowSubdirs) { | 274       if (subpackageRules[subpackage].allowSubdirs) { | 
| 272         subpackageRules[subpackage].actuallyHasSubdirs = true; | 275         subpackageRules[subpackage].actuallyHasSubdirs = true; | 
| 273       } else { | 276       } else { | 
| 274         problem('Uri $src is in a subfolder of $subpackage, but that ' | 277         problem('Uri $src is in a subfolder of $subpackage, but that ' | 
| 275             'subpackage does not allow dart files in subdirectories.'); | 278             'subpackage does not allow dart files in subdirectories.'); | 
| 276       } | 279       } | 
| 277     } | 280     } | 
| 278     return subpackage; | 281     return subpackage; | 
| 279   } | 282   } | 
| 280 } | 283 } | 
| OLD | NEW | 
|---|