Fix printing of quantifiers after \p{...} (#23)

* `node tests/update-fixtures.js` * Fix printing of quantifiers after `\p{...}`
bnjmnt4n · Jan 17, 2022 · a4f6e0a · a4f6e0a
1 parent 561c458
commit a4f6e0a
Show file tree

Hide file tree

Showing 5 changed files with 428 additions and 20 deletions.
diff --git a/regjsgen.js b/regjsgen.js
@@ -154,8 +154,10 @@
     }
   }
 
+  var atomType = 'anchor|characterClass|characterClassEscape|dot|group|reference|unicodePropertyEscape|value';
+
   function generateAtom(node) {
-    assertType(node.type, 'anchor|characterClass|characterClassEscape|dot|group|reference|value');
+    assertType(node.type, atomType);
 
     return generate(node);
   }
@@ -307,7 +309,7 @@
   }
 
   function generateTerm(node) {
-    assertType(node.type, 'anchor|characterClass|characterClassEscape|empty|group|quantifier|reference|unicodePropertyEscape|value|dot');
+    assertType(node.type, atomType + '|empty|quantifier');
 
     return generate(node);
   }

diff --git a/tests/test-data-lookbehind.json b/tests/test-data-lookbehind.json
@@ -39,6 +39,7 @@
             "raw": "\\d"
           }
         ],
+        "symbol": "+",
         "range": [
           7,
           10
@@ -81,6 +82,7 @@
                     "raw": "\\d"
                   }
                 ],
+                "symbol": "*",
                 "range": [
                   13,
                   16
@@ -95,6 +97,7 @@
             "raw": "(\\.\\d*)"
           }
         ],
+        "symbol": "?",
         "range": [
           10,
           18
@@ -141,6 +144,7 @@
                 "raw": "\\d"
               }
             ],
+            "symbol": "+",
             "range": [
               6,
               9
@@ -180,6 +184,7 @@
             "raw": "\\d"
           }
         ],
+        "symbol": "+",
         "range": [
           12,
           15
@@ -233,6 +238,7 @@
             "raw": "\\d"
           }
         ],
+        "symbol": "+",
         "range": [
           7,
           10
@@ -269,6 +275,7 @@
                 "raw": "\\d"
               }
             ],
+            "symbol": "*",
             "range": [
               15,
               18

diff --git a/tests/test-data-named-groups-unicode.json b/tests/test-data-named-groups-unicode.json
@@ -63,39 +63,53 @@
     "message": "Invalid code point 16777215",
     "input": "(?<\\u{ffffff})"
   },
-  "(?<$𐒤>a)": {
+  "(?<$\uD801\uDCA4>a)": {
     "type": "group",
     "behavior": "normal",
-    "body": [{
-      "type": "value",
-      "kind": "symbol",
-      "codePoint": 97,
-      "range": [7, 8],
-      "raw": "a"
-    }],
-    "range": [0, 9],
-    "raw": "(?<$𐒤>a)",
+    "body": [
+      {
+        "type": "value",
+        "kind": "symbol",
+        "codePoint": 97,
+        "range": [
+          7,
+          8
+        ],
+        "raw": "a"
+      }
+    ],
+    "range": [
+      0,
+      9
+    ],
+    "raw": "(?<$\uD801\uDCA4>a)",
     "name": {
       "type": "identifier",
-      "value": "$𐒤",
+      "value": "$\uD801\uDCA4",
       "range": [
         3,
         6
       ],
-      "raw": "$𐒤"
+      "raw": "$\uD801\uDCA4"
     }
   },
-  "(?<\\u{102A7}Ƞ>)": {
+  "(?<\\u{102A7}\u0220>)": {
     "type": "group",
     "behavior": "normal",
     "body": [],
-    "range": [0, 15],
-    "raw": "(?<\\u{102A7}Ƞ>)",
+    "range": [
+      0,
+      15
+    ],
+    "raw": "(?<\\u{102A7}\u0220>)",
     "name": {
       "type": "identifier",
-      "value": "𐊧Ƞ",
-      "range": [3, 13],
-      "raw": "\\u{102A7}Ƞ"
+      "value": "\uD800\uDEA7\u0220",
+      "range": [
+        3,
+        13
+      ],
+      "raw": "\\u{102A7}\u0220"
     }
   }
 }
diff --git a/tests/test-data-unicode-properties.json b/tests/test-data-unicode-properties.json
@@ -179,6 +179,54 @@
     ],
     "raw": "foo\\P{ASCII_Hex_Digit}bar"
   },
+  "\\p{ASCII_Hex_Digit}{4}": {
+    "type": "quantifier",
+    "min": 4,
+    "max": 4,
+    "greedy": true,
+    "body": [
+      {
+        "type": "unicodePropertyEscape",
+        "negative": false,
+        "value": "ASCII_Hex_Digit",
+        "range": [
+          0,
+          19
+        ],
+        "raw": "\\p{ASCII_Hex_Digit}"
+      }
+    ],
+    "symbol": null,
+    "range": [
+      0,
+      22
+    ],
+    "raw": "\\p{ASCII_Hex_Digit}{4}"
+  },
+  "\\p{ASCII_Hex_Digit}+": {
+    "type": "quantifier",
+    "min": 1,
+    "max": null,
+    "greedy": true,
+    "body": [
+      {
+        "type": "unicodePropertyEscape",
+        "negative": false,
+        "value": "ASCII_Hex_Digit",
+        "range": [
+          0,
+          19
+        ],
+        "raw": "\\p{ASCII_Hex_Digit}"
+      }
+    ],
+    "symbol": "+",
+    "range": [
+      0,
+      20
+    ],
+    "raw": "\\p{ASCII_Hex_Digit}+"
+  },
   "\\p{}": {
     "type": "error",
     "name": "SyntaxError",