From 1d97cb21d28caebed97a67e25faa27faa35934bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20von=20der=20Ahe=CC=81?= Date: Fri, 29 Jun 2018 11:14:20 +0000 Subject: [PATCH] Remove severityName Change-Id: I7c7b6581a54889fd04b597ebe11cfb4adac870c8 Reviewed-on: https://dart-review.googlesource.com/63100 Reviewed-by: Aske Simon Christensen --- .../lib/src/base/processed_options.dart | 9 ++---- .../lib/src/fasta/command_line_reporting.dart | 27 +++------------- pkg/front_end/lib/src/fasta/severity.dart | 14 +++++++++ pkg/front_end/tool/perf_common.dart | 31 ++++++++++++------- 4 files changed, 40 insertions(+), 41 deletions(-) diff --git a/pkg/front_end/lib/src/base/processed_options.dart b/pkg/front_end/lib/src/base/processed_options.dart index 35cdf8c78c6..22fc6b6c2d0 100644 --- a/pkg/front_end/lib/src/base/processed_options.dart +++ b/pkg/front_end/lib/src/base/processed_options.dart @@ -57,7 +57,7 @@ import '../fasta/messages.dart' show getLocation; import '../fasta/problems.dart' show unimplemented; -import '../fasta/severity.dart' show Severity; +import '../fasta/severity.dart' show Severity, severityTexts; import '../fasta/ticker.dart' show Ticker; @@ -220,11 +220,8 @@ class ProcessedOptions { _raw.onProblem(format(message, severity), severity, formattedContext); if (command_line_reporting.shouldThrowOn(severity)) { if (verbose) print(StackTrace.current); - throw new deprecated_InputError( - message.uri, - message.charOffset, - "Compilation aborted due to fatal " - "${command_line_reporting.severityName(severity)}."); + throw new deprecated_InputError(message.uri, message.charOffset, + "Compilation aborted due to fatal ${severityTexts[severity]}."); } return; } diff --git a/pkg/front_end/lib/src/fasta/command_line_reporting.dart b/pkg/front_end/lib/src/fasta/command_line_reporting.dart index e6824312a3e..3543c8f0b07 100644 --- a/pkg/front_end/lib/src/fasta/command_line_reporting.dart +++ b/pkg/front_end/lib/src/fasta/command_line_reporting.dart @@ -29,7 +29,7 @@ import 'messages.dart' show getLocation, getSourceLine, isVerbose; import 'problems.dart' show unhandled; -import 'severity.dart' show Severity; +import 'severity.dart' show Severity, severityPrefixes, severityTexts; import 'scanner/characters.dart' show $CARET, $SPACE, $TAB; @@ -48,8 +48,9 @@ String format(LocatedMessage message, Severity severity, {Location location}) { // empty names. length = 1; } + String prefix = severityPrefixes[severity]; String text = - "${severityName(severity, capitalized: true)}: ${message.message}"; + prefix == null ? message.message : "$prefix: ${message.message}"; if (message.tip != null) { text += "\n${message.tip}"; } @@ -161,26 +162,6 @@ bool shouldThrowOn(Severity severity) { } } -/// Convert [severity] to a name that can be used to prefix a message. -String severityName(Severity severity, {bool capitalized: false}) { - switch (severity) { - case Severity.error: - return capitalized ? "Error" : "error"; - - case Severity.internalProblem: - return capitalized ? "Internal problem" : "internal problem"; - - case Severity.warning: - return capitalized ? "Warning" : "warning"; - - case Severity.context: - return capitalized ? "Context" : "context"; - - default: - return unhandled("$severity", "severityName", -1, null); - } -} - /// Print a formatted message and throw when errors are treated as fatal. /// Also set [exitCode] depending on the value of /// `CompilerContext.current.options.setExitCodeOnProblem`. @@ -201,7 +182,7 @@ void _printAndThrowIfDebugging( // TODO(sigmund,ahe): ensure there is no circularity when InputError is // handled. throw new deprecated_InputError(uri, charOffset, - "Compilation aborted due to fatal ${severityName(severity)}."); + "Compilation aborted due to fatal ${severityTexts[severity]}."); } } diff --git a/pkg/front_end/lib/src/fasta/severity.dart b/pkg/front_end/lib/src/fasta/severity.dart index 9a29a74ccd5..d3eb763e4e7 100644 --- a/pkg/front_end/lib/src/fasta/severity.dart +++ b/pkg/front_end/lib/src/fasta/severity.dart @@ -30,3 +30,17 @@ const Map severityEnumValues = const { 'INTERNAL_PROBLEM': Severity.internalProblem, 'WARNING': Severity.warning, }; + +const Map severityPrefixes = const { + Severity.error: "Error", + Severity.internalProblem: "Internal problem", + Severity.warning: "Warning", + Severity.context: "Context", +}; + +const Map severityTexts = const { + Severity.error: "error", + Severity.internalProblem: "internal problem", + Severity.warning: "warning", + Severity.context: "context", +}; diff --git a/pkg/front_end/tool/perf_common.dart b/pkg/front_end/tool/perf_common.dart index 5599fc05636..c866f134114 100644 --- a/pkg/front_end/tool/perf_common.dart +++ b/pkg/front_end/tool/perf_common.dart @@ -5,15 +5,22 @@ /// Shared code used by fasta_perf and incremental_perf. library front_end.tool.perf_common; -import 'dart:io'; +import 'dart:io' show exitCode, stderr; -import 'package:front_end/src/api_prototype/front_end.dart'; -import 'package:front_end/src/fasta/command_line_reporting.dart'; -import 'package:front_end/src/fasta/fasta_codes.dart'; import 'package:kernel/target/flutter.dart' show FlutterTarget; + import 'package:kernel/target/targets.dart' show Target, TargetFlags; + import 'package:kernel/target/vm.dart' show VmTarget; +import 'package:front_end/src/api_prototype/front_end.dart' + show CompilationMessage; + +import 'package:front_end/src/fasta/fasta_codes.dart' as fastaCodes; + +import 'package:front_end/src/fasta/severity.dart' + show Severity, severityPrefixes; + /// Error messages that we temporarily allow when compiling benchmarks in strong /// mode. /// @@ -26,17 +33,17 @@ import 'package:kernel/target/vm.dart' show VmTarget; /// from this set. final whitelistMessageCode = new Set.from([ // Code names in this list should match the key used in messages.yaml - codeInvalidAssignment.name, - codeOverrideTypeMismatchParameter.name, - codeOverriddenMethodCause.name, + fastaCodes.codeInvalidAssignment.name, + fastaCodes.codeOverrideTypeMismatchParameter.name, + fastaCodes.codeOverriddenMethodCause.name, // The following errors are not covered by unit tests in the SDK repo because // they are only seen today in the flutter-gallery benchmark (external to // this repo). - codeInvalidCastFunctionExpr.name, - codeInvalidCastTopLevelFunction.name, - codeUndefinedGetter.name, - codeUndefinedMethod.name, + fastaCodes.codeInvalidCastFunctionExpr.name, + fastaCodes.codeInvalidCastTopLevelFunction.name, + fastaCodes.codeUndefinedGetter.name, + fastaCodes.codeUndefinedMethod.name, ]); onErrorHandler(bool isStrong) { @@ -48,7 +55,7 @@ onErrorHandler(bool isStrong) { var uri = m.span.start.sourceUrl; var offset = m.span.start.offset; stderr.writeln('$uri:$offset: ' - '${severityName(m.severity, capitalized: true)}: ${m.message}'); + '${severityPrefixes[m.severity]}: ${m.message}'); exitCode = 1; } else if (!messageReported) { messageReported = true;