Move namer into javascript backend.

lib/compiler/implementation/compiler.dart

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // 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.
 
 
 /**
  * If true, print a warning for each method that was resolved, but not
  * compiled.
  */
 const bool REPORT_EXCESS_RESOLUTION = false;
@@ skipping 66 matching lines @@
   }
 
   SourceString getCheckedModeHelper(DartType type) => null;
 }
 
 class Compiler implements DiagnosticListener {
   final Map<String, LibraryElement> libraries;
   int nextFreeClassId = 0;
   World world;
   String assembledCode;
-  Namer namer;
   Types types;
 
   final bool enableMinification;
   final bool enableTypeAssertions;
   final bool enableUserAssertions;
 
   final Tracer tracer;
 
   CompilerTask measuredTask;
   Element _currentElement;
@@ skipping 87 matching lines @@
             this.enableTypeAssertions = false,
             this.enableUserAssertions = false,
             this.enableMinification = false,
             bool emitJavaScript = true,
             bool generateSourceMap = true,
             bool cutDeclarationTypes = false])
       : libraries = new Map<String, LibraryElement>(),
         world = new World(),
         progress = new Stopwatch() {
     progress.start();
-    namer = new Namer(this);
     scanner = new ScannerTask(this);
     dietParser = new DietParserTask(this);
     parser = new ParserTask(this);
     patchParser = new PatchParserTask(this);
     validator = new TreeValidatorTask(this);
     resolver = new ResolverTask(this);
     closureToClassMapper = new closureMapping.ClosureTask(this);
     checker = new TypeCheckerTask(this);
     typesTask = new ti.TypesTask(this);
     backend = emitJavaScript ?
         new js_backend.JavaScriptBackend(this, generateSourceMap) :
         new dart_backend.DartBackend(this, cutDeclarationTypes);
     constantHandler = new ConstantHandler(this, backend.constantSystem);
     enqueuer = new EnqueueTask(this);
     tasks = [scanner, dietParser, parser, resolver, closureToClassMapper,
              checker, typesTask, constantHandler, enqueuer];
     tasks.addAll(backend.tasks);
   }
 
+  // TODO(floitsch): remove once the compile-time constant handler doesn't
+  // depend on it anymore.
+  js_backend.Namer get namer => (backend as js_backend.JavaScriptBackend).namer;

[kasperl, 2012/09/06 07:47:53]

This seems hacky. Looking forward to getting rid of this.

+
   Universe get resolverWorld => enqueuer.resolution.universe;
   Universe get codegenWorld => enqueuer.codegen.universe;
 
   int getNextFreeClassId() => nextFreeClassId++;
 
   void ensure(bool condition) {
     if (!condition) cancel('failed assertion in leg');
   }
 
   void unimplemented(String methodName,
@@ skipping 701 matching lines @@
     final endOffset = end.charOffset + end.slowCharCount;
 
     // [begin] and [end] might be the same for the same empty token. This
     // happens for instance when scanning '$$'.
     assert(endOffset >= beginOffset);
     return f(beginOffset, endOffset);
   }
 
   String toString() => 'SourceSpan($uri, $begin, $end)';
 }