Skip to content

Commit 248e9ba

Browse files
author
Colin Robertson
committed
Another batch of TR1 fixes
1 parent 19244e5 commit 248e9ba

11 files changed

Lines changed: 239 additions & 86 deletions

‎docs/standard-library/regex-constants-class.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,5 +325,11 @@ enum syntax_option_type
325325
`collate` -- make matches locale-sensitive
326326

327327
## See Also
328-
[\<regex>](../standard-library/regex.md)
329-
[regex_constants](../standard-library/regex-constants-class.md)
328+
[\<regex>](../standard-library/regex.md)
329+
[regex_error Class](../standard-library/regex-error-class.md)
330+
[\<regex> functions](../standard-library/regex-functions.md)
331+
[regex_iterator Class](../standard-library/regex-iterator-class.md)
332+
[\<regex> operators](../standard-library/regex-operators.md)
333+
[regex_token_iterator Class](../standard-library/regex-token-iterator-class.md)
334+
[regex_traits Class](../standard-library/regex-traits-class.md)
335+
[\<regex> typedefs](../standard-library/regex-typedefs.md)

‎docs/standard-library/regex-error-class.md‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,5 +162,11 @@ regex error: unbalanced parentheses
162162
```
163163

164164
## See Also
165-
[\<regex>](../standard-library/regex.md)
166-
[regex_error](../standard-library/regex-error-class.md)
165+
[\<regex>](../standard-library/regex.md)
166+
[regex_constants Class](../standard-library/regex-constants-class.md)
167+
[\<regex> functions](../standard-library/regex-functions.md)
168+
[regex_iterator Class](../standard-library/regex-iterator-class.md)
169+
[\<regex> operators](../standard-library/regex-operators.md)
170+
[regex_token_iterator Class](../standard-library/regex-token-iterator-class.md)
171+
[regex_traits Class](../standard-library/regex-traits-class.md)
172+
[\<regex> typedefs](../standard-library/regex-typedefs.md)

‎docs/standard-library/regex-functions.md‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,17 @@ ms.reviewer: ""
66
ms.suite: ""
77
ms.tgt_pltfrm: ""
88
ms.topic: "article"
9+
f1_keywords:
10+
- "regex_match"
11+
- "std::regex_match"
12+
- "regex/std::regex_match"
13+
- "regex_replace"
14+
- "std::regex_replace"
15+
- "regex/std::regex_replace"
16+
- "regex_search"
17+
- "std::regex_search"
18+
- "regex/std::regex_search"
19+
- "regex/std::swap"
920
ms.assetid: 91a8314b-6f7c-4e33-b7d6-d8583dd75585
1021
caps.latest.revision: 12
1122
manager: "ghogen"
@@ -494,5 +505,12 @@ string == aaa
494505
```
495506

496507
## See Also
497-
[\<regex>](../standard-library/regex.md)
508+
[\<regex>](../standard-library/regex.md)
509+
[regex_constants Class](../standard-library/regex-constants-class.md)
510+
[regex_error Class](../standard-library/regex-error-class.md)
511+
[regex_iterator Class](../standard-library/regex-iterator-class.md)
512+
[\<regex> operators](../standard-library/regex-operators.md)
513+
[regex_token_iterator Class](../standard-library/regex-token-iterator-class.md)
514+
[regex_traits Class](../standard-library/regex-traits-class.md)
515+
[\<regex> typedefs](../standard-library/regex-typedefs.md)
498516

‎docs/standard-library/regex-iterator-class.md‎

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,20 @@ f1_keywords:
1212
- "regex_iterator"
1313
- "std::regex_iterator"
1414
- "regex/std::regex_iterator"
15+
- "std::regex_iterator::operator=="
16+
- "regex/std::regex_iterator::operator=="
17+
- "std::regex_iterator::operator!="
18+
- "regex/std::regex_iterator::operator!="
19+
- "std::regex_iterator::operator*"
20+
- "regex/std::regex_iterator::operator*"
21+
- "std::regex_iterator::operator->"
22+
- "regex/std::regex_iterator::operator->"
23+
- "std::regex_iterator::operator++"
24+
- "regex/std::regex_iterator::operator++"
1525
dev_langs:
1626
- "C++"
1727
helpviewer_keywords:
18-
- "regex_iterator class [TR1]"
28+
- "regex_iterator class"
1929
ms.assetid: 0cfd8fd0-5a95-4f3c-bf8e-6ef028c423d3
2030
caps.latest.revision: 16
2131
author: "corob-msft"
@@ -41,6 +51,9 @@ Iterator class for matches.
4151

4252
## Syntax
4353
```
54+
template<class BidIt,
55+
class Elem = typename std::iterator_traits<BidIt>::value_type,
56+
class RxTraits = regex_traits<Elem> >
4457
class regex_iterator {
4558
public:
4659
typedef basic_regex<Elem, RXtraits> regex_type;
@@ -49,24 +62,29 @@ public:
4962
typedef std::ptrdiff_t difference_type;
5063
typedef const match_results<BidIt>* pointer;
5164
typedef const match_results<BidIt>& reference;
65+
5266
regex_iterator();
5367
regex_iterator(
5468
BidIt first, BidIt last, const regex_type& re,
5569
regex_constants::match_flag_type f = regex_constants::match_default);
70+
5671
bool operator==(const regex_iterator& right);
5772
bool operator!=(const regex_iterator& right);
5873
const match_results<BidIt>& operator*();
5974
const match_results<BidIt> * operator->();
6075
regex_iterator& operator++();
6176
regex_iterator& operator++(int);
77+
78+
private:
6279
BidIt begin; // exposition only
6380
BidIt end; // exposition only
6481
regex_type *pregex; // exposition only
6582
regex_constants::match_flag_type flags; // exposition only
6683
match_results<BidIt> match; // exposition only
6784
};
6885
```
69-
#### Parameters
86+
87+
### Parameters
7088
`BidIt`
7189
The iterator type for submatches.
7290

