Fix source generation for strings that have \$ in them.

runtime/vm/object.cc

 // 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.
 
 #include "vm/object.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/assembler.h"
 #include "vm/bigint_operations.h"
@@ skipping 4836 matching lines @@
         if ((literal.CharAt(i) == '\\')) {
           if ((next != Token::kINTERPOL_VAR) &&
               (next != Token::kINTERPOL_START) &&
               (prev != Token::kINTERPOL_VAR) &&
               (prev != Token::kINTERPOL_END)) {
             is_raw_string = true;
           } else {
             escape_characters = true;
           }
         }
+        if ((literal.CharAt(i) == '$')) {

[Ivan Posva, 2013/03/18 18:12:22]

$ should be a SpecialCharacter and then you would not need this extra handling
here and in other places. Also as it is now if fails to properly escape $ in two
byte strings.

[siva, 2013/03/19 17:08:31]

The raw string processing was interfering with treating this as a Special
character. I have a CL uploaded that always translates raw strings to regular
strings and does not attempt to preserve raw strings as is in the generated
code.

That should avoid this problem.

On 2013/03/18 18:12:22, Ivan Posva wrote:

+          escape_characters = true;
+        }
       }
       if ((prev != Token::kINTERPOL_VAR) && (prev != Token::kINTERPOL_END)) {
         if (is_raw_string) {
           literals.Add(Symbols::LowercaseR());
         }
         literals.Add(Symbols::DoubleQuotes());
       }
       if (escape_characters) {
         literal = String::EscapeSpecialCharacters(literal, is_raw_string);
         literals.Add(literal);
@@ skipping 6609 matching lines @@
 
 
 RawOneByteString* OneByteString::EscapeSpecialCharacters(const String& str,
                                                          bool raw_str) {
   intptr_t len = str.Length();
   if (len > 0) {
     intptr_t num_escapes = 0;
     intptr_t index = 0;
     for (intptr_t i = 0; i < len; i++) {
       if (IsSpecialCharacter(*CharAddr(str, i)) ||
+          (!raw_str && (*CharAddr(str, i) == '$')) ||
           (!raw_str && (*CharAddr(str, i) == '\\'))) {
         num_escapes += 1;
       }
     }
     const String& dststr = String::Handle(
         OneByteString::New(len + num_escapes, Heap::kNew));
     for (intptr_t i = 0; i < len; i++) {
       if (IsSpecialCharacter(*CharAddr(str, i))) {
         *(CharAddr(dststr, index)) = '\\';
         *(CharAddr(dststr, index + 1)) = SpecialCharacter(*CharAddr(str, i));
         index += 2;
+      } else if (!raw_str && (*CharAddr(str, i) == '$')) {
+        *(CharAddr(dststr, index)) = '\\';
+        *(CharAddr(dststr, index + 1)) = '$';
+        index += 2;
       } else if (!raw_str && (*CharAddr(str, i) == '\\')) {
         *(CharAddr(dststr, index)) = '\\';
         *(CharAddr(dststr, index + 1)) = '\\';
         index += 2;
       } else {
         *(CharAddr(dststr, index)) = *CharAddr(str, i);
         index += 1;
       }
     }
     return OneByteString::raw(dststr);
@@ skipping 1894 matching lines @@
   }
   return result.raw();
 }
 
 
 const char* WeakProperty::ToCString() const {
   return "_WeakProperty";
 }
 
 }  // namespace dart