This is a live mirror of the Perl 5 development currently hosted at https://github.com/perl/perl5
mktables, regexec.c: Comments, white-space; no code changes
authorKarl Williamson <public@khwilliamson.com>
Sun, 16 Dec 2012 18:57:09 +0000 (11:57 -0700)
committerKarl Williamson <public@khwilliamson.com>
Sun, 16 Dec 2012 19:11:07 +0000 (12:11 -0700)
lib/unicore/mktables
regexec.c

index fb11dad..ae8af02 100644 (file)
@@ -13516,7 +13516,7 @@ sub compile_perl() {
 
     # All the tables with _X_ in their names are used in defining \X handling,
     # and are based on the Unicode GCB property.  Basically, \X matches:
-    #   CR-LF
+    #   CR LF
     #   | Prepend* Begin Extend*
     #   | .
     # Begin is:           ( Special_Begin | ! Control )
@@ -13524,7 +13524,7 @@ sub compile_perl() {
     #   where Regular_Begin is defined as ( ! Control - Special_Begin )
     # Special_Begin is:   ( Regional-Indicator+ | Hangul-syllable )
     # Extend is:          ( Grapheme_Extend | Spacing_Mark )
-    # Control is:         [ GCB_Control CR LF ]
+    # Control is:         [ GCB_Control | CR | LF ]
     # Hangul-syllable is: ( T+ | ( L* ( L | ( LVT | ( V | LV ) V* ) T* ) ))
 
     foreach my $gcb_name (qw{ L V T LV LVT }) {
index 9409013..483829b 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -4198,8 +4198,8 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
            U32 fold_utf8_flags;
 
            PL_reg_flags |= RF_tainted;
-           folder = foldEQ_locale;
-           fold_array = PL_fold_locale;
+            folder = foldEQ_locale;
+            fold_array = PL_fold_locale;
            fold_utf8_flags = FOLDEQ_UTF8_LOCALE;
            goto do_exactf;
 
@@ -4464,7 +4464,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
                Begin is:           ( Special_Begin | ! Control )
                Special_Begin is:   ( Regional-Indicator+ | Hangul-syllable )
                Extend is:          ( Grapheme_Extend | Spacing_Mark )
-               Control is:         [ GCB_Control  CR  LF ]
+               Control is:         [ GCB_Control | CR | LF ]
                Hangul-syllable is: ( T+ | ( L* ( L | ( LVT | ( V | LV ) V* ) T* ) ))
 
                If we create a 'Regular_Begin' = Begin - Special_Begin, then
@@ -4506,7 +4506,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
                /* Utf8: See if is ( CR LF ); already know that locinput <
                 * PL_regeol, so locinput+1 is in bounds */
                if ( nextchr == '\r' && locinput+1 < PL_regeol
-                        && UCHARAT(locinput + 1) == '\n')
+                     && UCHARAT(locinput + 1) == '\n')
                 {
                    locinput += 2;
                }