Small formatting tweaks

PCRE2Project · Dec 2, 2024 · 62da3b1 · 62da3b1
1 parent b62c07c
commit 62da3b1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/src/pcre2_compile.c b/src/pcre2_compile.c
@@ -6276,9 +6276,7 @@ for (;; pptr++)
             /* Don't unconditionally request all the space we need - we may
             already have asked for more during processing of the ECLASS. */
             if (required_len > (*lengthptr - previous_length))
-              {
               *lengthptr = previous_length + required_len;
-              }
 
             /* The code we write out here won't be ignored, even during the
             (lengthptr != NULL) phase, because if there's a following quantifier
@@ -6339,9 +6337,7 @@ for (;; pptr++)
         if (lengthptr != NULL)
           {
           if (required_len > (*lengthptr - previous_length))
-            {
             *lengthptr = previous_length + required_len;
-            }
           }
         else
           {

diff --git a/src/pcre2_printint.c b/src/pcre2_printint.c
@@ -656,20 +656,6 @@ for(;;)
 
   switch(*code)
     {
-/* ========================================================================== */
-      /* These cases are never obeyed. This is a fudge that causes a compile-
-      time error if the vectors OP_names or OP_lengths, which are indexed
-      by opcode, are not the correct length. It seems to be the only way to do
-      such a check at compile time, as the sizeof() operator does not work in
-      the C preprocessor. */
-
-      case OP_TABLE_LENGTH:
-      case OP_TABLE_LENGTH +
-        ((sizeof(OP_names)/sizeof(const char *) == OP_TABLE_LENGTH) &&
-        (sizeof(OP_lengths) == OP_TABLE_LENGTH)):
-      return;
-/* ========================================================================== */
-
     case OP_END:
     fprintf(f, "    %s\n", OP_names[*code]);
     fprintf(f, "------------------------------------------------------------------\n");
@@ -997,6 +983,8 @@ for(;;)
       fprintf(f, "]\n");
       ccode += 32 / sizeof(PCRE2_UCHAR);
       }
+    else
+      fprintf(f, "          no bitmap\n");
     while (ccode < code + extra)
       {
       if (print_lengths)

diff --git a/testdata/testoutput11-32 b/testdata/testoutput11-32
@@ -903,6 +903,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\x{80000000}-\x{8000000f}]
           xclass: [^\x{80000002}]
           AND
@@ -922,6 +923,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\x{80000000}-\x{8000000f}]
           xclass: [^\x{80000002}]
           AND
@@ -947,6 +949,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\x{80000000}-\x{8000000f}]
           xclass: [\x{8fffffff}]
           OR
@@ -968,6 +971,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\x{80000000}-\x{8000000f}]
           xclass: [^\x{80000002}]
           AND
@@ -987,6 +991,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\x{80000000}-\x{8000000f}]
           xclass: [^\x{80000002}]
           AND

diff --git a/testdata/testoutput5 b/testdata/testoutput5
@@ -6876,6 +6876,7 @@ No match
         Bra
         Bra
         eclass[
+          no bitmap
           xclass: [^\p{Nd}]
           xclass: [\p{Nd}]
           AND
@@ -6981,6 +6982,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\p{L}]
           xclass: [^\p{L}]
           AND
@@ -7000,6 +7002,7 @@ No match
 ------------------------------------------------------------------
         Bra
         eclass[
+          no bitmap
           xclass: [\p{L}]
           xclass: [^\p{L}]
           AND