feat: add negated classes

tree-sitter-grammars · Apr 26, 2023 · 393915d · 393915d
1 parent bfb38d2
commit 393915d
Show file tree

Hide file tree

Showing 4 changed files with 990 additions and 1,284 deletions.
diff --git a/grammar.js b/grammar.js
@@ -50,16 +50,6 @@ module.exports = grammar({
       optional($.quantifier),
     ),
 
-    all_letters_char: _ => token.immediate('a'),
-    control_char: _ => token.immediate('c'),
-    digit_char: _ => token.immediate('d'),
-    printable_char: _ => token.immediate('g'),
-    lowercase_char: _ => token.immediate('l'),
-    punctuation_char: _ => token.immediate('p'),
-    space_char: _ => token.immediate('s'),
-    uppercase_char: _ => token.immediate('u'),
-    alphanumeric_char: _ => token.immediate('w'),
-    hexadecimal_char: _ => token.immediate('x'),
     escape_char: _ => token.immediate(/\W/),
     capture_index: _ => token.immediate(/[1-9]/),
     balanced_match: $ => seq(
@@ -91,16 +81,7 @@ module.exports = grammar({
     class: $ => seq(
       token.immediate('%'),
       choice(
-        $.all_letters_char,
-        $.control_char,
-        $.digit_char,
-        $.printable_char,
-        $.lowercase_char,
-        $.punctuation_char,
-        $.space_char,
-        $.uppercase_char,
-        $.alphanumeric_char,
-        $.hexadecimal_char,
+        /[acdglpsuwxACDGLPSUWX]/,
         $.capture_index,
         $.balanced_match,
         $.escape_char,

diff --git a/src/grammar.json b/src/grammar.json
@@ -125,76 +125,6 @@
         }
       ]
     },
-    "all_letters_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "a"
-      }
-    },
-    "control_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "c"
-      }
-    },
-    "digit_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "d"
-      }
-    },
-    "printable_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "g"
-      }
-    },
-    "lowercase_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "l"
-      }
-    },
-    "punctuation_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "p"
-      }
-    },
-    "space_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "s"
-      }
-    },
-    "uppercase_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "u"
-      }
-    },
-    "alphanumeric_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "w"
-      }
-    },
-    "hexadecimal_char": {
-      "type": "IMMEDIATE_TOKEN",
-      "content": {
-        "type": "STRING",
-        "value": "x"
-      }
-    },
     "escape_char": {
       "type": "IMMEDIATE_TOKEN",
       "content": {
@@ -341,44 +271,8 @@
           "type": "CHOICE",
           "members": [
             {
-              "type": "SYMBOL",
-              "name": "all_letters_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "control_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "digit_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "printable_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "lowercase_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "punctuation_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "space_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "uppercase_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "alphanumeric_char"
-            },
-            {
-              "type": "SYMBOL",
-              "name": "hexadecimal_char"
+              "type": "PATTERN",
+              "value": "[acdglpsuwxACDGLPSUWX]"
             },
             {
               "type": "SYMBOL",

diff --git a/src/node-types.json b/src/node-types.json
@@ -115,16 +115,8 @@
     "fields": {},
     "children": {
       "multiple": false,
-      "required": true,
+      "required": false,
       "types": [
-        {
-          "type": "all_letters_char",
-          "named": true
-        },
-        {
-          "type": "alphanumeric_char",
-          "named": true
-        },
         {
           "type": "balanced_match",
           "named": true
@@ -133,41 +125,9 @@
           "type": "capture_index",
           "named": true
         },
-        {
-          "type": "control_char",
-          "named": true
-        },
-        {
-          "type": "digit_char",
-          "named": true
-        },
         {
           "type": "escape_char",
           "named": true
-        },
-        {
-          "type": "hexadecimal_char",
-          "named": true
-        },
-        {
-          "type": "lowercase_char",
-          "named": true
-        },
-        {
-          "type": "printable_char",
-          "named": true
-        },
-        {
-          "type": "punctuation_char",
-          "named": true
-        },
-        {
-          "type": "space_char",
-          "named": true
-        },
-        {
-          "type": "uppercase_char",
-          "named": true
         }
       ]
     }
@@ -414,14 +374,6 @@
     "type": "^",
     "named": false
   },
-  {
-    "type": "all_letters_char",
-    "named": true
-  },
-  {
-    "type": "alphanumeric_char",
-    "named": true
-  },
   {
     "type": "b",
     "named": false
@@ -430,46 +382,14 @@
     "type": "capture_index",
     "named": true
   },
-  {
-    "type": "control_char",
-    "named": true
-  },
-  {
-    "type": "digit_char",
-    "named": true
-  },
   {
     "type": "escape_char",
     "named": true
   },
-  {
-    "type": "hexadecimal_char",
-    "named": true
-  },
-  {
-    "type": "lowercase_char",
-    "named": true
-  },
   {
     "type": "one_or_more",
     "named": true
   },
-  {
-    "type": "printable_char",
-    "named": true
-  },
-  {
-    "type": "punctuation_char",
-    "named": true
-  },
-  {
-    "type": "space_char",
-    "named": true
-  },
-  {
-    "type": "uppercase_char",
-    "named": true
-  },
   {
     "type": "zero_or_more",
     "named": true