| Index: pkg/dartino_compiler/lib/incremental/dartino_compiler_incremental.dart
|
| diff --git a/pkg/fletchc/lib/incremental/fletchc_incremental.dart b/pkg/dartino_compiler/lib/incremental/dartino_compiler_incremental.dart
|
| similarity index 89%
|
| rename from pkg/fletchc/lib/incremental/fletchc_incremental.dart
|
| rename to pkg/dartino_compiler/lib/incremental/dartino_compiler_incremental.dart
|
| index 566f735035a71ec6b9fad6474d60b4e89e98ab62..7b2980ece142040e75692809f953fb58a42fe501 100644
|
| --- a/pkg/fletchc/lib/incremental/fletchc_incremental.dart
|
| +++ b/pkg/dartino_compiler/lib/incremental/dartino_compiler_incremental.dart
|
| @@ -2,7 +2,7 @@
|
| // for details. All rights reserved. Use of this source code is governed by a
|
| // BSD-style license that can be found in the LICENSE file.
|
|
|
| -library fletchc_incremental;
|
| +library dartino_compiler_incremental;
|
|
|
| import 'dart:async' show
|
| EventSink,
|
| @@ -30,13 +30,13 @@ import 'package:compiler/src/elements/elements.dart' show
|
| import 'package:compiler/src/library_loader.dart' show
|
| ReuseLibrariesFunction;
|
|
|
| -import 'fletch_reuser.dart' show
|
| +import 'dartino_reuser.dart' show
|
| IncrementalCompilerContext,
|
| - FletchReuser,
|
| + DartinoReuser,
|
| Logger;
|
|
|
| -import '../fletch_compiler.dart' show
|
| - FletchCompiler;
|
| +import '../dartino_compiler.dart' show
|
| + DartinoCompiler;
|
|
|
| import '../src/debug_info.dart' show
|
| DebugInfo;
|
| @@ -44,17 +44,17 @@ import '../src/debug_info.dart' show
|
| import '../src/class_debug_info.dart' show
|
| ClassDebugInfo;
|
|
|
| -import '../src/fletch_selector.dart' show
|
| - FletchSelector;
|
| +import '../src/dartino_selector.dart' show
|
| + DartinoSelector;
|
|
|
| -import '../src/fletch_compiler_implementation.dart' show
|
| - FletchCompilerImplementation,
|
| +import '../src/dartino_compiler_implementation.dart' show
|
| + DartinoCompilerImplementation,
|
| OutputProvider;
|
|
|
| -import '../fletch_system.dart';
|
| +import '../dartino_system.dart';
|
|
|
| -import '../src/fletch_backend.dart' show
|
| - FletchBackend;
|
| +import '../src/dartino_backend.dart' show
|
| + DartinoBackend;
|
|
|
| import '../src/hub/exit_codes.dart' as exit_codes;
|
|
|
| @@ -96,7 +96,7 @@ class IncrementalCompiler {
|
| final Uri libraryRoot;
|
| final Uri nativesJson;
|
| final Uri packageConfig;
|
| - final Uri fletchVm;
|
| + final Uri dartinoVm;
|
| final CompilerInput inputProvider;
|
| final List<String> options;
|
| final CompilerOutput outputProvider;
|
| @@ -106,13 +106,13 @@ class IncrementalCompiler {
|
| final String platform;
|
| final Map<Uri, Uri> _updatedFiles = new Map<Uri, Uri>();
|
|
|
| - FletchCompilerImplementation _compiler;
|
| + DartinoCompilerImplementation _compiler;
|
|
|
| IncrementalCompiler(
|
| {this.libraryRoot,
|
| this.nativesJson,
|
| this.packageConfig,
|
| - this.fletchVm,
|
| + this.dartinoVm,
|
| this.inputProvider,
|
| CompilerDiagnostics diagnosticHandler,
|
| this.options,
|
| @@ -150,7 +150,7 @@ class IncrementalCompiler {
|
|
|
| LibraryElement get mainApp => _compiler.mainApp;
|
|
|
| - FletchCompilerImplementation get compiler => _compiler;
|
| + DartinoCompilerImplementation get compiler => _compiler;
|
|
|
| /// Perform a full compile of [script]. This will reset the incremental
|
| /// compiler.
|
| @@ -208,7 +208,7 @@ class IncrementalCompiler {
|
| libraryRoot: libraryRoot,
|
| packageConfig: packageConfig,
|
| nativesJson: nativesJson,
|
| - fletchVm: fletchVm,
|
| + dartinoVm: dartinoVm,
|
| inputProvider: inputProvider,
|
| diagnosticHandler: _context,
|
| options: options,
|
| @@ -232,8 +232,8 @@ class IncrementalCompiler {
|
| ///
|
| /// Error messages will be reported relative to [base], if [base] is not
|
| /// provided the previous set [base] will be used.
|
| - Future<FletchDelta> compileUpdates(
|
| - FletchSystem currentSystem,
|
| + Future<DartinoDelta> compileUpdates(
|
| + DartinoSystem currentSystem,
|
| Map<Uri, Uri> updatedFiles,
|
| {Logger logTime,
|
| Logger logVerbose,
|
| @@ -252,7 +252,7 @@ class IncrementalCompiler {
|
| Uri updatedFile = _updatedFiles[uri];
|
| return inputProvider.readFromUri(updatedFile == null ? uri : updatedFile);
|
| }
|
| - FletchReuser reuser = new FletchReuser(
|
| + DartinoReuser reuser = new DartinoReuser(
|
| _compiler,
|
| mappingInputProvider,
|
| logTime,
|
| @@ -262,18 +262,18 @@ class IncrementalCompiler {
|
| return _reuseCompiler(reuser.reuseLibraries, base: base).then(
|
| (CompilerImpl compiler) async {
|
| _compiler = compiler;
|
| - FletchDelta delta = await reuser.computeUpdateFletch(currentSystem);
|
| + DartinoDelta delta = await reuser.computeUpdateDartino(currentSystem);
|
| _checkCompilationFailed();
|
| return delta;
|
| });
|
| }
|
|
|
| - FletchDelta computeInitialDelta() {
|
| - FletchBackend backend = _compiler.backend;
|
| + DartinoDelta computeInitialDelta() {
|
| + DartinoBackend backend = _compiler.backend;
|
| return backend.computeDelta();
|
| }
|
|
|
| - String lookupFunctionName(FletchFunction function) {
|
| + String lookupFunctionName(DartinoFunction function) {
|
| if (function.isParameterStub) return "<parameter stub>";
|
| Element element = function.element;
|
| if (element == null) return function.name;
|
| @@ -292,25 +292,25 @@ class IncrementalCompiler {
|
| return '${enclosing.name}.${function.name}';
|
| }
|
|
|
| - ClassDebugInfo createClassDebugInfo(FletchClass klass) {
|
| + ClassDebugInfo createClassDebugInfo(DartinoClass klass) {
|
| return _compiler.context.backend.createClassDebugInfo(klass);
|
| }
|
|
|
| String lookupFunctionNameBySelector(int selector) {
|
| - int id = FletchSelector.decodeId(selector);
|
| + int id = DartinoSelector.decodeId(selector);
|
| return _compiler.context.symbols[id];
|
| }
|
|
|
| DebugInfo createDebugInfo(
|
| - FletchFunction function,
|
| - FletchSystem currentSystem) {
|
| + DartinoFunction function,
|
| + DartinoSystem currentSystem) {
|
| return _compiler.context.backend.createDebugInfo(function, currentSystem);
|
| }
|
|
|
| DebugInfo debugInfoForPosition(
|
| Uri file,
|
| int position,
|
| - FletchSystem currentSystem) {
|
| + DartinoSystem currentSystem) {
|
| return _compiler.debugInfoForPosition(file, position, currentSystem);
|
| }
|
|
|
|
|