libSyntax: encapsulate members of a struct declaration into MemberDeclBlock. (#13193)

Author: nkcsgexi

lib/Parse/ParseDecl.cpp

@@ -2927,6 +2927,7 @@ void Parser::diagnoseConsecutiveIDs(StringRef First, SourceLoc FirstLoc,
 ParserStatus Parser::parseDeclItem(bool &PreviousHadSemi,
                                    Parser::ParseDeclOptions Options,
                                    llvm::function_ref<void(Decl*)> handler) {
+  SyntaxParsingContext DeclContext(SyntaxContext, SyntaxContextKind::Decl);
   if (Tok.is(tok::semi)) {
     // Consume ';' without preceding decl.
     diagnose(Tok, diag::unexpected_separator, ";")
@@ -2971,15 +2972,17 @@ bool Parser::parseDeclList(SourceLoc LBLoc, SourceLoc &RBLoc,
                            llvm::function_ref<void(Decl*)> handler) {
   ParserStatus Status;
   bool PreviousHadSemi = true;
-  while (Tok.isNot(tok::r_brace)) {
-    Status |= parseDeclItem(PreviousHadSemi, Options, handler);
-    if (Tok.isAny(tok::eof, tok::pound_endif, tok::pound_else,
-                  tok::pound_elseif)) {
-      IsInputIncomplete = true;
-      break;
+  {
+    SyntaxParsingContext ListContext(SyntaxContext, SyntaxKind::DeclList);
+    while (Tok.isNot(tok::r_brace)) {
+      Status |= parseDeclItem(PreviousHadSemi, Options, handler);
+      if (Tok.isAny(tok::eof, tok::pound_endif, tok::pound_else,
+                    tok::pound_elseif)) {
+        IsInputIncomplete = true;
+        break;
+      }
     }
   }
-
   parseMatchingToken(tok::r_brace, RBLoc, ErrorDiag, LBLoc);
 
   // If we found the closing brace, then the caller should not care if there
@@ -5384,7 +5387,8 @@ ParserResult<StructDecl> Parser::parseDeclStruct(ParseDeclOptions Flags,
   }
 
   SD->setGenericParams(GenericParams);
-
+  // Make the entities of the struct as a code block.
+  SyntaxParsingContext BlockContext(SyntaxContext, SyntaxKind::MemberDeclBlock);
   SourceLoc LBLoc, RBLoc;
   if (parseToken(tok::l_brace, LBLoc, diag::expected_lbrace_struct)) {
     LBLoc = PreviousLoc;

test/Syntax/Inputs/serialize_multiple_decls.json

@@ -63,29 +63,42 @@
                           "presence": "Present"
                         },
                         {
-                          "tokenKind": {
-                            "kind": "l_brace"
-                          },
-                          "leadingTrivia": [
+                          "kind": "MemberDeclBlock",
+                          "layout": [
+                            {
+                              "tokenKind": {
+                                "kind": "l_brace"
+                              },
+                              "leadingTrivia": [
 
-                          ],
-                          "trailingTrivia": [
+                              ],
+                              "trailingTrivia": [
 
-                          ],
-                          "presence": "Present"
-                        },
-                        {
-                          "tokenKind": {
-                            "kind": "r_brace"
-                          },
-                          "leadingTrivia": [
+                              ],
+                              "presence": "Present"
+                            },
                             {
-                              "kind": "Newline",
-                              "value": 1
-                            }
-                          ],
-                          "trailingTrivia": [
+                              "kind": "DeclList",
+                              "layout": [
 
+                              ],
+                              "presence": "Present"
+                            },
+                            {
+                              "tokenKind": {
+                                "kind": "r_brace"
+                              },
+                              "leadingTrivia": [
+                                {
+                                  "kind": "Newline",
+                                  "value": 1
+                                }
+                              ],
+                              "trailingTrivia": [
+
+                              ],
+                              "presence": "Present"
+                            }
                           ],
                           "presence": "Present"
                         }
@@ -148,29 +161,42 @@
                           "presence": "Present"
                         },
                         {
-                          "tokenKind": {
-                            "kind": "l_brace"
-                          },
-                          "leadingTrivia": [
+                          "kind": "MemberDeclBlock",
+                          "layout": [
+                            {
+                              "tokenKind": {
+                                "kind": "l_brace"
+                              },
+                              "leadingTrivia": [
 
-                          ],
-                          "trailingTrivia": [
+                              ],
+                              "trailingTrivia": [
 
-                          ],
-                          "presence": "Present"
-                        },
-                        {
-                          "tokenKind": {
-                            "kind": "r_brace"
-                          },
-                          "leadingTrivia": [
+                              ],
+                              "presence": "Present"
+                            },
                             {
-                              "kind": "Newline",
-                              "value": 1
-                            }
-                          ],
-                          "trailingTrivia": [
+                              "kind": "DeclList",
+                              "layout": [
 
+                              ],
+                              "presence": "Present"
+                            },
+                            {
+                              "tokenKind": {
+                                "kind": "r_brace"
+                              },
+                              "leadingTrivia": [
+                                {
+                                  "kind": "Newline",
+                                  "value": 1
+                                }
+                              ],
+                              "trailingTrivia": [
+
+                              ],
+                              "presence": "Present"
+                            }
                           ],
                           "presence": "Present"
                         }