Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1112)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart

Issue 2970273004: Deprecate all diagnostics methods that use strings. (Closed)
Patch Set: Created 3 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« pkg/front_end/lib/src/fasta/deprecated_problems.dart ('K') | « pkg/front_end/lib/src/fasta/kernel/body_builder.dart ('k') | pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart
diff --git a/pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart b/pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart
index cbeac83592581b5837b05554cf96d48b4bb15a06..8c5c392f2adacaf4d8e47931f98c23b581e4c15e 100644
--- a/pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/fasta_accessors.dart
@@ -27,9 +27,10 @@ import 'package:front_end/src/fasta/type_inference/type_promotion.dart'
import 'package:kernel/ast.dart'
hide InvalidExpression, InvalidInitializer, InvalidStatement;
-import '../errors.dart' show internalError;
+import '../deprecated_problems.dart' show deprecated_internalProblem;
-import '../scope.dart' show AccessErrorBuilder, ProblemBuilder, Scope;
+import '../scope.dart'
+ show deprecated_AccessErrorBuilder, ProblemBuilder, Scope;
import 'frontend_accessors.dart' as kernel
show
@@ -79,7 +80,7 @@ abstract class BuilderHelper {
finishSend(Object receiver, Arguments arguments, int offset);
- Expression buildCompileTimeError(error, [int offset]);
+ Expression deprecated_buildCompileTimeError(error, [int offset]);
Initializer buildInvalidInitializer(Expression expression, [int offset]);
@@ -107,7 +108,8 @@ abstract class BuilderHelper {
StaticGet makeStaticGet(Member readTarget, Token token);
- dynamic addCompileTimeError(int charOffset, String message, {bool silent});
+ dynamic deprecated_addCompileTimeError(int charOffset, String message,
+ {bool silent});
bool isIdentical(Member member);
@@ -118,7 +120,7 @@ abstract class BuilderHelper {
DartType validatedTypeVariableUse(
TypeParameterType type, int offset, bool nonInstanceAccessIsError);
- void warning(String message, [int charOffset]);
+ void deprecated_warning(String message, [int charOffset]);
void warnUnresolvedSuperGet(Name name, int charOffset);
@@ -143,7 +145,7 @@ abstract class FastaAccessor implements Accessor {
Initializer buildFieldInitializer(Map<String, int> initializedFields) {
int offset = offsetForToken(token);
return helper.buildInvalidInitializer(
- helper.buildCompileTimeError(
+ helper.deprecated_buildCompileTimeError(
// TODO(ahe): This error message is really bad.
"Can't use $plainNameForRead here.",
offset),
@@ -175,7 +177,7 @@ abstract class FastaAccessor implements Accessor {
isNullAware: isNullAware);
} else {
if (helper.constantExpressionRequired && send.name != lengthName) {
- helper.addCompileTimeError(
+ helper.deprecated_addCompileTimeError(
offsetForToken(token), "Not a constant expression.");
}
return PropertyAccessor.make(helper, send.token, buildSimpleRead(),
@@ -212,7 +214,7 @@ abstract class ErrorAccessor implements FastaAccessor {
Expression buildError(Arguments arguments,
{bool isGetter: false, bool isSetter: false, int offset});
- Name get name => internalError("Unsupported operation.");
+ Name get name => deprecated_internalProblem("Unsupported operation.");
@override
String get plainNameForRead => name.name;
@@ -312,13 +314,14 @@ class ThisAccessor extends FastaAccessor {
ThisAccessor(this.helper, this.token, this.isInitializer,
{this.isSuper: false});
- String get plainNameForRead => internalError(isSuper ? "super" : "this");
+ String get plainNameForRead =>
+ deprecated_internalProblem(isSuper ? "super" : "this");
Expression buildSimpleRead() {
if (!isSuper) {
return new KernelThisExpression();
} else {
- return helper.buildCompileTimeError(
+ return helper.deprecated_buildCompileTimeError(
"Can't use `super` as an expression.", offsetForToken(token));
}
}
@@ -328,7 +331,7 @@ class ThisAccessor extends FastaAccessor {
String keyword = isSuper ? "super" : "this";
int offset = offsetForToken(token);
return helper.buildInvalidInitializer(
- helper.buildCompileTimeError(
+ helper.deprecated_buildCompileTimeError(
"Can't use '$keyword' here, did you mean '$keyword()'?", offset),
offset);
}
@@ -337,7 +340,7 @@ class ThisAccessor extends FastaAccessor {
IncompleteSend send, int operatorOffset, bool isNullAware) {
if (isInitializer && send is SendAccessor) {
if (isNullAware) {
- helper.addCompileTimeError(
+ helper.deprecated_addCompileTimeError(
operatorOffset, "Expected '.'\nTry removing '?'.");
}
return buildConstructorInitializer(
@@ -428,7 +431,8 @@ class ThisAccessor extends FastaAccessor {
Expression buildAssignmentError() {
String message =
isSuper ? "Can't assign to 'super'." : "Can't assign to 'this'.";
- return helper.buildCompileTimeError(message, offsetForToken(token));
+ return helper.deprecated_buildCompileTimeError(
+ message, offsetForToken(token));
}
toString() {
@@ -452,16 +456,16 @@ abstract class IncompleteSend extends FastaAccessor {
Arguments get arguments => null;
}
-class IncompleteError extends IncompleteSend with ErrorAccessor {
+class deprecated_IncompleteError extends IncompleteSend with ErrorAccessor {
final Object error;
- IncompleteError(BuilderHelper helper, Token token, this.error)
+ deprecated_IncompleteError(BuilderHelper helper, Token token, this.error)
: super(helper, token, null);
@override
Expression buildError(Arguments arguments,
{bool isGetter: false, bool isSetter: false, int offset}) {
- return helper.buildCompileTimeError(
+ return helper.deprecated_buildCompileTimeError(
error, offset ?? offsetForToken(this.token));
}
@@ -481,11 +485,11 @@ class SendAccessor extends IncompleteSend {
String get plainNameForRead => name.name;
Expression buildSimpleRead() {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildAssignment(Expression value, {bool voidContext: false}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
withReceiver(Object receiver, int operatorOffset, {bool isNullAware: false}) {
@@ -495,7 +499,7 @@ class SendAccessor extends IncompleteSend {
if (receiver is PrefixBuilder) {
PrefixBuilder prefix = receiver;
if (isNullAware) {
- helper.addCompileTimeError(
+ helper.deprecated_addCompileTimeError(
offsetForToken(token),
"Library prefix '${prefix.name}' can't be used with null-aware "
"operator.\nTry removing '?'.");
@@ -512,7 +516,7 @@ class SendAccessor extends IncompleteSend {
Expression buildNullAwareAssignment(
Expression value, DartType type, int offset,
{bool voidContext: false}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildCompoundAssignment(Name binaryOperator, Expression value,
@@ -520,21 +524,21 @@ class SendAccessor extends IncompleteSend {
bool voidContext: false,
Procedure interfaceTarget,
bool isPreIncDec: false}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildPrefixIncrement(Name binaryOperator,
{int offset, bool voidContext: false, Procedure interfaceTarget}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildPostfixIncrement(Name binaryOperator,
{int offset, bool voidContext: false, Procedure interfaceTarget}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression doInvocation(int offset, Arguments arguments) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
toString() {
@@ -549,10 +553,10 @@ class IncompletePropertyAccessor extends IncompleteSend {
String get plainNameForRead => name.name;
- Expression buildSimpleRead() => internalError("Unhandled");
+ Expression buildSimpleRead() => deprecated_internalProblem("Unhandled");
Expression buildAssignment(Expression value, {bool voidContext: false}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
withReceiver(Object receiver, int operatorOffset, {bool isNullAware: false}) {
@@ -562,7 +566,7 @@ class IncompletePropertyAccessor extends IncompleteSend {
if (receiver is PrefixBuilder) {
PrefixBuilder prefix = receiver;
if (isNullAware) {
- helper.addCompileTimeError(
+ helper.deprecated_addCompileTimeError(
offsetForToken(token),
"Library prefix '${prefix.name}' can't be used with null-aware "
"operator.\nTry removing '?'.");
@@ -578,7 +582,7 @@ class IncompletePropertyAccessor extends IncompleteSend {
Expression buildNullAwareAssignment(
Expression value, DartType type, int offset,
{bool voidContext: false}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildCompoundAssignment(Name binaryOperator, Expression value,
@@ -586,21 +590,21 @@ class IncompletePropertyAccessor extends IncompleteSend {
bool voidContext: false,
Procedure interfaceTarget,
bool isPreIncDec: false}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildPrefixIncrement(Name binaryOperator,
{int offset, bool voidContext: false, Procedure interfaceTarget}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression buildPostfixIncrement(Name binaryOperator,
{int offset, bool voidContext: false, Procedure interfaceTarget}) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
Expression doInvocation(int offset, Arguments arguments) {
- return internalError("Unhandled");
+ return deprecated_internalProblem("Unhandled");
}
toString() {
@@ -698,14 +702,14 @@ class StaticAccessor extends kernel.StaticAccessor with FastaAccessor {
factory StaticAccessor.fromBuilder(BuilderHelper helper, Builder builder,
Token token, Builder builderSetter) {
- if (builder is AccessErrorBuilder) {
- AccessErrorBuilder error = builder;
+ if (builder is deprecated_AccessErrorBuilder) {
+ deprecated_AccessErrorBuilder error = builder;
builder = error.builder;
// We should only see an access error here if we've looked up a setter
// when not explicitly looking for a setter.
assert(builder.isSetter);
} else if (builder.target == null) {
- return internalError("Unhandled: ${builder}");
+ return deprecated_internalProblem("Unhandled: ${builder}");
}
Member getter = builder.target.hasGetter ? builder.target : null;
Member setter = builder.target.hasSetter ? builder.target : null;
@@ -721,7 +725,8 @@ class StaticAccessor extends kernel.StaticAccessor with FastaAccessor {
Expression doInvocation(int offset, Arguments arguments) {
if (helper.constantExpressionRequired && !helper.isIdentical(readTarget)) {
- helper.addCompileTimeError(offset, "Not a constant expression.");
+ helper.deprecated_addCompileTimeError(
+ offset, "Not a constant expression.");
}
if (readTarget == null || isFieldOrGetter(readTarget)) {
return helper.buildMethodInvocation(buildSimpleRead(), callName,
@@ -753,7 +758,8 @@ class SuperPropertyAccessor extends kernel.SuperPropertyAccessor
Expression doInvocation(int offset, Arguments arguments) {
if (helper.constantExpressionRequired) {
- helper.addCompileTimeError(offset, "Not a constant expression.");
+ helper.deprecated_addCompileTimeError(
+ offset, "Not a constant expression.");
}
if (getter == null || isFieldOrGetter(getter)) {
return helper.buildMethodInvocation(
@@ -765,8 +771,10 @@ class SuperPropertyAccessor extends kernel.SuperPropertyAccessor
} else {
// TODO(ahe): This could be something like "super.property(...)" where
// property is a setter.
- return internalError("Unhandled invocation ${getter.runtimeType}.",
- helper.uri, offsetForToken(token));
+ return deprecated_internalProblem(
+ "Unhandled invocation ${getter.runtimeType}.",
+ helper.uri,
+ offsetForToken(token));
}
}
@@ -862,7 +870,7 @@ class NullAwarePropertyAccessor extends kernel.NullAwarePropertyAccessor
String get plainNameForRead => name.name;
Expression doInvocation(int offset, Arguments arguments) {
- return internalError("Not implemented yet.");
+ return deprecated_internalProblem("Not implemented yet.");
}
toString() => "NullAwarePropertyAccessor()";
@@ -919,7 +927,7 @@ class ParenthesizedExpression extends ReadOnlyAccessor {
: super(helper, expression, null, token);
Expression makeInvalidWrite(Expression value) {
- return helper.buildCompileTimeError(
+ return helper.deprecated_buildCompileTimeError(
"Can't assign to a parenthesized expression.", offsetForToken(token));
}
}
@@ -937,9 +945,9 @@ class TypeDeclarationAccessor extends ReadOnlyAccessor {
if (declaration is KernelInvalidTypeBuilder) {
KernelInvalidTypeBuilder declaration = this.declaration;
String message = declaration.message;
- helper.library.addWarning(declaration.charOffset, message,
+ helper.library.deprecated_addWarning(declaration.charOffset, message,
fileUri: declaration.fileUri);
- helper.warning(message, offset);
+ helper.deprecated_warning(message, offset);
super.expression = new Throw(
new StringLiteral(message)..fileOffset = offsetForToken(token))
..fileOffset = offset;
@@ -976,7 +984,8 @@ class TypeDeclarationAccessor extends ReadOnlyAccessor {
FastaAccessor accessor;
if (builder == null) {
- // If we find a setter, [builder] is an [AccessErrorBuilder], not null.
+ // If we find a setter, [builder] is an
+ // [deprecated_AccessErrorBuilder], not null.
accessor = new UnresolvedAccessor(helper, name, token);
} else {
Builder setter;
« pkg/front_end/lib/src/fasta/deprecated_problems.dart ('K') | « pkg/front_end/lib/src/fasta/kernel/body_builder.dart ('k') | pkg/front_end/lib/src/fasta/kernel/frontend_accessors.dart » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698