Regenerate tree-sitter-mozcpp grammars (#985)

Cargo.toml

@@ -35,7 +35,7 @@ tree-sitter-python = "=0.20.2"
 tree-sitter-rust = "=0.20.3"
 tree-sitter-preproc = { path = "./tree-sitter-preproc", version = "=0.20.1" }
 tree-sitter-ccomment = { path = "./tree-sitter-ccomment", version = "=0.20.0" }
-tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.1" }
+tree-sitter-mozcpp = { path = "./tree-sitter-mozcpp", version = "=0.20.2" }
 tree-sitter-mozjs = { path = "./tree-sitter-mozjs", version = "=0.20.0" }
 
 [dev-dependencies]

enums/Cargo.toml

@@ -16,7 +16,7 @@ tree-sitter-python = "=0.20.2"
 tree-sitter-rust = "=0.20.3"
 tree-sitter-preproc = { path = "../tree-sitter-preproc", version = "=0.20.1" }
 tree-sitter-ccomment = { path = "../tree-sitter-ccomment", version = "=0.20.0" }
-tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.20.1" }
+tree-sitter-mozcpp = { path = "../tree-sitter-mozcpp", version = "=0.20.2" }
 tree-sitter-mozjs = { path = "../tree-sitter-mozjs", version = "=0.20.0" }
 
 [profile.release]

src/languages/language_cpp.rs

@@ -335,166 +335,165 @@ pub enum Cpp {
     ParameterList = 328,
     ParameterDeclaration = 329,
     AttributedStatement = 330,
-    AttributedStatement2 = 331,
-    LabeledStatement = 332,
-    ExpressionStatement = 333,
-    IfStatement = 334,
-    SwitchStatement = 335,
-    CaseStatement = 336,
-    WhileStatement = 337,
-    DoStatement = 338,
-    ForStatement = 339,
-    ReturnStatement = 340,
-    BreakStatement = 341,
-    ContinueStatement = 342,
-    GotoStatement = 343,
-    Expression = 344,
-    CommaExpression = 345,
-    ConditionalExpression = 346,
-    AssignmentExpression = 347,
-    PointerExpression = 348,
-    UnaryExpression2 = 349,
-    BinaryExpression2 = 350,
-    UpdateExpression = 351,
-    CastExpression = 352,
-    TypeDescriptor = 353,
-    SizeofExpression = 354,
-    SubscriptExpression = 355,
-    CallExpression2 = 356,
-    ArgumentList2 = 357,
-    FieldExpression = 358,
-    CompoundLiteralExpression = 359,
-    ParenthesizedExpression2 = 360,
-    InitializerList = 361,
-    InitializerPair = 362,
-    SubscriptDesignator = 363,
-    FieldDesignator = 364,
-    CharLiteral = 365,
-    ConcatenatedString = 366,
-    StringLiteral = 367,
-    EmptyDeclaration = 368,
-    Decltype = 369,
-    ClassSpecifier = 370,
-    ClassName = 371,
-    VirtualSpecifier = 372,
-    VirtualFunctionSpecifier = 373,
-    ExplicitFunctionSpecifier = 374,
-    BaseClassClause = 375,
-    EnumBaseClause = 376,
-    DependentType = 377,
-    TemplateDeclaration = 378,
-    TemplateInstantiation = 379,
-    TemplateParameterList = 380,
-    TypeParameterDeclaration = 381,
-    VariadicTypeParameterDeclaration = 382,
-    OptionalTypeParameterDeclaration = 383,
-    TemplateTemplateParameterDeclaration = 384,
-    OptionalParameterDeclaration = 385,
-    VariadicParameterDeclaration = 386,
-    VariadicDeclarator = 387,
-    ReferenceDeclarator = 388,
-    OperatorCast = 389,
-    FieldInitializerList = 390,
-    FieldInitializer = 391,
-    FunctionDefinition2 = 392,
-    ConstructorSpecifiers = 393,
-    FunctionDefinition3 = 394,
-    Declaration2 = 395,
-    FunctionDefinition4 = 396,
-    Declaration3 = 397,
-    DefaultMethodClause = 398,
-    DeleteMethodClause = 399,
-    FriendDeclaration = 400,
-    AccessSpecifier = 401,
-    ReferenceDeclarator2 = 402,
-    ReferenceDeclarator3 = 403,
-    AbstractReferenceDeclarator = 404,
-    StructuredBindingDeclarator = 405,
-    RefQualifier = 406,
-    TrailingReturnType = 407,
-    Noexcept = 408,
-    ThrowSpecifier = 409,
-    TemplateType = 410,
-    TemplateMethod = 411,
-    TemplateFunction = 412,
-    TemplateArgumentList = 413,
-    NamespaceDefinition = 414,
-    NamespaceDefinitionName = 415,
-    UsingDeclaration = 416,
-    AliasDeclaration = 417,
-    StaticAssertDeclaration = 418,
-    ConditionClause = 419,
-    Declaration4 = 420,
-    ForRangeLoop = 421,
-    CoReturnStatement = 422,
-    CoYieldStatement = 423,
-    ThrowStatement = 424,
-    TryStatement = 425,
-    CatchClause = 426,
-    CoAwaitExpression = 427,
-    NewExpression = 428,
-    NewDeclarator = 429,
-    DeleteExpression = 430,
-    LambdaExpression = 431,
-    LambdaCaptureSpecifier = 432,
-    LambdaDefaultCapture = 433,
-    ParameterPackExpansion = 434,
-    ParameterPackExpansion2 = 435,
-    DestructorName = 436,
-    DependentName = 437,
-    DependentName2 = 438,
-    DependentName3 = 439,
-    ScopeResolution = 440,
-    QualifiedIdentifier = 441,
-    QualifiedIdentifier2 = 442,
-    QualifiedIdentifier3 = 443,
-    QualifiedIdentifier4 = 444,
-    OperatorName = 445,
-    UserDefinedLiteral = 446,
-    AloneMacroCall = 447,
-    CallMacroWithDeclFirstArg = 448,
-    MacroStatement = 449,
-    MacroAnnotation = 450,
-    TranslationUnitRepeat1 = 451,
-    PreprocParamsRepeat1 = 452,
-    PreprocIfInFieldDeclarationListRepeat1 = 453,
-    PreprocArgumentListRepeat1 = 454,
-    DeclarationRepeat1 = 455,
-    TypeDefinitionRepeat1 = 456,
-    TypeDefinitionRepeat2 = 457,
-    DeclarationSpecifiersRepeat1 = 458,
-    AttributeDeclarationRepeat1 = 459,
-    AttributedDeclaratorRepeat1 = 460,
-    PointerDeclaratorRepeat1 = 461,
-    FunctionDeclaratorRepeat1 = 462,
-    FunctionDeclaratorRepeat2 = 463,
-    AbstractFunctionDeclaratorRepeat1 = 464,
-    SizedTypeSpecifierRepeat1 = 465,
-    EnumeratorListRepeat1 = 466,
-    FieldDeclarationRepeat1 = 467,
-    ParameterListRepeat1 = 468,
-    CaseStatementRepeat1 = 469,
-    ArgumentListRepeat1 = 470,
-    InitializerListRepeat1 = 471,
-    InitializerPairRepeat1 = 472,
-    ConcatenatedStringRepeat1 = 473,
-    StringLiteralRepeat1 = 474,
-    ClassSpecifierRepeat1 = 475,
-    BaseClassClauseRepeat1 = 476,
-    TemplateParameterListRepeat1 = 477,
-    FieldInitializerListRepeat1 = 478,
-    OperatorCastDefinitionRepeat1 = 479,
-    StructuredBindingDeclaratorRepeat1 = 480,
-    ThrowSpecifierRepeat1 = 481,
-    TemplateArgumentListRepeat1 = 482,
-    TryStatementRepeat1 = 483,
-    LambdaCaptureSpecifierRepeat1 = 484,
-    AloneMacroCallRepeat1 = 485,
-    FieldIdentifier = 486,
-    NamespaceIdentifier = 487,
-    StatementIdentifier = 488,
-    TypeIdentifier = 489,
-    Error = 490,
+    LabeledStatement = 331,
+    ExpressionStatement = 332,
+    IfStatement = 333,
+    SwitchStatement = 334,
+    CaseStatement = 335,
+    WhileStatement = 336,
+    DoStatement = 337,
+    ForStatement = 338,
+    ReturnStatement = 339,
+    BreakStatement = 340,
+    ContinueStatement = 341,
+    GotoStatement = 342,
+    Expression = 343,
+    CommaExpression = 344,
+    ConditionalExpression = 345,
+    AssignmentExpression = 346,
+    PointerExpression = 347,
+    UnaryExpression2 = 348,
+    BinaryExpression2 = 349,
+    UpdateExpression = 350,
+    CastExpression = 351,
+    TypeDescriptor = 352,
+    SizeofExpression = 353,
+    SubscriptExpression = 354,
+    CallExpression2 = 355,
+    ArgumentList2 = 356,
+    FieldExpression = 357,
+    CompoundLiteralExpression = 358,
+    ParenthesizedExpression2 = 359,
+    InitializerList = 360,
+    InitializerPair = 361,
+    SubscriptDesignator = 362,
+    FieldDesignator = 363,
+    CharLiteral = 364,
+    ConcatenatedString = 365,
+    StringLiteral = 366,
+    EmptyDeclaration = 367,
+    Decltype = 368,
+    ClassSpecifier = 369,
+    ClassName = 370,
+    VirtualSpecifier = 371,
+    VirtualFunctionSpecifier = 372,
+    ExplicitFunctionSpecifier = 373,
+    BaseClassClause = 374,
+    EnumBaseClause = 375,
+    DependentType = 376,
+    TemplateDeclaration = 377,
+    TemplateInstantiation = 378,
+    TemplateParameterList = 379,
+    TypeParameterDeclaration = 380,
+    VariadicTypeParameterDeclaration = 381,
+    OptionalTypeParameterDeclaration = 382,
+    TemplateTemplateParameterDeclaration = 383,
+    OptionalParameterDeclaration = 384,
+    VariadicParameterDeclaration = 385,
+    VariadicDeclarator = 386,
+    ReferenceDeclarator = 387,
+    OperatorCast = 388,
+    FieldInitializerList = 389,
+    FieldInitializer = 390,
+    FunctionDefinition2 = 391,
+    ConstructorSpecifiers = 392,
+    FunctionDefinition3 = 393,
+    Declaration2 = 394,
+    FunctionDefinition4 = 395,
+    Declaration3 = 396,
+    DefaultMethodClause = 397,
+    DeleteMethodClause = 398,
+    FriendDeclaration = 399,
+    AccessSpecifier = 400,
+    ReferenceDeclarator2 = 401,
+    ReferenceDeclarator3 = 402,
+    AbstractReferenceDeclarator = 403,
+    StructuredBindingDeclarator = 404,
+    RefQualifier = 405,
+    TrailingReturnType = 406,
+    Noexcept = 407,
+    ThrowSpecifier = 408,
+    TemplateType = 409,
+    TemplateMethod = 410,
+    TemplateFunction = 411,
+    TemplateArgumentList = 412,
+    NamespaceDefinition = 413,
+    NamespaceDefinitionName = 414,
+    UsingDeclaration = 415,
+    AliasDeclaration = 416,
+    StaticAssertDeclaration = 417,
+    ConditionClause = 418,
+    Declaration4 = 419,
+    ForRangeLoop = 420,
+    CoReturnStatement = 421,
+    CoYieldStatement = 422,
+    ThrowStatement = 423,
+    TryStatement = 424,
+    CatchClause = 425,
+    CoAwaitExpression = 426,
+    NewExpression = 427,
+    NewDeclarator = 428,
+    DeleteExpression = 429,
+    LambdaExpression = 430,
+    LambdaCaptureSpecifier = 431,
+    LambdaDefaultCapture = 432,
+    ParameterPackExpansion = 433,
+    ParameterPackExpansion2 = 434,
+    DestructorName = 435,
+    DependentName = 436,
+    DependentName2 = 437,
+    DependentName3 = 438,
+    ScopeResolution = 439,
+    QualifiedIdentifier = 440,
+    QualifiedIdentifier2 = 441,
+    QualifiedIdentifier3 = 442,
+    QualifiedIdentifier4 = 443,
+    OperatorName = 444,
+    UserDefinedLiteral = 445,
+    AloneMacroCall = 446,
+    CallMacroWithDeclFirstArg = 447,
+    MacroStatement = 448,
+    MacroAnnotation = 449,
+    TranslationUnitRepeat1 = 450,
+    PreprocParamsRepeat1 = 451,
+    PreprocIfInFieldDeclarationListRepeat1 = 452,
+    PreprocArgumentListRepeat1 = 453,
+    DeclarationRepeat1 = 454,
+    TypeDefinitionRepeat1 = 455,
+    TypeDefinitionRepeat2 = 456,
+    DeclarationSpecifiersRepeat1 = 457,
+    AttributeDeclarationRepeat1 = 458,
+    AttributedDeclaratorRepeat1 = 459,
+    PointerDeclaratorRepeat1 = 460,
+    FunctionDeclaratorRepeat1 = 461,
+    FunctionDeclaratorRepeat2 = 462,
+    AbstractFunctionDeclaratorRepeat1 = 463,
+    SizedTypeSpecifierRepeat1 = 464,
+    EnumeratorListRepeat1 = 465,
+    FieldDeclarationRepeat1 = 466,
+    ParameterListRepeat1 = 467,
+    CaseStatementRepeat1 = 468,
+    ArgumentListRepeat1 = 469,
+    InitializerListRepeat1 = 470,
+    InitializerPairRepeat1 = 471,
+    ConcatenatedStringRepeat1 = 472,
+    StringLiteralRepeat1 = 473,
+    ClassSpecifierRepeat1 = 474,
+    BaseClassClauseRepeat1 = 475,
+    TemplateParameterListRepeat1 = 476,
+    FieldInitializerListRepeat1 = 477,
+    OperatorCastDefinitionRepeat1 = 478,
+    StructuredBindingDeclaratorRepeat1 = 479,
+    ThrowSpecifierRepeat1 = 480,
+    TemplateArgumentListRepeat1 = 481,
+    TryStatementRepeat1 = 482,
+    LambdaCaptureSpecifierRepeat1 = 483,
+    AloneMacroCallRepeat1 = 484,
+    FieldIdentifier = 485,
+    NamespaceIdentifier = 486,
+    StatementIdentifier = 487,
+    TypeIdentifier = 488,
+    Error = 489,
 }
 
 impl From<Cpp> for &'static str {
@@ -840,7 +839,6 @@ impl From<Cpp> for &'static str {
             Cpp::ParameterList => "parameter_list",
             Cpp::ParameterDeclaration => "parameter_declaration",
             Cpp::AttributedStatement => "attributed_statement",
-            Cpp::AttributedStatement2 => "attributed_statement",
             Cpp::LabeledStatement => "labeled_statement",
             Cpp::ExpressionStatement => "expression_statement",
             Cpp::IfStatement => "if_statement",

tests/repositories/rca-output

@@ -1 +1 @@
-Subproject commit 96d3766fba14efe9af8d0bdcf597f0f5fe01ba9e
+Subproject commit c977695ab4662b08338c809fa9e1c0d646f6d28b

tree-sitter-mozcpp/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "tree-sitter-mozcpp"
 description = "Mozcpp grammar for the tree-sitter parsing library"
-version = "0.20.1"
+version = "0.20.2"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 license = "MIT"
 readme = "bindings/rust/README.md"
@@ -21,7 +21,7 @@ include = [
 path = "bindings/rust/lib.rs"
 
 [dependencies]
-tree-sitter = ">= 0.19, < 0.21"
+tree-sitter = "=0.20.9"
 
 [build-dependencies]
 cc = "^1.0"

tree-sitter-mozcpp/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tree-sitter-mozcpp",
-  "version": "0.19.0",
+  "version": "0.20.0",
   "description": "Mozcpp grammar for node-tree-sitter",
   "main": "bindings/node",
   "keywords": [
@@ -13,7 +13,7 @@
     "nan": "^2.14.2"
   },
   "devDependencies": {
-    "tree-sitter-cli": "^0.19.3"
+    "tree-sitter-cli": "^0.20.7"
   },
   "scripts": {
     "build": "tree-sitter generate && node-gyp build",

tree-sitter-mozcpp/src/grammar.json

@@ -5171,22 +5171,6 @@
         }
       ]
     },
