Update dependencies and regenerate CPP parser (#8)

Co-authored-by: mskelton <mskelton@users.noreply.github.com>

package-lock.json

@@ -60,7 +60,7 @@
     },
     "node_modules/tree-sitter-cpp": {
       "version": "0.20.0",
-      "resolved": "git+ssh://git@github.com/tree-sitter/tree-sitter-cpp.git#66262d3e76eb2046c76e6d661a6b72664bfb5819",
+      "resolved": "git+ssh://git@github.com/tree-sitter/tree-sitter-cpp.git#03fa93db133d6048a77d4de154a7b17ea8b9d076",
       "dev": true,
       "hasInstallScript": true,
       "license": "MIT",
@@ -96,7 +96,7 @@
       "dev": true
     },
     "tree-sitter-cpp": {
-      "version": "git+ssh://git@github.com/tree-sitter/tree-sitter-cpp.git#66262d3e76eb2046c76e6d661a6b72664bfb5819",
+      "version": "git+ssh://git@github.com/tree-sitter/tree-sitter-cpp.git#03fa93db133d6048a77d4de154a7b17ea8b9d076",
       "dev": true,
       "from": "tree-sitter-cpp@git://github.com/tree-sitter/tree-sitter-cpp.git",
       "requires": {

src/grammar.json

@@ -10608,8 +10608,17 @@
             "type": "FIELD",
             "name": "operator",
             "content": {
-              "type": "STRING",
-              "value": "&&"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "&&"
+                },
+                {
+                  "type": "STRING",
+                  "value": "and"
+                }
+              ]
             }
           },
           {
@@ -10641,8 +10650,17 @@
             "type": "FIELD",
             "name": "operator",
             "content": {
-              "type": "STRING",
-              "value": "||"
+              "type": "CHOICE",
+              "members": [
+                {
+                  "type": "STRING",
+                  "value": "||"
+                },
+                {
+                  "type": "STRING",
+                  "value": "or"
+                }
+              ]
             }
           },
           {

src/node-types.json

@@ -1777,6 +1777,10 @@
           {
             "type": "&&",
             "named": false
+          },
+          {
+            "type": "and",
+            "named": false
           }
         ]
       },
@@ -1858,6 +1862,10 @@
         "multiple": false,
         "required": true,
         "types": [
+          {
+            "type": "or",
+            "named": false
+          },
           {
             "type": "||",
             "named": false

test/corpus/concepts.txt

@@ -99,9 +99,15 @@ void f(T);
 template<typename T> requires Addable<T> && Subtractable<T> // conjunctions
 T f(T);
 
+template<typename T> requires Addable<T> and Subtractable<T> // conjunctions
+T f(T);
+
 template<typename T> requires Addable<T> || Subtractable<T> // disjunctions
 T f(T);
 
+template<typename T> requires Addable<T> or Subtractable<T> // conjunctions
+T f(T);
+
 template<typename T> requires false || true // boolean literals
 T f(T);
 
@@ -253,6 +259,54 @@ T f(T);
             (parameter_list
               (parameter_declaration
                 (type_identifier))))))
+      (template_declaration
+        (template_parameter_list
+          (type_parameter_declaration
+            (type_identifier)))
+        (requires_clause
+          (constraint_conjunction
+            (template_type
+              (type_identifier)
+              (template_argument_list
+                (type_descriptor
+                  (type_identifier))))
+            (template_type
+              (type_identifier)
+              (template_argument_list
+                (type_descriptor
+                  (type_identifier))))))
+        (comment)
+        (declaration
+          (type_identifier)
+          (function_declarator
+            (identifier)
+            (parameter_list
+              (parameter_declaration
+                (type_identifier))))))
+      (template_declaration
+        (template_parameter_list
+          (type_parameter_declaration
+            (type_identifier)))
+        (requires_clause
+          (constraint_disjunction
+            (template_type
+              (type_identifier)
+              (template_argument_list
+                (type_descriptor
+                  (type_identifier))))
+            (template_type
+              (type_identifier)
+              (template_argument_list
+                (type_descriptor
+                  (type_identifier))))))
+        (comment)
+        (declaration
+          (type_identifier)
+          (function_declarator
+            (identifier)
+            (parameter_list
+              (parameter_declaration
+                (type_identifier))))))
       (template_declaration
         (template_parameter_list
           (type_parameter_declaration
@@ -322,7 +376,7 @@ requires(T x) {
     {*x} -> std::convertible_to<typename T::inner>; // the expression *x must be valid
                                                     // AND the type T::inner must be valid
                                                     // AND the result of *x must be convertible to T::inner
-    {x + 1} -> std::same_as<int>; // the expression x + 1 must be valid 
+    {x + 1} -> std::same_as<int>; // the expression x + 1 must be valid
                                // AND std::same_as<decltype((x + 1)), int> must be satisfied
                                // i.e., (x + 1) must be a prvalue of type int
     {x * 1} -> std::convertible_to<T>; // the expression x * 1 must be valid
@@ -401,7 +455,7 @@ Nested requirements
 template <class T>
 concept Semiregular = DefaultConstructible<T> &&
     CopyConstructible<T> && Destructible<T> && CopyAssignable<T> &&
-requires(T a, size_t n) {  
+requires(T a, size_t n) {
     requires Same<T*, decltype(&a)>;  // nested: "Same<...> evaluates to true"
     { a.~T() } noexcept;  // compound: "a.~T()" is a valid expression that doesn't throw
     requires Same<T*, decltype(new T)>; // nested: "Same<...> evaluates to true"