Skip to content

Commit c6a79be

Browse files
committed
Updates for clang.
1 parent db3d34e commit c6a79be

File tree

5 files changed

+21
-2
lines changed

5 files changed

+21
-2
lines changed

regression-tests/test-results/clang-18-c++20/pure2-regex_04_start_end.cpp.execution

+1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ Running tests_04_start_end:
88
07_y: OK regex: ^ parsed_regex: ^ str: abc result_expr: $& expected_results
99
08_y: OK regex: $ parsed_regex: $ str: abc result_expr: $& expected_results
1010
09_n: OK regex: $b parsed_regex: $b str: b result_expr: - expected_results -
11+
10_n: OK regex: \GX.*X parsed_regex: \GX.*X str: aaaXbX result_expr: - expected_results -
1112

regression-tests/test-results/clang-18-c++20/pure2-regex_19_lookahead.cpp.execution

+10
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,14 @@ Running tests_19_lookahead:
2727
26_y: OK regex: ^(a*?)(?!(aa|aaaa)*$)(?=a\z) parsed_regex: ^(a*?)(?!(aa|aaaa)*$)(?=a\z) str: aaaaaaaa result_expr: $1 expected_results aaaaaaa
2828
27_y: OK regex: a(?!b(?!c))(..) parsed_regex: a(?!b(?!c))(..) str: abababc result_expr: $1 expected_results bc
2929
28_y: OK regex: a(?!b(?=a))(..) parsed_regex: a(?!b(?=a))(..) str: abababc result_expr: $1 expected_results bc
30+
29_y: OK regex: (?=foo) parsed_regex: (?=foo) str: foo result_expr: @+ expected_results 0
31+
30_y: OK regex: (?=foo) parsed_regex: (?=foo) str: XfooY result_expr: @+ expected_results 1
32+
31_y: OK regex: .*(?=foo) parsed_regex: .*(?=foo) str: XfooY result_expr: @+ expected_results 1
33+
32_y: OK regex: (?=.*P)P parsed_regex: (?=.*P)P str: aP result_expr: @+ expected_results 2
34+
33_y: OK regex: X(?=foo)f parsed_regex: X(?=foo)f str: ..XfooY.. result_expr: @+ expected_results 4
35+
34_y: OK regex: X(?=foo) parsed_regex: X(?=foo) str: ..XfooY.. result_expr: @+ expected_results 3
36+
35_y: OK regex: (?=XY*foo) parsed_regex: (?=XY*foo) str: Xfoo result_expr: @+ expected_results 0
37+
36_y: OK regex: ^(?=XY*foo) parsed_regex: ^(?=XY*foo) str: Xfoo result_expr: @+ expected_results 0
3038
37_y: OK regex: X(\w+)(?=\s)|X(\w+) parsed_regex: X(\w+)(?=\s)|X(\w+) str: Xab result_expr: [$1-$2] expected_results [-ab]
3139
38_y: OK regex: ^a*(?=b)b parsed_regex: ^a*(?=b)b str: ab result_expr: $& expected_results ab
3240
39_y: OK regex: '(?!\A)x'm parsed_regex: '(?!\A)x'm str: a\nxb\n result_expr: - expected_results -
@@ -44,4 +52,6 @@ Running tests_19_lookahead:
4452
51_y: OK regex: ((?s)b.)c(?!\N) parsed_regex: ((?s)b.)c(?!\N) str: a\nb\nc\n result_expr: $1:$& expected_results b\n:b\nc
4553
52_y: OK regex: '(b.)c(?!\N)'s parsed_regex: '(b.)c(?!\N)'s str: a\nb\nc\n result_expr: $1:$& expected_results b\n:b\nc
4654
53_n: OK regex: a*(?!) parsed_regex: a*(?!) str: aaaab result_expr: - expected_results -
55+
54_y: OK regex: (?<bar>)foo parsed_regex: (?<bar>)foo str: bar>ABCfoo result_expr: $& expected_results foo
56+
55_y: OK regex: (?<bar>ABC)foo parsed_regex: (?<bar>ABC)foo str: bar>ABCfoo result_expr: $& expected_results ABCfoo
4757

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Running tests_21_atomic_patterns:
2+
01_y: OK regex: (?>a+)b parsed_regex: (?>a+)b str: aaab result_expr: - expected_results -
3+
02_y: OK regex: ((?>a+)b) parsed_regex: ((?>a+)b) str: aaab result_expr: $1 expected_results aaab
4+
03_y: OK regex: (?>(a+))b parsed_regex: (?>(a+))b str: aaab result_expr: $1 expected_results aaa
5+
04_y: OK regex: ((?>[^()]+)|\([^()]*\))+ parsed_regex: ((?>[^()]+)|\([^()]*\))+ str: ((abc(ade)ufh()()x result_expr: $& expected_results abc(ade)ufh()()x
6+
05_y: OK regex: round\(((?>[^()]+))\) parsed_regex: round\(((?>[^()]+))\) str: _I(round(xs * sz),1) result_expr: $1 expected_results xs * sz
7+
06_y: OK regex: ^((?>(?:aa)?b)?) parsed_regex: ^((?>(?:aa)?b)?) str: aab result_expr: $1 expected_results aab
8+

source/reflect.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -4955,7 +4955,7 @@ size_t i{0};
49554955
(*cpp2::impl::assert_not_null(r)).set_string("(" + cpp2::to_string(syntax) + cpp2::to_string((*cpp2::impl::assert_not_null((*cpp2::impl::assert_not_null(r)).inner)).to_string()) + ")");
49564956

49574957
if (!(lookahead)) {
4958-
(*cpp2::impl::assert_not_null(r)).inner = CPP2_UFCS(reverse)((*cpp2::impl::assert_not_null((*cpp2::impl::assert_not_null(r)).inner)));
4958+
(*cpp2::impl::assert_not_null(r)).inner = (*cpp2::impl::assert_not_null((*cpp2::impl::assert_not_null(r)).inner)).reverse();
49594959
}
49604960

49614961
return r;

source/reflect.h2

+1-1
Original file line numberDiff line numberDiff line change
@@ -3145,7 +3145,7 @@ group_token: @polymorphic_base type =
31453145
r*..set_string("((syntax)$(r*.inner*..to_string())$)");
31463146

31473147
if !lookahead {
3148-
r*.inner = r*.inner*.reverse();
3148+
r*.inner = r*.inner*..reverse();
31493149
}
31503150

31513151
return r;

0 commit comments

Comments
 (0)