Skip to content

Commit e95bcb4

Browse files
authored
Merge pull request #424 from KavinduZoysa/change-group-keyword
Change the variable `group`
2 parents 992d6a9 + 8a9072c commit e95bcb4

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

ballerina/tests/regex-test.bal

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -169,14 +169,14 @@ isolated function testSearchWithGroupIndex() {
169169
test:assertEquals(actualvalue.matched, "011", msg = "Incorrect string value");
170170
test:assertEquals(actualvalue.startIndex, 2, msg = "Incorrect string value");
171171
test:assertEquals(actualvalue.endIndex, 5, msg = "Incorrect string value");
172-
Groups group = actualvalue.groups;
173-
PartMatch? partMatch = group.get(1);
172+
Groups 'group = actualvalue.groups;
173+
PartMatch? partMatch = 'group.get(1);
174174
if partMatch is PartMatch {
175175
test:assertEquals(partMatch.matched, "0", msg = "Incorrect string value");
176176
test:assertEquals(partMatch.startIndex, 2, msg = "Incorrect string value");
177177
test:assertEquals(partMatch.endIndex, 3, msg = "Incorrect string value");
178178
}
179-
PartMatch? partMatch1 = group.get(2);
179+
PartMatch? partMatch1 = 'group.get(2);
180180
if partMatch1 is PartMatch {
181181
test:assertEquals(partMatch1.matched, "11", msg = "Incorrect string value");
182182
test:assertEquals(partMatch1.startIndex, 3, msg = "Incorrect string value");
@@ -196,26 +196,26 @@ isolated function testSearchWithStartIndex() {
196196
test:assertEquals(actualvalue.matched, "01111111", msg = "Incorrect string value");
197197
test:assertEquals(actualvalue.startIndex, 7, msg = "Incorrect string value");
198198
test:assertEquals(actualvalue.endIndex, 15, msg = "Incorrect string value");
199-
Groups group = actualvalue.groups;
200-
PartMatch? partMatch = group.get(0);
199+
Groups 'group = actualvalue.groups;
200+
PartMatch? partMatch = 'group.get(0);
201201
if partMatch is PartMatch {
202202
test:assertEquals(partMatch.matched, "01111111", msg = "Incorrect string value");
203203
test:assertEquals(partMatch.startIndex, 7, msg = "Incorrect string value");
204204
test:assertEquals(partMatch.endIndex, 15, msg = "Incorrect string value");
205205
}
206-
partMatch = group.get(1);
206+
partMatch = 'group.get(1);
207207
if partMatch is PartMatch {
208208
test:assertEquals(partMatch.matched, "0", msg = "Incorrect string value");
209209
test:assertEquals(partMatch.startIndex, 7, msg = "Incorrect string value");
210210
test:assertEquals(partMatch.endIndex, 8, msg = "Incorrect string value");
211211
}
212-
partMatch = group.get(2);
212+
partMatch = 'group.get(2);
213213
if partMatch is PartMatch {
214214
test:assertEquals(partMatch.matched, "1111111", msg = "Incorrect string value");
215215
test:assertEquals(partMatch.startIndex, 8, msg = "Incorrect string value");
216216
test:assertEquals(partMatch.endIndex, 15, msg = "Incorrect string value");
217217
}
218-
PartMatch?|error err = trap group.get(3);
218+
PartMatch?|error err = trap 'group.get(3);
219219
test:assertTrue(err is error);
220220
if err is error {
221221
test:assertEquals(err.message(), "There is no capturing group in the pattern with the given index 3.",
@@ -235,8 +235,8 @@ isolated function testSearchWithInvalidGroupIndex() {
235235
test:assertEquals(actualvalue.matched, "00", msg = "Incorrect string value");
236236
test:assertEquals(actualvalue.startIndex, 1, msg = "Incorrect string value");
237237
test:assertEquals(actualvalue.endIndex, 3, msg = "Incorrect string value");
238-
Groups group = actualvalue.groups;
239-
PartMatch?|error err = trap group.get(1);
238+
Groups 'group = actualvalue.groups;
239+
PartMatch?|error err = trap 'group.get(1);
240240
test:assertTrue(err is error);
241241
if err is error {
242242
test:assertEquals(err.message(), "There is no capturing group in the pattern with the given index 1.",
@@ -270,22 +270,22 @@ isolated function testSearchAllWithGroupIndex() {
270270
test:assertEquals(actualvalue[0].matched, "011", msg = "Incorrect string value");
271271
test:assertEquals(actualvalue[0].startIndex, 2, msg = "Incorrect start index");
272272
test:assertEquals(actualvalue[0].endIndex, 5, msg = "Incorrect end index");
273-
Groups group = actualvalue[0].groups;
274-
PartMatch? value = group.get(0);
273+
Groups 'group = actualvalue[0].groups;
274+
PartMatch? value = 'group.get(0);
275275
test:assertTrue(value is PartMatch);
276276
if value is PartMatch {
277277
test:assertEquals(value.matched, "011", msg = "Incorrect string value");
278278
test:assertEquals(value.startIndex, 2, msg = "Incorrect start index");
279279
test:assertEquals(value.endIndex, 5, msg = "Incorrect end index");
280280
}
281-
value = group.get(1);
281+
value = 'group.get(1);
282282
test:assertTrue(value is PartMatch);
283283
if value is PartMatch {
284284
test:assertEquals(value.matched, "0", msg = "Incorrect string value");
285285
test:assertEquals(value.startIndex, 2, msg = "Incorrect start index");
286286
test:assertEquals(value.endIndex, 3, msg = "Incorrect end index");
287287
}
288-
value = group.get(2);
288+
value = 'group.get(2);
289289
test:assertTrue(value is PartMatch);
290290
if value is PartMatch {
291291
test:assertEquals(value.matched, "11", msg = "Incorrect string value");
@@ -295,22 +295,22 @@ isolated function testSearchAllWithGroupIndex() {
295295
test:assertEquals(actualvalue[1].matched, "0111", msg = "Incorrect string value");
296296
test:assertEquals(actualvalue[1].startIndex, 7, msg = "Incorrect start index value");
297297
test:assertEquals(actualvalue[1].endIndex, 11, msg = "Incorrect end index value");
298-
group = actualvalue[1].groups;
299-
value = group.get(0);
298+
'group = actualvalue[1].groups;
299+
value = 'group.get(0);
300300
test:assertTrue(value is PartMatch);
301301
if value is PartMatch {
302302
test:assertEquals(value.matched, "0111", msg = "Incorrect string value");
303303
test:assertEquals(value.startIndex, 7, msg = "Incorrect start index");
304304
test:assertEquals(value.endIndex, 11, msg = "Incorrect end index");
305305
}
306-
value = group.get(1);
306+
value = 'group.get(1);
307307
test:assertTrue(value is PartMatch);
308308
if value is PartMatch {
309309
test:assertEquals(value.matched, "0", msg = "Incorrect string value");
310310
test:assertEquals(value.startIndex, 7, msg = "Incorrect start index");
311311
test:assertEquals(value.endIndex, 8, msg = "Incorrect end index");
312312
}
313-
value = group.get(2);
313+
value = 'group.get(2);
314314
test:assertTrue(value is PartMatch);
315315
if value is PartMatch {
316316
test:assertEquals(value.matched, "111", msg = "Incorrect string value");

ballerina/utils.bal

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ isolated function getPartMatch(handle matcher, int groupCount, int startIndex =
6262
int i = 0;
6363
PartMatch[] partMatch = [];
6464
while i <= groupCount {
65-
handle group = getGroup(matcher, i);
66-
string? valueInString = java:toString(group);
65+
handle 'group = getGroup(matcher, i);
66+
string? valueInString = java:toString('group);
6767
if valueInString is string {
6868
partMatch.push(
6969
{

0 commit comments

Comments
 (0)