Make string juxtaposition combine properly with string interpolations.

frog/leg/scanner/scanner_task.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.
 
 class ScannerTask extends CompilerTask {
   ScannerTask(Compiler compiler) : super(compiler);
   String get name() => 'Scanner';
 
   void scan(CompilationUnitElement compilationUnit) {
     measure(() {
       if (compilationUnit.kind === ElementKind.LIBRARY) {
         compiler.log("scanning library ${compilationUnit.script.name}");
       }
       scanElements(compilationUnit);
       if (compilationUnit.kind === ElementKind.LIBRARY) {
         processScriptTags(compilationUnit);
       }
     });
   }
 
   void processScriptTags(LibraryElement library) {
     LinkBuilder<ScriptTag> imports = new LinkBuilder<ScriptTag>();
     Uri cwd = new Uri(scheme: 'file', path: compiler.currentDirectory);
     Uri base = cwd.resolve(library.script.name.toString());
     for (ScriptTag tag in library.tags.reverse()) {
-      SourceString argument = tag.argument.value.copyWithoutQuotes(1, 1);
-      Uri resolved = base.resolve(argument.slowToString());
+      StringNode argument = tag.argument;
+      // TODO(lrn): When supporting (compile-time constant) interpolations,

[ahe, 2012/03/19 15:53:06]

This TODO seems confused. We do not support compile-time constants here. We do
support interpolating a few predefined expressions that are not otherwise in
scope.

[Lasse Reichstein Nielsen, 2012/03/20 09:34:33]

Reworded.

+      // find a way to convert them to a string here.
+      Uri resolved = base.resolve(argument.dartString.slowToString());

[ahe, 2012/03/19 15:53:06]

FWIW, I like not having to call copyWithoutQuotes!

       if (tag.isImport()) {
         // It is not safe to import other libraries at this point as
         // another library could then observe the current library
         // before it fully declares all the members that are sourced
         // in.
         imports.addLast(tag);
       } else if (tag.isLibrary()) {
         if (library.libraryTag !== null) {
           compiler.cancel("duplicated library declaration", node: tag);
         } else {
           library.libraryTag = tag;
         }
       } else if (tag.isSource()) {
         Script script = compiler.readScript(resolved, tag);
         CompilationUnitElement unit =
           new CompilationUnitElement(script, library);
         compiler.withCurrentElement(unit, () => scan(unit));
       } else {
         compiler.cancel("illegal script tag: ${tag.tag}", node: tag);
       }
     }
     // TODO(ahe): During Compiler.scanBuiltinLibraries,
     // compiler.coreLibrary is null. Clean this up when there is a
     // better way to access "dart:core".
     bool implicitlyImportCoreLibrary = compiler.coreLibrary !== null;
     for (ScriptTag tag in imports.toLink()) {
       // Now that we have processed all the source tags, it is safe to
       // start loading other libraries.
-      SourceString argument = tag.argument.value.copyWithoutQuotes(1, 1);
-      Uri resolved = base.resolve(argument.slowToString());
+      StringNode argument = tag.argument;
+      Uri resolved = base.resolve(argument.dartString.slowToString());
       if (resolved.toString() == "dart:core") {
         implicitlyImportCoreLibrary = false;
       }
       importLibrary(library, loadLibrary(resolved, tag), tag);
     }
     if (implicitlyImportCoreLibrary) {
       importLibrary(library, compiler.coreLibrary, null);
     }
   }
 
@@ skipping 29 matching lines @@
     if (newLibrary) {
       compiler.withCurrentElement(library, () => scan(library));
       compiler.onLibraryLoaded(library, uri);
     }
     return library;
   }
 
   void importLibrary(LibraryElement library, LibraryElement imported,
                      ScriptTag tag) {
     if (tag !== null && tag.prefix !== null) {
-      SourceString prefix = tag.prefix.dartString.source;
+      SourceString prefix =
+          new SourceString(tag.prefix.dartString.slowToString());

[ahe, 2012/03/19 15:53:06]

Something to consider: having a method named asSourceString() which can avoid
copying.

[Lasse Reichstein Nielsen, 2012/03/20 09:34:33]

We do have that (dartString.source), but it includes uninterpreted escapes. Is
this what we need here?

Or, if you want quotes too, just use tag.prefix.value.

Personally, I'd just make PrefixElement hold either a StringNode or a DartString
instead of a SourceString. It's an element, so I think DartString would be
appropriate.

[ahe, 2012/03/20 10:23:01]

Perhaps. I'm not sure what the specification says, but allowing escapes here
doesn't seem right.
I definitely don't want the quotes.
I don't see how that would work. The prefix element needs to go into a scope
that is based on SourceStrings. It is a kind of weird identifier.

       Element e = library.find(prefix);
       if (e === null) {
         e = new PrefixElement(prefix, library);
         library.define(e, compiler);
       }
       if (e.kind !== ElementKind.PREFIX) {
         compiler.withCurrentElement(e, () {
           compiler.reportWarning(new Identifier(e.position()),
                                  'duplicated definition');
         });
@@ skipping 27 matching lines @@
   final String name = 'Diet Parser';
 
   dietParse(CompilationUnitElement compilationUnit, Token tokens) {
     measure(() {
       ElementListener listener = new ElementListener(compiler, compilationUnit);
       PartialParser parser = new PartialParser(listener);
       parser.parseUnit(tokens);
     });
   }
 }