| OLD | NEW |
| 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 // for details. All rights reserved. Use of this source code is governed by a | 2 // for details. All rights reserved. Use of this source code is governed by a |
| 3 // BSD-style license that can be found in the LICENSE file. | 3 // BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 // Check the validity of string literals. | 5 // Check the validity of string literals. |
| 6 | 6 |
| 7 library stringvalidator; | 7 library stringvalidator; |
| 8 | 8 |
| 9 import 'dart:collection'; | 9 import 'dart:collection'; |
| 10 | 10 |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 95 * literals (including an initial 'r' for raw strings). | 95 * literals (including an initial 'r' for raw strings). |
| 96 */ | 96 */ |
| 97 String copyWithoutQuotes(String string, int initial, int terminal) { | 97 String copyWithoutQuotes(String string, int initial, int terminal) { |
| 98 assert(0 <= initial); | 98 assert(0 <= initial); |
| 99 assert(0 <= terminal); | 99 assert(0 <= terminal); |
| 100 assert(initial + terminal <= string.length); | 100 assert(initial + terminal <= string.length); |
| 101 return string.substring(initial, string.length - terminal); | 101 return string.substring(initial, string.length - terminal); |
| 102 } | 102 } |
| 103 | 103 |
| 104 void stringParseError(String message, Token token, int offset) { | 104 void stringParseError(String message, Token token, int offset) { |
| 105 listener.reportError( | 105 listener.reportErrorMessage( |
| 106 token, MessageKind.GENERIC, {'text': "$message @ $offset"}); | 106 token, MessageKind.GENERIC, {'text': "$message @ $offset"}); |
| 107 } | 107 } |
| 108 | 108 |
| 109 /** | 109 /** |
| 110 * Validates the escape sequences and special characters of a string literal. | 110 * Validates the escape sequences and special characters of a string literal. |
| 111 * Returns a DartString if valid, and null if not. | 111 * Returns a DartString if valid, and null if not. |
| 112 */ | 112 */ |
| 113 DartString validateString(Token token, | 113 DartString validateString(Token token, |
| 114 int startOffset, | 114 int startOffset, |
| 115 String string, | 115 String string, |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 225 return null; | 225 return null; |
| 226 } | 226 } |
| 227 // String literal successfully validated. | 227 // String literal successfully validated. |
| 228 if (quoting.raw || !containsEscape) { | 228 if (quoting.raw || !containsEscape) { |
| 229 // A string without escapes could just as well have been raw. | 229 // A string without escapes could just as well have been raw. |
| 230 return new DartString.rawString(string, length); | 230 return new DartString.rawString(string, length); |
| 231 } | 231 } |
| 232 return new DartString.escapedString(string, length); | 232 return new DartString.escapedString(string, length); |
| 233 } | 233 } |
| 234 } | 234 } |
| OLD | NEW |