regnodes.h: Change some regnodes' names
authorKarl Williamson <khw@cpan.org>
Thu, 14 Mar 2019 18:18:59 +0000 (12:18 -0600)
committerKarl Williamson <khw@cpan.org>
Fri, 24 May 2019 23:09:29 +0000 (17:09 -0600)
These were misleading, as elsewhere a leading 'N' in the name means the
complement.  Instead move the N to the end of the name

pod/perldebguts.pod
regcomp.c
regcomp.sym
regexec.c
regnodes.h

index de413fd..797e2c6 100644 (file)
@@ -732,14 +732,14 @@ will be lost.
 
  # Named references.  Code in regcomp.c assumes that these all are after
  # the numbered references
NREF             no-sv 1    Match some already matched string
NREFF            no-sv 1    Match already matched string, using /di
REFN             no-sv 1    Match some already matched string
REFFN            no-sv 1    Match already matched string, using /di
                              rules.
NREFFL           no-sv 1    Match already matched string, using /li
REFFLN           no-sv 1    Match already matched string, using /li
                              rules.
NREFFU           num 1      Match already matched string, using /ui
REFFUN           num 1      Match already matched string, using /ui
                              rules.
NREFFA           num 1      Match already matched string, using /aai
REFFAN           num 1      Match already matched string, using /aai
                              rules.
 
  # Support for long RE
@@ -791,7 +791,7 @@ will be lost.
  GOSUB            num/ofs 2L recurse to paren arg1 at (signed) ofs arg2
 
  # Special conditionals
NGROUPP          no-sv 1    Whether the group matched.
GROUPPN          no-sv 1    Whether the group matched.
  INSUBP           num 1      Whether we are in a specific recurse.
  DEFINEP          none 1     Never execute directly.
 
index 1c54fe3..70fd0be 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -11000,14 +11000,14 @@ S_handle_named_backref(pTHX_ RExC_state_t *pRExC_state,
     RExC_sawback = 1;
     ret = reganode(pRExC_state,
                    ((! FOLD)
-                     ? NREF
+                     ? REFN
                      : (ASCII_FOLD_RESTRICTED)
-                       ? NREFFA
+                       ? REFFAN
                        : (AT_LEAST_UNI_SEMANTICS)
-                         ? NREFFU
+                         ? REFFUN
                          : (LOC)
-                           ? NREFFL
-                           : NREFF),
+                           ? REFFLN
+                           : REFFN),
                     num);
     *flagp |= HASWIDTH;
 
@@ -11848,7 +11848,7 @@ S_reg(pTHX_ RExC_state_t *pRExC_state, I32 paren, I32 *flagp, U32 depth)
                         RExC_rxi->data->data[num]=(void*)sv_dat;
                         SvREFCNT_inc_simple_void_NN(sv_dat);
                     }
