[PATCH] D76922: [Syntax] Remove delayed folding from tree building.

Marcel Hlopko via Phabricator via cfe-commits cfe-commits at lists.llvm.org
Fri Mar 27 07:03:22 PDT 2020


hlopko created this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.
hlopko updated this revision to Diff 253108.
hlopko added a comment.
hlopko edited the summary of this revision.

Reformat


This patch removes delayed folding and replaces it with forward peeking.

Delayed folding was previously used as a solution to the problem that
declaration doesn't have a representation in the AST. For example following
code:

  int a,b;

is expressed in the AST as:

  TranslationUnitDecl
  |-...
  |-VarDecl `int a`
  `-VarDecl `int b`

And in the syntax tree we need:

  *: TranslationUnit
  `-SimpleDeclaration
    |-int
    |-SimpleDeclarator
    | `-a
    |-,
    |-SimpleDeclarator
    | `-b
    |-;

So in words, we need to create SimpleDeclaration to be a parent of
SimpleDeclarator nodes. Previously we used delayed folding to make sure SimpleDeclarations will be
eventually created. And in case multiple declarators requested declaration
creation, declaration range was extended to cover all declarators.

This design started to be hard to reason about, so we decided to replace it with
forward peeking. The last declarator node in the chain is responsible for creating
SimpleDeclaration for the whole chain. Range of the declaration corresponds to
the source range of the declarator node. Declarator decides whether its the last
one by peeking to the next AST node (see `isResponsibleForCreatingDeclaration`).

This patch does following:

- Removed delayed folding logic
- Tweaks Token.dumpForTests
- Moves getQualifiedNameStart inside BuildTreeVisitor
- Extracts BuildTreeVisitor.ProcessDeclaratorAndDeclaration
- Renames Builder.getDeclRange to Builder.getDeclarationRange and uses the method in all places.
- Adds a bunch of tests


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D76922

Files:
  clang/lib/Tooling/Syntax/BuildTree.cpp
  clang/lib/Tooling/Syntax/Tokens.cpp
  clang/unittests/Tooling/Syntax/TreeTest.cpp

-------------- next part --------------
A non-text attachment was scrubbed...
Name: D76922.253108.patch
Type: text/x-patch
Size: 23279 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20200327/2aac9348/attachment-0001.bin>


More information about the cfe-commits mailing list