[flang] Update printing values in dump-parse-tree

[kparzysz]

Remove 'if std::string' that is covered by another branch of the if-statement.
Add printing of 'bool' and 'int' values, since they have corresponding GetNodeName definitions.

[llvmbot]

@llvm/pr-subscribers-flang-openmp

@llvm/pr-subscribers-flang-parser

Author: Krzysztof Parzyszek (kparzysz)

Changes

Remove 'if std::string' that is covered by another branch of the if-statement.
Add printing of 'bool' and 'int' values, since they have corresponding GetNodeName definitions.

---

Full diff: https://github.com/llvm/llvm-project/pull/112709.diff

1 Files Affected:

• (modified) flang/include/flang/Parser/dump-parse-tree.h (+4-2)

diff --git a/flang/include/flang/Parser/dump-parse-tree.h b/flang/include/flang/Parser/dump-parse-tree.h
index 5d243b4e5d3e9a..ccbe5475d051e0 100644
--- a/flang/include/flang/Parser/dump-parse-tree.h
+++ b/flang/include/flang/Parser/dump-parse-tree.h
@@ -884,8 +884,10 @@ class ParseTreeDumper {
     } else if constexpr (HasSource<T>::value) {
       return x.source.ToString();
 #endif
-    } else if constexpr (std::is_same_v<T, std::string>) {
-      return x;
+    } else if constexpr (std::is_same_v<T, int>) {
+      return std::to_string(x);
+    } else if constexpr (std::is_same_v<T, bool>) {
+      return x ? "true" : "false";
     } else {
       return "";
     }

[kiranchandramohan]

Can we have a test since this patch is non-NFC?

[kparzysz]

There aren't really any tests for dumping the parse tree, except for OpenMP. The difference (at least for the int case) would show in a declaration like real, allocatable :: z(:). I can add an OpenMP testcase that has this declaration plus some OMP construct for the sake of being an OpenMP test... What do you think?

[kparzysz]

Source:

subroutine foo()
  real, allocatable :: z(:)
end

Tree before:

Program -> ProgramUnit -> SubroutineSubprogram
| SubroutineStmt
| | Name = 'foo'
| SpecificationPart
| | ImplicitPart ->
| | DeclarationConstruct -> SpecificationConstruct -> TypeDeclarationStmt
| | | DeclarationTypeSpec -> IntrinsicTypeSpec -> Real
| | | AttrSpec -> Allocatable
| | | EntityDecl
| | | | Name = 'z'
| | | | ArraySpec -> DeferredShapeSpecList -> int
| ExecutionPart -> Block
| EndSubroutineStmt ->

Tree after (compare the 3rd line from the bottom):

Program -> ProgramUnit -> SubroutineSubprogram
| SubroutineStmt
| | Name = 'foo'
| SpecificationPart
| | ImplicitPart ->
| | DeclarationConstruct -> SpecificationConstruct -> TypeDeclarationStmt
| | | DeclarationTypeSpec -> IntrinsicTypeSpec -> Real
| | | AttrSpec -> Allocatable
| | | EntityDecl
| | | | Name = 'z'
| | | | ArraySpec -> DeferredShapeSpecList -> int = '1'
| ExecutionPart -> Block
| EndSubroutineStmt ->

[kiranchandramohan]

I can add an OpenMP testcase that has this declaration plus some OMP construct for the sake of being an OpenMP test... What do you think?

If you can add a test that would be great. But no pressure.