Chromium Code Reviews| Index: pkg/front_end/lib/src/base/processed_options.dart |
| diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart |
| index d525d15ed294e48cb269033c4a57ef3ae2fa9fc4..c5a1c478a5cbc6ff6ce953143d62c67825c6651d 100644 |
| --- a/pkg/front_end/lib/src/base/processed_options.dart |
| +++ b/pkg/front_end/lib/src/base/processed_options.dart |
| @@ -8,6 +8,7 @@ import 'package:front_end/compilation_error.dart'; |
| import 'package:front_end/compiler_options.dart'; |
| import 'package:front_end/file_system.dart'; |
| import 'package:front_end/src/base/performace_logger.dart'; |
| +import 'package:front_end/src/fasta/fasta_codes.dart'; |
| import 'package:front_end/src/fasta/ticker.dart'; |
| import 'package:front_end/src/fasta/translate_uri.dart'; |
| import 'package:front_end/src/incremental/byte_store.dart'; |
| @@ -108,38 +109,45 @@ class ProcessedOptions { |
| return _raw.byteStore; |
| } |
| - // TODO(sigmund): delete. We should use messages with error codes directly |
| - // instead. |
| - void reportError(String message) { |
| - _raw.onError(new _CompilationError(message)); |
| + // TODO(sigmund): delete. Use reportMessage instead. |
| + void deprecated_reportError(String error) { |
|
Siggi Cherem (dart-lang)
2017/07/11 03:57:13
FYI - I'm following Peter's style here, it is a t
ahe
2017/07/12 13:14:43
Thank you, this is helpful as I'm grepping for tha
Siggi Cherem (dart-lang)
2017/07/12 21:54:59
On 2017/07/12 13:14:43, ahe wrote:
> On 2017/07/11
|
| + _raw.onError(new _CompilationError(error)); |
| } |
| + void reportMessage(LocatedMessage message) { |
| + _raw.onError(message); |
| + } |
| + |
| + void reportMessageNoLocation(Message message) => |
|
ahe
2017/07/12 13:14:43
reportMessageNoLocation -> reportMessageWithoutLoc
Siggi Cherem (dart-lang)
2017/07/12 21:54:58
Done.
|
| + reportMessage(message.withLocation(null, -1)); |
| + |
| /// Runs various validations checks on the input options. For instance, |
| /// if an option is a path to a file, it checks that the file exists. |
| Future<bool> validateOptions() async { |
| for (var source in inputs) { |
| if (source.scheme == 'file' && |
| !await fileSystem.entityForUri(source).exists()) { |
| - reportError("Entry-point file not found: $source"); |
| + reportMessageNoLocation( |
| + templateMissingInputFile.withArguments('$source')); |
| return false; |
| } |
| } |
| if (_raw.sdkRoot != null && |
| !await fileSystem.entityForUri(sdkRoot).exists()) { |
| - reportError("SDK root directory not found: ${sdkRoot}"); |
| + reportMessageNoLocation(templateMissingSdkRoot.withArguments('$sdkRoot')); |
| return false; |
| } |
| var summary = sdkSummary; |
| if (summary != null && !await fileSystem.entityForUri(summary).exists()) { |
| - reportError("SDK summary not found: ${summary}"); |
| + reportMessageNoLocation( |
| + templateMissingSdkSummary.withArguments('$summary')); |
| return false; |
| } |
| if (compileSdk && summary != null) { |
| - reportError( |
| - "The compileSdk and sdkSummary options are mutually exclusive"); |
| + reportMessageNoLocation(messageCombinedCompileSdkAndSummary); |
|
Paul Berry
2017/07/11 16:00:59
IMO there should be a distinction between errors t
Siggi Cherem (dart-lang)
2017/07/11 16:03:47
Good points!
I like however having precise messag
|
| return false; |
| } |
| return true; |
| @@ -345,7 +353,7 @@ class HermeticAccessException extends FileSystemException { |
| /// An error that only contains a message and no error location. |
| class _CompilationError implements CompilationError { |
| - String get correction => null; |
| + String get tip => null; |
| SourceSpan get span => null; |
| final String message; |
| _CompilationError(this.message); |