Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(835)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: vm/object.cc

Issue 10911159: - Add a test case to test Source code generation of all the corelibs (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/dart/runtime/
Patch Set: Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « vm/object.h ('k') | vm/snapshot_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: vm/object.cc
===================================================================
--- vm/object.cc (revision 12091)
+++ vm/object.cc (working copy)
@@ -190,6 +190,40 @@
}
+template<typename type>
+static bool IsSpecialCharacter(type value) {
+ return ((value == '"') ||
+ (value == '\n') ||
+ (value == '\f') ||
+ (value == '\b') ||
+ (value == '\t') ||
+ (value == '\v') ||
+ (value == '\r'));
+}
+
+
+template<typename type>
+static type SpecialCharacter(type value) {
+ if (value == '"') {
+ return '"';
+ } else if (value == '\n') {
+ return 'n';
+ } else if (value == '\f') {
+ return 'f';
+ } else if (value == '\b') {
+ return 'b';
+ } else if (value == '\t') {
+ return 't';
+ } else if (value == '\v') {
+ return 'v';
+ } else if (value == '\r') {
+ return 'r';
+ }
+ UNREACHABLE();
+ return '\0';
+}
+
+
void Object::InitOnce() {
// TODO(iposva): NoGCScope needs to be added here.
ASSERT(class_class() == null_);
@@ -5040,6 +5074,7 @@
String& double_quotes = String::Handle(String::New("\""));
String& dollar = String::Handle(String::New("$"));
String& two_spaces = String::Handle(String::New(" "));
+ String& raw_string = String::Handle(String::New("@"));
Token::Kind curr = iterator.CurrentTokenKind();
Token::Kind prev = Token::kILLEGAL;
@@ -5059,18 +5094,34 @@
// Handle the current token.
if (curr == Token::kSTRING) {
- bool escape_quotes = false;
+ bool is_raw_string = false;
+ bool escape_characters = false;
for (intptr_t i = 0; i < literal.Length(); i++) {
- if (literal.CharAt(i) == '"') {
- escape_quotes = true;
- break;
+ if (IsSpecialCharacter(literal.CharAt(i))) {
+ escape_characters = true;
}
+ // TODO(4995): Temp solution for raw strings, this will break
Ivan Posva 2012/09/09 10:24:17 I see two different options here to fix this curre
Ivan Posva 2012/09/09 10:31:58 Of course I had another idea just after hitting se
+ // if we saw a string that is not a raw string but has back slashes
+ // in it.
+ 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 ((prev != Token::kINTERPOL_VAR) && (prev != Token::kINTERPOL_END)) {
+ if (is_raw_string) {
+ literals.Add(raw_string);
+ }
literals.Add(double_quotes);
}
- if (escape_quotes) {
- literal = String::EscapeDoubleQuotes(literal);
+ if (escape_characters) {
+ literal = String::EscapeSpecialCharacters(literal, is_raw_string);
literals.Add(literal);
} else {
literals.Add(literal);
@@ -5080,6 +5131,9 @@
}
} else if (curr == Token::kINTERPOL_VAR) {
literals.Add(dollar);
+ if (literal.CharAt(0) == Scanner::kPrivateIdentifierStart) {
+ literal = String::SubString(literal, 0, literal.Length() - private_len);
+ }
literals.Add(literal);
} else if (curr == Token::kIDENT) {
if (literal.CharAt(0) == Scanner::kPrivateIdentifierStart) {
@@ -9415,18 +9469,18 @@
}
-RawString* String::EscapeDoubleQuotes(const String& str) {
+RawString* String::EscapeSpecialCharacters(const String& str, bool raw_str) {
if (str.IsOneByteString()) {
const OneByteString& onestr = OneByteString::Cast(str);
- return onestr.EscapeDoubleQuotes();
+ return onestr.EscapeSpecialCharacters(raw_str);
}
if (str.IsTwoByteString()) {
const TwoByteString& twostr = TwoByteString::Cast(str);
- return twostr.EscapeDoubleQuotes();
+ return twostr.EscapeSpecialCharacters(raw_str);
}
ASSERT(str.IsFourByteString());
const FourByteString& fourstr = FourByteString::Cast(str);
- return fourstr.EscapeDoubleQuotes();
+ return fourstr.EscapeSpecialCharacters(raw_str);
}
@@ -9594,23 +9648,28 @@
}
-RawOneByteString* OneByteString::EscapeDoubleQuotes() const {
+RawOneByteString* OneByteString::EscapeSpecialCharacters(bool raw_str) const {
intptr_t len = Length();
if (len > 0) {
- intptr_t num_quotes = 0;
+ intptr_t num_escapes = 0;
intptr_t index = 0;
for (intptr_t i = 0; i < len; i++) {
- if (*CharAddr(i) == '"') {
- num_quotes += 1;
+ if (IsSpecialCharacter(*CharAddr(i)) ||
+ (!raw_str && (*CharAddr(i) == '\\'))) {
+ num_escapes += 1;
}
}
const OneByteString& dststr = OneByteString::Handle(
- OneByteString::New(len + num_quotes, Heap::kNew));
+ OneByteString::New(len + num_escapes, Heap::kNew));
for (intptr_t i = 0; i < len; i++) {
- if (*CharAddr(i) == '"') {
+ if (IsSpecialCharacter(*CharAddr(i))) {
*(dststr.CharAddr(index)) = '\\';
- *(dststr.CharAddr(index + 1)) = '"';
+ *(dststr.CharAddr(index + 1)) = SpecialCharacter(*CharAddr(i));
index += 2;
+ } else if (!raw_str && (*CharAddr(i) == '\\')) {
+ *(dststr.CharAddr(index)) = '\\';
+ *(dststr.CharAddr(index + 1)) = '\\';
+ index += 2;
} else {
*(dststr.CharAddr(index)) = *CharAddr(i);
index += 1;
@@ -9792,23 +9851,28 @@
}
-RawTwoByteString* TwoByteString::EscapeDoubleQuotes() const {
+RawTwoByteString* TwoByteString::EscapeSpecialCharacters(bool raw_str) const {
intptr_t len = Length();
if (len > 0) {
- intptr_t num_quotes = 0;
+ intptr_t num_escapes = 0;
intptr_t index = 0;
for (intptr_t i = 0; i < len; i++) {
- if (*CharAddr(i) == '"') {
- num_quotes += 1;
+ if (IsSpecialCharacter(*CharAddr(i)) ||
+ (!raw_str && (*CharAddr(i) == '\\'))) {
+ num_escapes += 1;
}
}
const TwoByteString& dststr = TwoByteString::Handle(
- TwoByteString::New(len + num_quotes, Heap::kNew));
+ TwoByteString::New(len + num_escapes, Heap::kNew));
for (intptr_t i = 0; i < len; i++) {
- if (*CharAddr(i) == '"') {
+ if (IsSpecialCharacter(*CharAddr(i))) {
*(dststr.CharAddr(index)) = '\\';
- *(dststr.CharAddr(index + 1)) = '"';
+ *(dststr.CharAddr(index + 1)) = SpecialCharacter(*CharAddr(i));
index += 2;
+ } else if (!raw_str && (*CharAddr(i) == '\\')) {
+ *(dststr.CharAddr(index)) = '\\';
+ *(dststr.CharAddr(index + 1)) = '\\';
+ index += 2;
} else {
*(dststr.CharAddr(index)) = *CharAddr(i);
index += 1;
@@ -9924,23 +9988,28 @@
}
-RawFourByteString* FourByteString::EscapeDoubleQuotes() const {
+RawFourByteString* FourByteString::EscapeSpecialCharacters(bool raw_str) const {
intptr_t len = Length();
if (len > 0) {
- intptr_t num_quotes = 0;
+ intptr_t num_escapes = 0;
intptr_t index = 0;
for (intptr_t i = 0; i < len; i++) {
- if (*CharAddr(i) == '"') {
- num_quotes += 1;
+ if (IsSpecialCharacter(*CharAddr(i)) ||
+ (!raw_str && (*CharAddr(i) == '\\'))) {
+ num_escapes += 1;
}
}
const FourByteString& dststr = FourByteString::Handle(
- FourByteString::New(len + num_quotes, Heap::kNew));
+ FourByteString::New(len + num_escapes, Heap::kNew));
for (intptr_t i = 0; i < len; i++) {
- if (*CharAddr(i) == '"') {
+ if (IsSpecialCharacter(*CharAddr(i))) {
*(dststr.CharAddr(index)) = '\\';
- *(dststr.CharAddr(index + 1)) = '"';
+ *(dststr.CharAddr(index + 1)) = SpecialCharacter(*CharAddr(i));
index += 2;
+ } else if (!raw_str && (*CharAddr(i) == '\\')) {
+ *(dststr.CharAddr(index)) = '\\';
+ *(dststr.CharAddr(index + 1)) = '\\';
+ index += 2;
} else {
*(dststr.CharAddr(index)) = *CharAddr(i);
index += 1;
« no previous file with comments | « vm/object.h ('k') | vm/snapshot_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698