@@ -140,7 +158,6 @@ int main()
140158

141159
return (0);
142160
}
143-
144161
```
145162
146163
```Output
@@ -194,7 +211,6 @@ int main()
194211

195212
return (0);
196213
}
197-
198214
```
199215
200216
```Output
@@ -252,7 +268,6 @@ int main()
252268

253269
return (0);
254270
}
255-
256271
```
257272
258273
```Output
@@ -306,7 +321,6 @@ int main()
306321

307322
return (0);
308323
}
309-
310324
```
311325
312326
```Output
@@ -320,7 +334,6 @@ match == a
320334

321335
```
322336
regex_iterator& operator++();
323-
324337
regex_iterator& operator++(int);
325338
```
326339

@@ -364,7 +377,6 @@ int main()
364377

365378
return (0);
366379
}
367-
368380
```
369381
370382
```Output
@@ -422,7 +434,6 @@ int main()
422434

423435
return (0);
424436
}
425-
426437
```
427438
428439
```Output
@@ -476,7 +487,6 @@ int main()
476487

477488
return (0);
478489
}
479-
480490
```
481491
482492
```Output
@@ -530,7 +540,6 @@ int main()
530540

531541
return (0);
532542
}
533-
534543
```
535544
536545
```Output
@@ -774,6 +783,14 @@ match == a
774783
```
775784

776785
## See Also
777-
[\<regex>](../standard-library/regex.md)
778-
[regex_iterator](../standard-library/regex-iterator-class.md)
786+
[\<regex>](../standard-library/regex.md)
787+
[regex_constants Class](../standard-library/regex-constants-class.md)
788+
[regex_error Class](../standard-library/regex-error-class.md)
789+
[\<regex> functions](../standard-library/regex-functions.md)
790+
[regex_iterator Class](../standard-library/regex-iterator-class.md)
791+
[\<regex> operators](../standard-library/regex-operators.md)
792+
[regex_token_iterator Class](../standard-library/regex-token-iterator-class.md)
793+
[regex_traits Class](../standard-library/regex-traits-class.md)
794+
[\<regex> typedefs](../standard-library/regex-typedefs.md)
779795

796+

‎docs/standard-library/regex-operators.md‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ bool operator!=(const match_results<BidIt, Alloc>& left,
7777
### Example
7878

7979
```cpp
80-
// std_tr1__regex__operator_ne.cpp
80+
// std__regex__operator_ne.cpp
8181
// compile with: /EHsc
8282
#include <regex>
8383
#include <iostream>
@@ -190,7 +190,7 @@ bool operator<(const sub_match<BidIt>& left,
190190
### Example
191191

192192
```cpp
193-
// std_tr1__regex__operator_lt.cpp
193+
// std__regex__operator_lt.cpp
194194
// compile with: /EHsc
195195
#include <regex>
196196
#include <iostream>
@@ -276,7 +276,7 @@ basic_ostream<Elem, IOtraits>& operator<<(basic_ostream<Elem, IOtraits>& os,
276276
### Example
277277

278278
```cpp
279-
// std_tr1__regex__operator_ins.cpp
279+
// std__regex__operator_ins.cpp
280280
// compile with: /EHsc
281281
#include <regex>
282282
#include <iostream>
@@ -356,7 +356,7 @@ bool operator<=(const sub_match<BidIt>& left,
356356
### Example
357357

358358
```cpp
359-
// std_tr1__regex__operator_le.cpp
359+
// std__regex__operator_le.cpp
360360
// compile with: /EHsc
361361
#include <regex>
362362
#include <iostream>
@@ -476,7 +476,7 @@ bool operator==(const match_results<BidIt, Alloc>& left,
476476
### Example
477477

478478
```cpp
479-
// std_tr1__regex__operator_eq.cpp
479+
// std__regex__operator_eq.cpp
480480
// compile with: /EHsc
481481
#include <regex>
482482
#include <iostream>
@@ -589,7 +589,7 @@ bool operator>(const sub_match<BidIt>& left,
589589
### Example
590590

591591
```cpp
592-
// std_tr1__regex__operator_gt.cpp
592+
// std__regex__operator_gt.cpp
593593
// compile with: /EHsc
594594
#include <regex>
595595
#include <iostream>
@@ -697,7 +697,7 @@ bool operator>=(const sub_match<BidIt>& left,
697697
### Example
698698

699699
```cpp
700-
// std_tr1__regex__operator_ge.cpp
700+
// std__regex__operator_ge.cpp
701701
// compile with: /EHsc
702702
#include <regex>
703703
#include <iostream>
@@ -750,5 +750,13 @@ sub >= 'a' == true
750750
```
751751

752752
## See Also
753-
[\<regex>](../standard-library/regex.md)
753+
[\<regex>](../standard-library/regex.md)
754+
[regex_constants Class](../standard-library/regex-constants-class.md)
755+
[regex_error Class](../standard-library/regex-error-class.md)
756+
[\<regex> functions](../standard-library/regex-functions.md)
757+
[regex_iterator Class](../standard-library/regex-iterator-class.md)
758+
[regex_token_iterator Class](../standard-library/regex-token-iterator-class.md)
759+
[regex_traits Class](../standard-library/regex-traits-class.md)
760+
[\<regex> typedefs](../standard-library/regex-typedefs.md)
761+
754762

0 commit comments

Comments
 (0)