| 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 patch class RegExp { | 5 patch class RegExp { |
| 6 /* patch */ factory RegExp(String source, | 6 /* patch */ factory RegExp(String source, |
| 7 {bool multiLine: false, | 7 {bool multiLine: false, |
| 8 bool caseSensitive: true}) { | 8 bool caseSensitive: true}) { |
| 9 return new _JSSyntaxRegExp(source, | 9 return new _JSSyntaxRegExp(source, |
| 10 multiLine: multiLine, | 10 multiLine: multiLine, |
| 11 caseSensitive: caseSensitive); | 11 caseSensitive: caseSensitive); |
| 12 } | 12 } |
| 13 } | 13 } |
| 14 | 14 |
| 15 class _JSRegExpMatch implements Match { | 15 class _JSRegExpMatch implements Match { |
| 16 _JSRegExpMatch(this._regexp, this.str, this._match); | 16 _JSRegExpMatch(this._regexp, this.input, this._match); |
| 17 | 17 |
| 18 int get start => _start(0); | 18 int get start => _start(0); |
| 19 int get end => _end(0); | 19 int get end => _end(0); |
| 20 | 20 |
| 21 int _start(int groupIdx) { | 21 int _start(int groupIdx) { |
| 22 return _match[(groupIdx * _MATCH_PAIR)]; | 22 return _match[(groupIdx * _MATCH_PAIR)]; |
| 23 } | 23 } |
| 24 | 24 |
| 25 int _end(int groupIdx) { | 25 int _end(int groupIdx) { |
| 26 return _match[(groupIdx * _MATCH_PAIR) + 1]; | 26 return _match[(groupIdx * _MATCH_PAIR) + 1]; |
| 27 } | 27 } |
| 28 | 28 |
| 29 String group(int groupIdx) { | 29 String group(int groupIdx) { |
| 30 if (groupIdx < 0 || groupIdx > _regexp._groupCount) { | 30 if (groupIdx < 0 || groupIdx > _regexp._groupCount) { |
| 31 throw new RangeError.value(groupIdx); | 31 throw new RangeError.value(groupIdx); |
| 32 } | 32 } |
| 33 int startIndex = _start(groupIdx); | 33 int startIndex = _start(groupIdx); |
| 34 int endIndex = _end(groupIdx); | 34 int endIndex = _end(groupIdx); |
| 35 if (startIndex == -1) { | 35 if (startIndex == -1) { |
| 36 assert(endIndex == -1); | 36 assert(endIndex == -1); |
| 37 return null; | 37 return null; |
| 38 } | 38 } |
| 39 return str._substringUnchecked(startIndex, endIndex); | 39 return input._substringUnchecked(startIndex, endIndex); |
| 40 } | 40 } |
| 41 | 41 |
| 42 String operator [](int groupIdx) { | 42 String operator [](int groupIdx) { |
| 43 return this.group(groupIdx); | 43 return this.group(groupIdx); |
| 44 } | 44 } |
| 45 | 45 |
| 46 List<String> groups(List<int> groupsSpec) { | 46 List<String> groups(List<int> groupsSpec) { |
| 47 var groupsList = new List<String>(groupsSpec.length); | 47 var groupsList = new List<String>(groupsSpec.length); |
| 48 for (int i = 0; i < groupsSpec.length; i++) { | 48 for (int i = 0; i < groupsSpec.length; i++) { |
| 49 groupsList[i] = group(groupsSpec[i]); | 49 groupsList[i] = group(groupsSpec[i]); |
| 50 } | 50 } |
| 51 return groupsList; | 51 return groupsList; |
| 52 } | 52 } |
| 53 | 53 |
| 54 int get groupCount => _regexp._groupCount; | 54 int get groupCount => _regexp._groupCount; |
| 55 | 55 |
| 56 Pattern get pattern => _regexp; | 56 Pattern get pattern => _regexp; |
| 57 | 57 |
| 58 // TODO(12843): Remove when grace period is over. |
| 59 String get str => input; |
| 60 |
| 58 final RegExp _regexp; | 61 final RegExp _regexp; |
| 59 final String str; | 62 final String input; |
| 60 final List<int> _match; | 63 final List<int> _match; |
| 61 static const int _MATCH_PAIR = 2; | 64 static const int _MATCH_PAIR = 2; |
| 62 } | 65 } |
| 63 | 66 |
| 64 | 67 |
| 65 class _JSSyntaxRegExp implements RegExp { | 68 class _JSSyntaxRegExp implements RegExp { |
| 66 factory _JSSyntaxRegExp( | 69 factory _JSSyntaxRegExp( |
| 67 String pattern, | 70 String pattern, |
| 68 {bool multiLine: false, | 71 {bool multiLine: false, |
| 69 bool caseSensitive: true}) native "JSSyntaxRegExp_factory"; | 72 bool caseSensitive: true}) native "JSSyntaxRegExp_factory"; |
| (...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 154 var match = _re._ExecuteMatch(_str, nextIndex); | 157 var match = _re._ExecuteMatch(_str, nextIndex); |
| 155 if (match == null) { | 158 if (match == null) { |
| 156 _current = null; | 159 _current = null; |
| 157 _re = null; | 160 _re = null; |
| 158 return false; | 161 return false; |
| 159 } | 162 } |
| 160 _current = new _JSRegExpMatch(_re, _str, match); | 163 _current = new _JSRegExpMatch(_re, _str, match); |
| 161 return true; | 164 return true; |
| 162 } | 165 } |
| 163 } | 166 } |
| OLD | NEW |