Get astBuilder and typeInferenceEngine from SourceLoader.

pkg/front_end/lib/src/fasta/builder/builder.dart

Index: pkg/front_end/lib/src/fasta/builder/builder.dart
diff --git a/pkg/front_end/lib/src/fasta/builder/builder.dart b/pkg/front_end/lib/src/fasta/builder/builder.dart
index 50fb7afd362ecb035446e36044ef0e2a8bf00974..90e4ffda163dedf0b03433c58fcbedca3c0be6ae 100644
--- a/pkg/front_end/lib/src/fasta/builder/builder.dart
+++ b/pkg/front_end/lib/src/fasta/builder/builder.dart
@@ -61,8 +61,8 @@ import 'library_builder.dart' show LibraryBuilder;
 import 'package:front_end/src/fasta/builder/class_builder.dart'
     show ClassBuilder;
 
-import 'package:front_end/src/fasta/type_inference/type_inference_engine.dart'
-    show TypeInferenceEngine;
+import 'package:front_end/src/fasta/source/source_library_builder.dart'
+    show SourceLibraryBuilder;

[ahe, 2017/05/04 17:35:22]

Could we add a loader property to LibraryBuilder to avoid this import?

[Paul Berry, 2017/05/04 20:09:26]

LibraryBuilder already has a loader property but it returns Loader.  By using
SourceLibraryBuilder instead we take advantage of the fact that
SourceLibraryBuilder.library returns SourceLoader.  That's needed in
kernel_field_builder.dart so that we can do `library.loader.typeInferenceEngine`
and `library.loader.astFactory` without having to do a cast.

Leaving as is for now.  If you feel strongly about this we can always do a
follow up CL.

 
 abstract class Builder {
   /// Used when multiple things with the same name are declared within the same
@@ -139,6 +139,6 @@ abstract class Builder {
     return internalError("No library parent.");
   }
 
-  void prepareInitializerInference(TypeInferenceEngine typeInferenceEngine,
-      LibraryBuilder library, ClassBuilder currentClass) {}
+  void prepareInitializerInference(
+      SourceLibraryBuilder library, ClassBuilder currentClass) {}
 }