Skip to content

Commit 67fcf3f

Browse files
committed
Use new embed.fnc implementation for extended_utf8_to_uv
This shows how two synonymous macros can be conveniently defined in a single place
1 parent 7d7500c commit 67fcf3f

File tree

4 files changed

+5
-8
lines changed

4 files changed

+5
-8
lines changed

embed.fnc

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,11 +1177,12 @@ AOdp |SV * |eval_pv |NN const char *p \
11771177
|I32 croak_on_error
11781178
AOdp |SSize_t|eval_sv |NN SV *sv \
11791179
|I32 flags
1180-
ATdmp |bool |extended_utf8_to_uv \
1180+
ATdp |bool |extended_utf8_to_uv \
11811181
|NN const U8 * const s \
11821182
|NN const U8 * const e \
11831183
|NN UV *cp_p \
1184-
|NULLOK Size_t *advance_p
1184+
|NULLOK Size_t *advance_p \
1185+
= utf8_to_uv(s,e,cp_p,advance_p)
11851186
Adfpv |void |fatal_warner |U32 err \
11861187
|NN const char *pat \
11871188
|...

embed.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,8 @@
225225
# define dump_vindent(a,b,c,d) Perl_dump_vindent(aTHX_ a,b,c,d)
226226
# define eval_pv(a,b) Perl_eval_pv(aTHX_ a,b)
227227
# define eval_sv(a,b) Perl_eval_sv(aTHX_ a,b)
228-
# define extended_utf8_to_uv Perl_extended_utf8_to_uv
228+
# define extended_utf8_to_uv(s,e,cp_p,advance_p) utf8_to_uv(s,e,cp_p,advance_p)
229+
# define Perl_extended_utf8_to_uv extended_utf8_to_uv
229230
# define fbm_compile(a,b) Perl_fbm_compile(aTHX_ a,b)
230231
# define fbm_instr(a,b,c,d) Perl_fbm_instr(aTHX_ a,b,c,d)
231232
# define filter_add(a,b) Perl_filter_add(aTHX_ a,b)

proto.h

Lines changed: 0 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

utf8.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@ typedef enum {
165165
Perl_utf8_to_uv_errors( s, e, cp_p, advance_p, flags, 0)
166166
#define Perl_utf8_to_uv_errors( s, e, cp_p, advance_p, flags, errors) \
167167
Perl_utf8_to_uv_msgs( s, e, cp_p, advance_p, flags, errors, 0)
168-
#define Perl_extended_utf8_to_uv(s, e, cp_p, advance_p) \
169-
Perl_utf8_to_uv(s, e, cp_p, advance_p)
170168
#define Perl_strict_utf8_to_uv( s, e, cp_p, advance_p) \
171169
Perl_utf8_to_uv_flags( s, e, cp_p, advance_p, \
172170
UTF8_DISALLOW_ILLEGAL_INTERCHANGE)

0 commit comments

Comments
 (0)