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

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

Issue 2828253003: Add top level type inference logic for integer literals. (Closed)
Patch Set: Clean up, bug fix, and remove unintentional expectations changes Created 3 years, 8 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
Index: pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
diff --git a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
index 38e4483d5fc49bb3ceab9c76383353d9b005b876..a761ab2e67ea6b541ba4dbcc4e0dcaecbc6595df 100644
--- a/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
+++ b/pkg/front_end/lib/src/fasta/kernel/kernel_shadow_ast.dart
@@ -20,8 +20,6 @@
import 'package:front_end/src/base/instrumentation.dart';
import 'package:front_end/src/fasta/type_inference/type_inferrer.dart';
import 'package:kernel/ast.dart';
-import 'package:kernel/class_hierarchy.dart';
-import 'package:kernel/core_types.dart';
/// Concrete shadow object representing a statement block in kernel form.
class KernelBlock extends Block implements KernelStatement {
@@ -44,6 +42,36 @@ abstract class KernelExpression implements Expression {
KernelTypeInferrer inferrer, DartType typeContext, bool typeNeeded);
}
+/// Concrete shadow object representing a field in kernel form.
+class KernelField extends Field {
+ bool _implicitlyTyped = true;
+
+ FieldNode<KernelField> _fieldNode;
+
+ bool _isInferred = false;
+
+ KernelField(Name name, {String fileUri}) : super(name, fileUri: fileUri) {}
+
+ @override
+ void set type(DartType value) {
+ _implicitlyTyped = false;
+ super.type = value;
+ }
+
+ String get _fileUri {
+ // TODO(paulberry): This is a hack. We should use this.fileUri, because we
+ // want the URI of the compilation unit. But that gives a relative URI,
+ // and I don't know what it's relative to or how to convert it to an
+ // absolute URI.
+ return enclosingLibrary.importUri.toString();
+ }
+
+ void _setInferredType(DartType inferredType) {
+ _isInferred = true;
+ super.type = inferredType;
+ }
+}
+
/// Concrete shadow object representing a function expression in kernel form.
class KernelFunctionExpression extends FunctionExpression
implements KernelExpression {
@@ -110,13 +138,70 @@ abstract class KernelStatement extends Statement {
void _inferStatement(KernelTypeInferrer inferrer);
}
+/// Concrete shadow object representing a read of a static variable in kernel
+/// form.
+class KernelStaticGet extends StaticGet implements KernelExpression {
+ KernelStaticGet(Member target) : super(target);
+
+ @override
+ DartType _inferExpression(
+ KernelTypeInferrer inferrer, DartType typeContext, bool typeNeeded) {
+ return inferrer.inferStaticGet(typeContext, typeNeeded, target.getterType);
+ }
+}
+
/// Concrete implementation of [TypeInferrer] specialized to work with kernel
/// objects.
class KernelTypeInferrer extends TypeInferrer<Statement, Expression,
- KernelVariableDeclaration, Field> {
- KernelTypeInferrer(CoreTypes coreTypes, ClassHierarchy classHierarchy,
- Instrumentation instrumentation, bool strongMode)
- : super(coreTypes, classHierarchy, instrumentation, strongMode);
+ KernelVariableDeclaration, KernelField> {
+ KernelTypeInferrer(Instrumentation instrumentation, bool strongMode)
+ : super(instrumentation, strongMode);
+
+ @override
+ void clearFieldInitializer(KernelField field) {
+ field.initializer = null;
+ }
+
+ @override
+ FieldNode<KernelField> createFieldNode(KernelField field) {
+ FieldNode<KernelField> fieldNode = new FieldNode<KernelField>(this, field);
+ field._fieldNode = fieldNode;
+ return fieldNode;
+ }
+
+ @override
+ DartType getFieldDeclaredType(KernelField field) {
+ return field._implicitlyTyped ? null : field.type;
+ }
+
+ @override
+ List<FieldNode<KernelField>> getFieldDependencies(KernelField field) {
+ return field._fieldNode?.dependencies;
+ }
+
+ @override
+ Expression getFieldInitializer(KernelField field) {
+ return field.initializer;
+ }
+
+ @override
+ FieldNode<KernelField> getFieldNodeForReadTarget(Member readTarget) {
+ if (readTarget is KernelField) {
+ return readTarget._fieldNode;
+ } else {
+ return null;
+ }
+ }
+
+ @override
+ int getFieldOffset(KernelField field) {
+ return field.fileOffset;
+ }
+
+ @override
+ String getFieldUri(KernelField field) {
+ return field._fileUri;
+ }
@override
DartType inferExpression(
@@ -153,6 +238,16 @@ class KernelTypeInferrer extends TypeInferrer<Statement, Expression,
// everything, this case should no longer be needed.
}
}
+
+ @override
+ bool isFieldInferred(KernelField field) {
+ return field._isInferred;
+ }
+
+ @override
+ void setFieldInferredType(KernelField field, DartType inferredType) {
+ field._setInferredType(inferredType);
+ }
}
/// Concrete shadow object representing a variable declaration in kernel form.

Powered by Google App Engine
This is Rietveld 408576698