@@ -24,14 +24,16 @@ class val<std::basic_string<CharT, Traits>> {
2424 val (val<std::basic_string<CharT, Traits>*> str) : data_ptr(str) {
2525 }
2626 val (const val<const CharT*>& s) : data_ptr(nullptr ) {
27- data_ptr = invoke (+[](const CharT* s) -> base_type* { return new base_type (s); }, s);
27+ data_ptr = invoke (
28+ +[](const CharT* s) -> base_type* { return new base_type (s); }, s);
2829 }
2930
3031 val (const CharT* s) : val(val<const CharT*>(s)) {
3132 }
3233
3334 val<CharT> at (val<size_type> pos) {
34- return invoke (+[](base_type* ptr, size_type p) -> CharT { return ptr->at (p); }, data_ptr, pos);
35+ return invoke (
36+ +[](base_type* ptr, size_type p) -> CharT { return ptr->at (p); }, data_ptr, pos);
3537 }
3638
3739 /* *
@@ -41,19 +43,23 @@ class val<std::basic_string<CharT, Traits>> {
4143 * If pos > size(), the behavior is undefined.
4244 */
4345 val<CharT> operator [](val<size_type> pos) {
44- return invoke (+[](base_type* ptr, size_type p) -> CharT { return ptr->operator [](p); }, data_ptr, pos);
46+ return invoke (
47+ +[](base_type* ptr, size_type p) -> CharT { return ptr->operator [](p); }, data_ptr, pos);
4548 }
4649
4750 val<CharT> front () {
48- return invoke (+[](base_type* ptr) -> CharT { return ptr->front (); }, data_ptr);
51+ return invoke (
52+ +[](base_type* ptr) -> CharT { return ptr->front (); }, data_ptr);
4953 }
5054
5155 val<CharT> back () {
52- return invoke (+[](base_type* ptr) -> CharT { return ptr->back (); }, data_ptr);
56+ return invoke (
57+ +[](base_type* ptr) -> CharT { return ptr->back (); }, data_ptr);
5358 }
5459
5560 val<CharT*> data () {
56- return invoke (+[](base_type* ptr) -> CharT* { return ptr->data (); }, data_ptr);
61+ return invoke (
62+ +[](base_type* ptr) -> CharT* { return ptr->data (); }, data_ptr);
5763 }
5864
5965 /* *
@@ -63,55 +69,62 @@ class val<std::basic_string<CharT, Traits>> {
6369 * character after the last position.
6470 */
6571 val<const CharT*> c_str () const {
66- return invoke (+[](base_type* ptr) -> const CharT* { return ptr->c_str (); }, data_ptr);
72+ return invoke (
73+ +[](base_type* ptr) -> const CharT* { return ptr->c_str (); }, data_ptr);
6774 }
6875
6976 operator val<std::basic_string_view<CharT, Traits>>() const {
7077 return val<std::basic_string_view<CharT, Traits>>(c_str ());
7178 }
7279
7380 val<bool > empty () const {
74- return invoke (+[](base_type* ptr) -> bool { return ptr->empty (); }, data_ptr);
81+ return invoke (
82+ +[](base_type* ptr) -> bool { return ptr->empty (); }, data_ptr);
7583 }
7684
7785 /* *
7886 * Returns the number of CharT elements in the string, i.e. std::distance(begin(), end()).
7987 * @return
8088 */
8189 val<size_type> size () const {
82- return invoke (+[](base_type* ptr) -> size_type { return ptr->size (); }, data_ptr);
90+ return invoke (
91+ +[](base_type* ptr) -> size_type { return ptr->size (); }, data_ptr);
8392 }
8493
8594 /* *
8695 * Returns the number of CharT elements in the string, i.e. std::distance(begin(), end()).
8796 * @return
8897 */
8998 val<size_type> length () const {
90- return invoke (+[](base_type* ptr) -> size_type { return ptr->length (); }, data_ptr);
99+ return invoke (
100+ +[](base_type* ptr) -> size_type { return ptr->length (); }, data_ptr);
91101 }
92102
93103 /* *
94104 * Returns the maximum number of characters
95105 * @return
96106 */
97107 val<size_type> max_size () const {
98- return invoke (+[](base_type* ptr) -> size_type { return ptr->max_size (); }, data_ptr);
108+ return invoke (
109+ +[](base_type* ptr) -> size_type { return ptr->max_size (); }, data_ptr);
99110 }
100111
101112 /* *
102113 * Informs a std::basic_string object of a planned change in size, so that it can manage the storage allocation appropriately.
103114 * @param new_cap
104115 */
105116 void reserve (val<size_type> new_cap) const {
106- return invoke (+[](base_type* ptr, size_type s) -> void { return ptr->reserve (s); }, data_ptr, new_cap);
117+ return invoke (
118+ +[](base_type* ptr, size_type s) -> void { return ptr->reserve (s); }, data_ptr, new_cap);
107119 }
108120
109121 /* *
110122 * Returns the number of characters that can be held in currently allocated storage.
111123 * @return
112124 */
113125 val<size_type> capacity () const {
114- return invoke (+[](base_type* ptr) -> size_type { return ptr->capacity (); }, data_ptr);
126+ return invoke (
127+ +[](base_type* ptr) -> size_type { return ptr->capacity (); }, data_ptr);
115128 }
116129
117130 /* *
@@ -120,91 +133,103 @@ class val<std::basic_string<CharT, Traits>> {
120133 * @return
121134 */
122135 void clear () const {
123- invoke (+[](base_type* ptr) -> void { ptr->clear (); }, data_ptr);
136+ invoke (
137+ +[](base_type* ptr) -> void { ptr->clear (); }, data_ptr);
124138 }
125139
126140 /* *
127141 * Inserts characters into the string.
128142 */
129143 auto & insert (val<size_type> index, val<size_type> count, val<CharT> ch) const {
130- invoke (+[](base_type* ptr, size_type index, size_type count, CharT ch) -> void { ptr->insert (index, count, ch); }, data_ptr, index, count, ch);
144+ invoke (
145+ +[](base_type* ptr, size_type index, size_type count, CharT ch) -> void { ptr->insert (index, count, ch); }, data_ptr, index, count, ch);
131146 return *this ;
132147 }
133148
134149 /* *
135150 * Inserts characters into the string.
136151 */
137152 auto & insert (val<size_type> index, val<const CharT*> s) const {
138- invoke (+[](base_type* ptr, size_type index, const CharT* s) -> void { ptr->insert (index, s); }, data_ptr, index, s);
153+ invoke (
154+ +[](base_type* ptr, size_type index, const CharT* s) -> void { ptr->insert (index, s); }, data_ptr, index, s);
139155 return *this ;
140156 }
141157
142158 /* *
143159 * Appends additional characters to the string.
144160 */
145161 auto & append (val<size_type> count, val<CharT> ch) {
146- invoke (+[](base_type* ptr, size_type count, CharT ch) -> void { ptr->append (count, ch); }, data_ptr, count, ch);
162+ invoke (
163+ +[](base_type* ptr, size_type count, CharT ch) -> void { ptr->append (count, ch); }, data_ptr, count, ch);
147164 return *this ;
148165 }
149166
150167 /* *
151168 * Appends additional characters to the string.
152169 */
153170 auto & append (val<std::basic_string<CharT, Traits>>& str) {
154- invoke (+[](base_type* ptr, base_type* other) -> void { ptr->append (*other); }, data_ptr, str.data_ptr );
171+ invoke (
172+ +[](base_type* ptr, base_type* other) -> void { ptr->append (*other); }, data_ptr, str.data_ptr );
155173 return *this ;
156174 }
157175
158176 /* *
159177 * Appends additional characters to the string.
160178 */
161179 auto & append (const val<std::basic_string<CharT, Traits>>& str, const val<size_type>& pos, const val<size_type>& count) {
162- invoke (+[](base_type* ptr, base_type* other, size_type pos, size_type count) -> void { ptr->append (*other, pos, count); }, data_ptr, str.data_ptr , pos, count);
180+ invoke (
181+ +[](base_type* ptr, base_type* other, size_type pos, size_type count) -> void { ptr->append (*other, pos, count); }, data_ptr, str.data_ptr , pos, count);
163182 return *this ;
164183 }
165184
166185 /* *
167186 * Appends additional characters to the string.
168187 */
169188 auto & append (const val<std::basic_string<CharT, Traits>>& str, const val<size_type>& count) {
170- invoke (+[](base_type* ptr, base_type* other, size_type count) -> void { ptr->append (*other, count); }, data_ptr, str.data_ptr , count);
189+ invoke (
190+ +[](base_type* ptr, base_type* other, size_type count) -> void { ptr->append (*other, count); }, data_ptr, str.data_ptr , count);
171191 return *this ;
172192 }
173193
174194 /* *
175195 * Appends additional characters to the string.
176196 */
177197 auto & append (const val<CharT*>& s, const val<size_type>& count) {
178- invoke (+[](base_type* ptr, CharT* s, size_type count) -> void { ptr->append (s, count); }, data_ptr, s, count);
198+ invoke (
199+ +[](base_type* ptr, CharT* s, size_type count) -> void { ptr->append (s, count); }, data_ptr, s, count);
179200 return *this ;
180201 }
181202
182203 /* *
183204 * Appends additional characters to the string.
184205 */
185206 auto & append (const val<const CharT*>& s) {
186- invoke (+[](base_type* ptr, const CharT* s) -> void { ptr->append (s); }, data_ptr, s);
207+ invoke (
208+ +[](base_type* ptr, const CharT* s) -> void { ptr->append (s); }, data_ptr, s);
187209 return *this ;
188210 }
189211
190212 /* *
191213 * Appends additional characters to the string.
192214 */
193215 auto & operator +=(const val<std::basic_string<CharT, Traits>>& str) {
194- invoke (+[](base_type* ptr, base_type* s) -> void { ptr->operator +=(*s); }, data_ptr, str.data_ptr );
216+ invoke (
217+ +[](base_type* ptr, base_type* s) -> void { ptr->operator +=(*s); }, data_ptr, str.data_ptr );
195218 return *this ;
196219 }
197220
198221 /* *
199222 * Appends additional characters to the string.
200223 */
201224 auto & operator +=(const val<const CharT*>& s) {
202- invoke (+[](base_type* ptr, const CharT* s) -> void { ptr->operator +=(s); }, data_ptr, s);
225+ invoke (
226+ +[](base_type* ptr, const CharT* s) -> void { ptr->operator +=(s); }, data_ptr, s);
203227 return *this ;
204228 }
205229
206230 auto & operator +=(const val<CharT*>& s) {
207- invoke (+[](base_type* ptr, const CharT* s) -> void { ptr->operator +=(s); }, data_ptr, s);
231+ invoke (
232+ +[](base_type* ptr, const CharT* s) -> void { ptr->operator +=(s); }, data_ptr, s);
208233 return *this ;
209234 }
210235
@@ -216,7 +241,8 @@ class val<std::basic_string<CharT, Traits>> {
216241 * Copies a substring [pos, pos + count) to character string pointed to by dest. If the requested substring lasts past the end of the string, or if count == npos, the copied substring is [pos, size()).
217242 */
218243 val<size_type> copy (const val<CharT*>& dest, const val<size_type>& count, const val<size_type>& pos = 0 ) {
219- return invoke (+[](base_type* ptr, CharT* dest, size_type count, size_type pos) -> size_type { return ptr->copy (dest, count, pos); }, data_ptr, dest, count, pos);
244+ return invoke (
245+ +[](base_type* ptr, CharT* dest, size_type count, size_type pos) -> size_type { return ptr->copy (dest, count, pos); }, data_ptr, dest, count, pos);
220246 }
221247
222248 ~val () {
0 commit comments