#define do_kv Perl_do_kv
#define do_open Perl_do_open
#define do_open9 Perl_do_open9
+#define do_openn Perl_do_openn
#define do_pipe Perl_do_pipe
#define do_print Perl_do_print
#define do_readline Perl_do_readline
#define sv_setuv Perl_sv_setuv
#define sv_setnv Perl_sv_setnv
#define sv_setref_iv Perl_sv_setref_iv
+#define sv_setref_uv Perl_sv_setref_uv
#define sv_setref_nv Perl_sv_setref_nv
#define sv_setref_pv Perl_sv_setref_pv
#define sv_setref_pvn Perl_sv_setref_pvn
#define utf8_distance Perl_utf8_distance
#define utf8_hop Perl_utf8_hop
#define utf8_to_bytes Perl_utf8_to_bytes
+#define bytes_from_utf8 Perl_bytes_from_utf8
#define bytes_to_utf8 Perl_bytes_to_utf8
-#define utf8_to_uv_simple Perl_utf8_to_uv_simple
-#define utf8_to_uv Perl_utf8_to_uv
-#define uv_to_utf8 Perl_uv_to_utf8
+#define utf8_to_uvchr Perl_utf8_to_uvchr
+#define utf8_to_uvuni Perl_utf8_to_uvuni
+#define utf8n_to_uvchr Perl_utf8n_to_uvchr
+#define utf8n_to_uvuni Perl_utf8n_to_uvuni
+#define uvchr_to_utf8 Perl_uvchr_to_utf8
+#define uvuni_to_utf8 Perl_uvuni_to_utf8
#define vivify_defelem Perl_vivify_defelem
#define vivify_ref Perl_vivify_ref
#define wait4pid Perl_wait4pid
#define yyerror Perl_yyerror
#ifdef USE_PURE_BISON
#define yylex_r Perl_yylex_r
-#define yylex Perl_yylex
-#else
-#define yylex Perl_yylex
#endif
+#define yylex Perl_yylex
#define yyparse Perl_yyparse
#define yywarn Perl_yywarn
#if defined(MYMALLOC)
#define ptr_table_fetch Perl_ptr_table_fetch
#define ptr_table_store Perl_ptr_table_store
#define ptr_table_split Perl_ptr_table_split
+#define ptr_table_clear Perl_ptr_table_clear
+#define ptr_table_free Perl_ptr_table_free
#endif
#if defined(HAVE_INTERP_INTERN)
#define sys_intern_clear Perl_sys_intern_clear
#define simplify_sort S_simplify_sort
#define is_handle_constructor S_is_handle_constructor
#define gv_ename S_gv_ename
+# if defined(DEBUG_CLOSURES)
#define cv_dump S_cv_dump
+# endif
#define cv_clone2 S_cv_clone2
#define scalar_mod_type S_scalar_mod_type
#define my_kid S_my_kid
#define sv_2inuv_non_preserve S_sv_2inuv_non_preserve
#define sv_2iuv_non_preserve S_sv_2iuv_non_preserve
# endif
+#define expect_number S_expect_number
+# if defined(USE_ITHREADS)
+#define gv_share S_gv_share
+# endif
#endif
#if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
#define check_uni S_check_uni
#define filter_gets S_filter_gets
#define find_in_my_stash S_find_in_my_stash
#define new_constant S_new_constant
+#define tokereport S_tokereport
#define ao S_ao
#define depcom S_depcom
#define incl_perldb S_incl_perldb
#define do_kv() Perl_do_kv(aTHX)
#define do_open(a,b,c,d,e,f,g) Perl_do_open(aTHX_ a,b,c,d,e,f,g)
#define do_open9(a,b,c,d,e,f,g,h,i) Perl_do_open9(aTHX_ a,b,c,d,e,f,g,h,i)
+#define do_openn(a,b,c,d,e,f,g,h,i) Perl_do_openn(aTHX_ a,b,c,d,e,f,g,h,i)
#define do_pipe(a,b,c) Perl_do_pipe(aTHX_ a,b,c)
#define do_print(a,b) Perl_do_print(aTHX_ a,b)
#define do_readline() Perl_do_readline(aTHX)
#define sv_setuv(a,b) Perl_sv_setuv(aTHX_ a,b)
#define sv_setnv(a,b) Perl_sv_setnv(aTHX_ a,b)
#define sv_setref_iv(a,b,c) Perl_sv_setref_iv(aTHX_ a,b,c)
+#define sv_setref_uv(a,b,c) Perl_sv_setref_uv(aTHX_ a,b,c)
#define sv_setref_nv(a,b,c) Perl_sv_setref_nv(aTHX_ a,b,c)
#define sv_setref_pv(a,b,c) Perl_sv_setref_pv(aTHX_ a,b,c)
#define sv_setref_pvn(a,b,c,d) Perl_sv_setref_pvn(aTHX_ a,b,c,d)
#define utf8_distance(a,b) Perl_utf8_distance(aTHX_ a,b)
#define utf8_hop(a,b) Perl_utf8_hop(aTHX_ a,b)
#define utf8_to_bytes(a,b) Perl_utf8_to_bytes(aTHX_ a,b)
+#define bytes_from_utf8(a,b,c) Perl_bytes_from_utf8(aTHX_ a,b,c)
#define bytes_to_utf8(a,b) Perl_bytes_to_utf8(aTHX_ a,b)
-#define utf8_to_uv_simple(a,b) Perl_utf8_to_uv_simple(aTHX_ a,b)
-#define utf8_to_uv(a,b,c,d) Perl_utf8_to_uv(aTHX_ a,b,c,d)
-#define uv_to_utf8(a,b) Perl_uv_to_utf8(aTHX_ a,b)
+#define utf8_to_uvchr(a,b) Perl_utf8_to_uvchr(aTHX_ a,b)
+#define utf8_to_uvuni(a,b) Perl_utf8_to_uvuni(aTHX_ a,b)
+#define utf8n_to_uvchr(a,b,c,d) Perl_utf8n_to_uvchr(aTHX_ a,b,c,d)
+#define utf8n_to_uvuni(a,b,c,d) Perl_utf8n_to_uvuni(aTHX_ a,b,c,d)
+#define uvchr_to_utf8(a,b) Perl_uvchr_to_utf8(aTHX_ a,b)
+#define uvuni_to_utf8(a,b) Perl_uvuni_to_utf8(aTHX_ a,b)
#define vivify_defelem(a) Perl_vivify_defelem(aTHX_ a)
#define vivify_ref(a,b) Perl_vivify_ref(aTHX_ a,b)
#define wait4pid(a,b,c) Perl_wait4pid(aTHX_ a,b,c)
#define yyerror(a) Perl_yyerror(aTHX_ a)
#ifdef USE_PURE_BISON
#define yylex_r(a,b) Perl_yylex_r(aTHX_ a,b)
-#define yylex(a,b) Perl_yylex(aTHX_ a,b)
-#else
-#define yylex() Perl_yylex(aTHX)
#endif
+#define yylex() Perl_yylex(aTHX)
#define yyparse() Perl_yyparse(aTHX)
#define yywarn(a) Perl_yywarn(aTHX_ a)
#if defined(MYMALLOC)
#define ptr_table_fetch(a,b) Perl_ptr_table_fetch(aTHX_ a,b)
#define ptr_table_store(a,b,c) Perl_ptr_table_store(aTHX_ a,b,c)
#define ptr_table_split(a) Perl_ptr_table_split(aTHX_ a)
+#define ptr_table_clear(a) Perl_ptr_table_clear(aTHX_ a)
+#define ptr_table_free(a) Perl_ptr_table_free(aTHX_ a)
#endif
#if defined(HAVE_INTERP_INTERN)
#define sys_intern_clear() Perl_sys_intern_clear(aTHX)
#define simplify_sort(a) S_simplify_sort(aTHX_ a)
#define is_handle_constructor(a,b) S_is_handle_constructor(aTHX_ a,b)
#define gv_ename(a) S_gv_ename(aTHX_ a)
+# if defined(DEBUG_CLOSURES)
#define cv_dump(a) S_cv_dump(aTHX_ a)
+# endif
#define cv_clone2(a,b) S_cv_clone2(aTHX_ a,b)
#define scalar_mod_type(a,b) S_scalar_mod_type(aTHX_ a,b)
#define my_kid(a,b) S_my_kid(aTHX_ a,b)
#define sv_2inuv_non_preserve(a,b) S_sv_2inuv_non_preserve(aTHX_ a,b)
#define sv_2iuv_non_preserve(a,b) S_sv_2iuv_non_preserve(aTHX_ a,b)
# endif
+#define expect_number(a) S_expect_number(aTHX_ a)
+# if defined(USE_ITHREADS)
+#define gv_share(a) S_gv_share(aTHX_ a)
+# endif
#endif
#if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
#define check_uni() S_check_uni(aTHX)
#define filter_gets(a,b,c) S_filter_gets(aTHX_ a,b,c)
#define find_in_my_stash(a,b) S_find_in_my_stash(aTHX_ a,b)
#define new_constant(a,b,c,d,e,f) S_new_constant(aTHX_ a,b,c,d,e,f)
+#define tokereport(a,b,c) S_tokereport(aTHX_ a,b,c)
#define ao(a) S_ao(aTHX_ a)
#define depcom() S_depcom(aTHX)
#define incl_perldb() S_incl_perldb(aTHX)
#define do_open Perl_do_open
#define Perl_do_open9 CPerlObj::Perl_do_open9
#define do_open9 Perl_do_open9
+#define Perl_do_openn CPerlObj::Perl_do_openn
+#define do_openn Perl_do_openn
#define Perl_do_pipe CPerlObj::Perl_do_pipe
#define do_pipe Perl_do_pipe
#define Perl_do_print CPerlObj::Perl_do_print
#define sv_setnv Perl_sv_setnv
#define Perl_sv_setref_iv CPerlObj::Perl_sv_setref_iv
#define sv_setref_iv Perl_sv_setref_iv
+#define Perl_sv_setref_uv CPerlObj::Perl_sv_setref_uv
+#define sv_setref_uv Perl_sv_setref_uv
#define Perl_sv_setref_nv CPerlObj::Perl_sv_setref_nv
#define sv_setref_nv Perl_sv_setref_nv
#define Perl_sv_setref_pv CPerlObj::Perl_sv_setref_pv
#define utf8_hop Perl_utf8_hop
#define Perl_utf8_to_bytes CPerlObj::Perl_utf8_to_bytes
#define utf8_to_bytes Perl_utf8_to_bytes
+#define Perl_bytes_from_utf8 CPerlObj::Perl_bytes_from_utf8
+#define bytes_from_utf8 Perl_bytes_from_utf8
#define Perl_bytes_to_utf8 CPerlObj::Perl_bytes_to_utf8
#define bytes_to_utf8 Perl_bytes_to_utf8
-#define Perl_utf8_to_uv_simple CPerlObj::Perl_utf8_to_uv_simple
-#define utf8_to_uv_simple Perl_utf8_to_uv_simple
-#define Perl_utf8_to_uv CPerlObj::Perl_utf8_to_uv
-#define utf8_to_uv Perl_utf8_to_uv
-#define Perl_uv_to_utf8 CPerlObj::Perl_uv_to_utf8
-#define uv_to_utf8 Perl_uv_to_utf8
+#define Perl_utf8_to_uvchr CPerlObj::Perl_utf8_to_uvchr
+#define utf8_to_uvchr Perl_utf8_to_uvchr
+#define Perl_utf8_to_uvuni CPerlObj::Perl_utf8_to_uvuni
+#define utf8_to_uvuni Perl_utf8_to_uvuni
+#define Perl_utf8n_to_uvchr CPerlObj::Perl_utf8n_to_uvchr
+#define utf8n_to_uvchr Perl_utf8n_to_uvchr
+#define Perl_utf8n_to_uvuni CPerlObj::Perl_utf8n_to_uvuni
+#define utf8n_to_uvuni Perl_utf8n_to_uvuni
+#define Perl_uvchr_to_utf8 CPerlObj::Perl_uvchr_to_utf8
+#define uvchr_to_utf8 Perl_uvchr_to_utf8
+#define Perl_uvuni_to_utf8 CPerlObj::Perl_uvuni_to_utf8
+#define uvuni_to_utf8 Perl_uvuni_to_utf8
#define Perl_vivify_defelem CPerlObj::Perl_vivify_defelem
#define vivify_defelem Perl_vivify_defelem
#define Perl_vivify_ref CPerlObj::Perl_vivify_ref
#ifdef USE_PURE_BISON
#define Perl_yylex_r CPerlObj::Perl_yylex_r
#define yylex_r Perl_yylex_r
+#endif
#define Perl_yylex CPerlObj::Perl_yylex
#define yylex Perl_yylex
-#else
-#define Perl_yylex CPerlObj::Perl_yylex
-#define yylex Perl_yylex
-#endif
#define Perl_yyparse CPerlObj::Perl_yyparse
#define yyparse Perl_yyparse
#define Perl_yywarn CPerlObj::Perl_yywarn
#define ptr_table_store Perl_ptr_table_store
#define Perl_ptr_table_split CPerlObj::Perl_ptr_table_split
#define ptr_table_split Perl_ptr_table_split
+#define Perl_ptr_table_clear CPerlObj::Perl_ptr_table_clear
+#define ptr_table_clear Perl_ptr_table_clear
+#define Perl_ptr_table_free CPerlObj::Perl_ptr_table_free
+#define ptr_table_free Perl_ptr_table_free
#endif
#if defined(HAVE_INTERP_INTERN)
#define Perl_sys_intern_clear CPerlObj::Perl_sys_intern_clear
#define is_handle_constructor S_is_handle_constructor
#define S_gv_ename CPerlObj::S_gv_ename
#define gv_ename S_gv_ename
+# if defined(DEBUG_CLOSURES)
#define S_cv_dump CPerlObj::S_cv_dump
#define cv_dump S_cv_dump
+# endif
#define S_cv_clone2 CPerlObj::S_cv_clone2
#define cv_clone2 S_cv_clone2
#define S_scalar_mod_type CPerlObj::S_scalar_mod_type
#define S_sv_2iuv_non_preserve CPerlObj::S_sv_2iuv_non_preserve
#define sv_2iuv_non_preserve S_sv_2iuv_non_preserve
# endif
+#define S_expect_number CPerlObj::S_expect_number
+#define expect_number S_expect_number
+# if defined(USE_ITHREADS)
+#define S_gv_share CPerlObj::S_gv_share
+#define gv_share S_gv_share
+# endif
#endif
#if defined(PERL_IN_TOKE_C) || defined(PERL_DECL_PROT)
#define S_check_uni CPerlObj::S_check_uni
#define find_in_my_stash S_find_in_my_stash
#define S_new_constant CPerlObj::S_new_constant
#define new_constant S_new_constant
+#define S_tokereport CPerlObj::S_tokereport
+#define tokereport S_tokereport
#define S_ao CPerlObj::S_ao
#define ao S_ao
#define S_depcom CPerlObj::S_depcom