#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 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 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
#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 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 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 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)
#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 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
#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 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
#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