-    "attributed_non_case_statement": {
-      "type": "SEQ",
-      "members": [
-        {
-          "type": "REPEAT1",
-          "content": {
-            "type": "SYMBOL",
-            "name": "attribute_declaration"
-          }
-        },
-        {
-          "type": "SYMBOL",
-          "name": "_non_case_statement"
-        }
-      ]
-    },
     "_statement": {
       "type": "CHOICE",
       "members": [
@@ -5206,6 +5190,10 @@
         {
           "type": "CHOICE",
           "members": [
+            {
+              "type": "SYMBOL",
+              "name": "attributed_statement"
+            },
             {
               "type": "SYMBOL",
               "name": "labeled_statement"
@@ -5461,15 +5449,6 @@
             "content": {
               "type": "CHOICE",
               "members": [
-                {
-                  "type": "ALIAS",
-                  "content": {
-                    "type": "SYMBOL",
-                    "name": "attributed_non_case_statement"
-                  },
-                  "named": true,
-                  "value": "attributed_statement"
-                },
                 {
                   "type": "SYMBOL",
                   "name": "_non_case_statement"
@@ -5611,8 +5590,17 @@
             "type": "CHOICE",
             "members": [
               {
-                "type": "SYMBOL",
-                "name": "_expression"
+                "type": "CHOICE",
+                "members": [
+                  {
+                    "type": "SYMBOL",
+                    "name": "_expression"
+                  },
+                  {
+                    "type": "SYMBOL",
+                    "name": "comma_expression"
+                  }
+                ]
               },
               {
                 "type": "BLANK"
@@ -5654,8 +5642,12 @@
           "value": ")"
         },
         {
-          "type": "SYMBOL",
-          "name": "_statement"
+          "type": "FIELD",
+          "name": "body",
+          "content": {
+            "type": "SYMBOL",
+            "name": "_statement"
+          }
         }
       ]
     },
@@ -12043,12 +12035,11 @@
       "sized_type_specifier"
     ],
     [
-      "_declaration_modifiers",
       "attributed_statement"
     ],
     [
       "_declaration_modifiers",
-      "attributed_non_case_statement"
+      "attributed_statement"
     ],
     [
       "template_function",

tree-sitter-mozcpp/src/node-types.json

@@ -259,6 +259,10 @@
     "type": "_statement",
     "named": true,
     "subtypes": [
+      {
+        "type": "attributed_statement",
+        "named": true
+      },
       {
         "type": "break_statement",
         "named": true
@@ -1534,10 +1538,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
@@ -1823,10 +1823,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
@@ -2482,6 +2478,16 @@
     "type": "for_statement",
     "named": true,
     "fields": {
+      "body": {
+        "multiple": false,
+        "required": true,
+        "types": [
+          {
+            "type": "_statement",
+            "named": true
+          }
+        ]
+      },
       "condition": {
         "multiple": false,
         "required": false,
@@ -2489,6 +2495,10 @@
           {
             "type": "_expression",
             "named": true
+          },
+          {
+            "type": "comma_expression",
+            "named": true
           }
         ]
       },
@@ -2524,16 +2534,6 @@
           }
         ]
       }
-    },
-    "children": {
-      "multiple": false,
-      "required": true,
-      "types": [
-        {
-          "type": "_statement",
-          "named": true
-        }
-      ]
     }
   },
   {
@@ -3749,10 +3749,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
@@ -3860,10 +3856,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
@@ -4060,10 +4052,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
@@ -4196,10 +4184,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true
@@ -5040,10 +5024,6 @@
           "type": "alone_macro_call",
           "named": true
         },
-        {
-          "type": "attributed_statement",
-          "named": true
-        },
         {
           "type": "declaration",
           "named": true

tree-sitter-mozcpp/src/tree_sitter/parser.h

@@ -123,6 +123,7 @@ struct TSLanguage {
     unsigned (*serialize)(void *, char *);
     void (*deserialize)(void *, const char *, unsigned);
   } external_scanner;
+  const TSStateId *primary_state_ids;
 };
 
 /*