Update Unicode-Collate to CPAN version 1.01

[perl5.git] / perly.c

diff --git a/perly.c b/perly.c
index 0f1b7a8..5a934dc 100644 (file)
--- a/perly.c
+++ b/perly.c
@@ -27,13 +27,6 @@
 
 #include "EXTERN.h"
 #define PERL_IN_PERLY_C
-
-#ifdef DEBUGGING
-#  define YYDEBUG 1
-#else
-#  define YYDEBUG 0
-#endif
-
 #include "perl.h"
 
 typedef unsigned char yytype_uint8;
@@ -45,6 +38,15 @@ typedef signed char yysigned_char;
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
 #define YYINITDEPTH 200
 
+#ifdef YYDEBUG
+#  undef YYDEBUG
+#endif
+#ifdef DEBUGGING
+#  define YYDEBUG 1
+#else
+#  define YYDEBUG 0
+#endif
+
 #ifndef YY_NULL
 # define YY_NULL 0
 #endif
@@ -219,6 +221,7 @@ S_clear_yystack(pTHX_  const yy_parser *parser)
            if (ps->compcv != PL_compcv) {
                PL_compcv = ps->compcv;
                PAD_SET_CUR_NOSAVE(CvPADLIST(PL_compcv), 1);
+               PL_comppad_name = PadlistNAMES(CvPADLIST(PL_compcv));
            }
            YYDPRINTF ((Perl_debug_log, "(freeing op)\n"));
            op_free(ps->val.opval);
@@ -339,9 +342,12 @@ Perl_yyparse (pTHX_ int gramtype)
        parser->yychar = yylex();
 #endif
 
+/* perly.tab is shipped based on an ASCII system; if it were to be regenerated
+ * on a platform that doesn't use ASCII, this translation back would need to be
+ * removed */
 #  ifdef EBCDIC
        if (parser->yychar >= 0 && parser->yychar < 255) {
-           parser->yychar = NATIVE_TO_ASCII(parser->yychar);
+           parser->yychar = NATIVE_TO_LATIN1(parser->yychar);
        }
 #  endif
     }