-                    ret = reganode(pRExC_state, NGROUPP, num);
+                    ret = reganode(pRExC_state, GROUPPN, num);
                     goto insert_if_check_paren;
                }
                else if (memBEGINs(RExC_parse,
@@ -20294,7 +20294,7 @@ Perl_regprop(pTHX_ const regexp *prog, SV *sv, const regnode *o, const regmatch_
             name_list= RExC_paren_name_list;
         }
         if (name_list) {
-            if ( k != REF || (OP(o) < NREF)) {
+            if ( k != REF || (OP(o) < REFN)) {
                 SV **name= av_fetch(name_list, parno, 0 );
                if (name)
                    Perl_sv_catpvf(aTHX_ sv, " '%" SVf "'", SVfARG(*name));
index a35beca..5e80ea8 100644 (file)
@@ -166,11 +166,11 @@ REFFA       REF,        num 1 V   ; Match already matched string, using /aai rul
 
 #*Named references.  Code in regcomp.c assumes that these all are after
 #*the numbered references
-NREF        REF,        no-sv 1 V ; Match some already matched string
-NREFF       REF,        no-sv 1 V ; Match already matched string, using /di rules.
-NREFFL      REF,        no-sv 1 V ; Match already matched string, using /li rules.
-NREFFU      REF,        num   1 V ; Match already matched string, using /ui rules.
-NREFFA      REF,        num   1 V ; Match already matched string, using /aai rules.
+REFN        REF,        no-sv 1 V ; Match some already matched string
+REFFN       REF,        no-sv 1 V ; Match already matched string, using /di rules.
+REFFLN      REF,        no-sv 1 V ; Match already matched string, using /li rules.
+REFFUN      REF,        num   1 V ; Match already matched string, using /ui rules.
+REFFAN      REF,        num   1 V ; Match already matched string, using /aai rules.
 
 #*Support for long RE
 LONGJMP     LONGJMP,    off 1 . 1 ; Jump far away.
@@ -214,7 +214,7 @@ AHOCORASICKC    TRIE,trie charclass   ; Same as AHOCORASICK, but with embedded c
 GOSUB       GOSUB,      num/ofs 2L    ; recurse to paren arg1 at (signed) ofs arg2
 
 #*Special conditionals
-NGROUPP     NGROUPP,    no-sv 1   ; Whether the group matched.            
+GROUPPN     GROUPPN,    no-sv 1   ; Whether the group matched.
 INSUBP      INSUBP,     num 1     ; Whether we are in a specific recurse.  
 DEFINEP     DEFINEP,    none 1    ; Never execute directly.               
 
index f8fa850..02c2d62 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -7034,7 +7034,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
            }
            break;
             
-       case NREFFL:  /*  /\g{name}/il  */
+       case REFFLN:  /*  /\g{name}/il  */
        {   /* The capture buffer cases.  The ones beginning with N for the
               named buffers just convert to the equivalent numbered and
               pretend they were called as the corresponding numbered buffer
@@ -7054,28 +7054,28 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
            utf8_fold_flags = FOLDEQ_LOCALE;
            goto do_nref;
 
-       case NREFFA:  /*  /\g{name}/iaa  */
+       case REFFAN:  /*  /\g{name}/iaa  */
            folder = foldEQ_latin1;
            fold_array = PL_fold_latin1;
            type = REFFA;
            utf8_fold_flags = FOLDEQ_UTF8_NOMIX_ASCII;
            goto do_nref;
 
-       case NREFFU:  /*  /\g{name}/iu  */
+       case REFFUN:  /*  /\g{name}/iu  */
            folder = foldEQ_latin1;
            fold_array = PL_fold_latin1;
            type = REFFU;
            utf8_fold_flags = 0;
            goto do_nref;
 
-       case NREFF:  /*  /\g{name}/i  */
+       case REFFN:  /*  /\g{name}/i  */
            folder = foldEQ;
            fold_array = PL_fold;
            type = REFF;
            utf8_fold_flags = 0;
            goto do_nref;
 
-       case NREF:  /*  /\g{name}/   */
+       case REFN:  /*  /\g{name}/   */
            type = REF;
            folder = NULL;
            fold_array = NULL;
@@ -7729,7 +7729,7 @@ S_regmatch(pTHX_ regmatch_info *reginfo, char *startpos, regnode *prog)
            sw = cBOOL(rex->lastparen >= n && rex->offs[n].end != -1);
            break;
 
-       case NGROUPP:  /*  (?(<name>))  */
+       case GROUPPN:  /*  (?(<name>))  */
            /* reg_check_named_buff_matched returns 0 for no match */
            sw = cBOOL(0 < reg_check_named_buff_matched(rex,scan));
            break;
index ba691a2..dd23029 100644 (file)
 #define        REFFL                   62      /* 0x3e Match already matched string, using /li rules. */
 #define        REFFU                   63      /* 0x3f Match already matched string, usng /ui. */
 #define        REFFA                   64      /* 0x40 Match already matched string, using /aai rules. */
-#define        NREF                    65      /* 0x41 Match some already matched string */
-#define        NREFF                   66      /* 0x42 Match already matched string, using /di rules. */
-#define        NREFFL                  67      /* 0x43 Match already matched string, using /li rules. */
-#define        NREFFU                  68      /* 0x44 Match already matched string, using /ui rules. */
-#define        NREFFA                  69      /* 0x45 Match already matched string, using /aai rules. */
+#define        REFN                    65      /* 0x41 Match some already matched string */
+#define        REFFN                   66      /* 0x42 Match already matched string, using /di rules. */
+#define        REFFLN                  67      /* 0x43 Match already matched string, using /li rules. */
+#define        REFFUN                  68      /* 0x44 Match already matched string, using /ui rules. */
+#define        REFFAN                  69      /* 0x45 Match already matched string, using /aai rules. */
 #define        LONGJMP                 70      /* 0x46 Jump far away. */
 #define        BRANCHJ                 71      /* 0x47 BRANCH with long offset. */
 #define        IFMATCH                 72      /* 0x48 Succeeds if the following matches; non-zero flags "f", next_off "o" means lookbehind assertion starting "f..(f-o)" characters before current */
@@ -97,7 +97,7 @@
 #define        AHOCORASICK             83      /* 0x53 Aho Corasick stclass. flags==type */
 #define        AHOCORASICKC            84      /* 0x54 Same as AHOCORASICK, but with embedded charclass data */
 #define        GOSUB                   85      /* 0x55 recurse to paren arg1 at (signed) ofs arg2 */
-#define        NGROUPP                 86      /* 0x56 Whether the group matched. */
+#define        GROUPPN                 86      /* 0x56 Whether the group matched. */
 #define        INSUBP                  87      /* 0x57 Whether we are in a specific recurse. */
 #define        DEFINEP                 88      /* 0x58 Never execute directly. */
 #define        ENDLIKE                 89      /* 0x59 Used only for the type field of verbs */
@@ -226,11 +226,11 @@ EXTCONST U8 PL_regkind[] = {
        REF,            /* REFFL                  */
        REF,            /* REFFU                  */
        REF,            /* REFFA                  */
-       REF,            /* NREF                   */
-       REF,            /* NREFF                  */
-       REF,            /* NREFFL                 */
-       REF,            /* NREFFU                 */
-       REF,            /* NREFFA                 */
+       REF,            /* REFN                   */
+       REF,            /* REFFN                  */
+       REF,            /* REFFLN                 */
+       REF,            /* REFFUN                 */
+       REF,            /* REFFAN                 */
        LONGJMP,        /* LONGJMP                */
        BRANCHJ,        /* BRANCHJ                */
        BRANCHJ,        /* IFMATCH                */
@@ -247,7 +247,7 @@ EXTCONST U8 PL_regkind[] = {
        TRIE,           /* AHOCORASICK            */
        TRIE,           /* AHOCORASICKC           */
        GOSUB,          /* GOSUB                  */
-       NGROUPP,        /* NGROUPP                */
+       GROUPPN,        /* GROUPPN                */
        INSUBP,         /* INSUBP                 */
        DEFINEP,        /* DEFINEP                */
        ENDLIKE,        /* ENDLIKE                */
@@ -377,11 +377,11 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* REFFL        */
        EXTRA_SIZE(struct regnode_1),           /* REFFU        */
        EXTRA_SIZE(struct regnode_1),           /* REFFA        */
-       EXTRA_SIZE(struct regnode_1),           /* NREF         */
-       EXTRA_SIZE(struct regnode_1),           /* NREFF        */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFL       */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFU       */
-       EXTRA_SIZE(struct regnode_1),           /* NREFFA       */
+       EXTRA_SIZE(struct regnode_1),           /* REFN         */
+       EXTRA_SIZE(struct regnode_1),           /* REFFN        */
+       EXTRA_SIZE(struct regnode_1),           /* REFFLN       */
+       EXTRA_SIZE(struct regnode_1),           /* REFFUN       */
+       EXTRA_SIZE(struct regnode_1),           /* REFFAN       */
        EXTRA_SIZE(struct regnode_1),           /* LONGJMP      */
        EXTRA_SIZE(struct regnode_1),           /* BRANCHJ      */
        EXTRA_SIZE(struct regnode_1),           /* IFMATCH      */
@@ -398,7 +398,7 @@ static const U8 regarglen[] = {
        EXTRA_SIZE(struct regnode_1),           /* AHOCORASICK  */
        EXTRA_SIZE(struct regnode_charclass),   /* AHOCORASICKC */
        EXTRA_SIZE(struct regnode_2L),          /* GOSUB        */
-       EXTRA_SIZE(struct regnode_1),           /* NGROUPP      */
+       EXTRA_SIZE(struct regnode_1),           /* GROUPPN      */
        EXTRA_SIZE(struct regnode_1),           /* INSUBP       */
        EXTRA_SIZE(struct regnode_1),           /* DEFINEP      */
        0,                                      /* ENDLIKE      */
@@ -484,11 +484,11 @@ static const char reg_off_by_arg[] = {
        0,      /* REFFL        */
        0,      /* REFFU        */
        0,      /* REFFA        */
-       0,      /* NREF         */
-       0,      /* NREFF        */
-       0,      /* NREFFL       */
-       0,      /* NREFFU       */
-       0,      /* NREFFA       */
+       0,      /* REFN         */
+       0,      /* REFFN        */
+       0,      /* REFFLN       */
+       0,      /* REFFUN       */
+       0,      /* REFFAN       */
        1,      /* LONGJMP      */
        1,      /* BRANCHJ      */
        1,      /* IFMATCH      */
@@ -505,7 +505,7 @@ static const char reg_off_by_arg[] = {
        0,      /* AHOCORASICK  */
        0,      /* AHOCORASICKC */
        0,      /* GOSUB        */
-       0,      /* NGROUPP      */
+       0,      /* GROUPPN      */
        0,      /* INSUBP       */
        0,      /* DEFINEP      */
        0,      /* ENDLIKE      */
@@ -597,11 +597,11 @@ EXTCONST char * const PL_reg_name[] = {
        "REFFL",                        /* 0x3e */
        "REFFU",                        /* 0x3f */
        "REFFA",                        /* 0x40 */
-       "NREF",                         /* 0x41 */
-       "NREFF",                        /* 0x42 */
-       "NREFFL",                       /* 0x43 */
-       "NREFFU",                       /* 0x44 */
-       "NREFFA",                       /* 0x45 */
+       "REFN",                         /* 0x41 */
+       "REFFN",                        /* 0x42 */
+       "REFFLN",                       /* 0x43 */
+       "REFFUN",                       /* 0x44 */
+       "REFFAN",                       /* 0x45 */
        "LONGJMP",                      /* 0x46 */
        "BRANCHJ",                      /* 0x47 */
        "IFMATCH",                      /* 0x48 */
@@ -618,7 +618,7 @@ EXTCONST char * const PL_reg_name[] = {
        "AHOCORASICK",                  /* 0x53 */
        "AHOCORASICKC",                 /* 0x54 */
        "GOSUB",                        /* 0x55 */
-       "NGROUPP",                      /* 0x56 */
+       "GROUPPN",                      /* 0x56 */
        "INSUBP",                       /* 0x57 */
        "DEFINEP",                      /* 0x58 */
        "ENDLIKE",                      /* 0x59 */
@@ -758,7 +758,7 @@ EXTCONST U8 PL_varies[] __attribute__deprecated__;
 #else
 EXTCONST U8 PL_varies[] __attribute__deprecated__ = {
     CLUMP, BRANCH, STAR, PLUS, CURLY, CURLYN, CURLYM, CURLYX, WHILEM, REF,
-    REFF, REFFL, REFFU, REFFA, NREF, NREFF, NREFFL, NREFFU, NREFFA,
+    REFF, REFFL, REFFU, REFFA, REFN, REFFN, REFFLN, REFFUN, REFFAN,
     BRANCHJ, SUSPEND, IFTHEN,
     0
 };