Make the tree structure more explicit in parse dumps (#7591)

It's hard to track 2-space indent levels across large vertical gaps, and
it can be hard to suppress the instinct to read the dump as if it were
preorder. This change introduces a new dump mode that addresses both
problems by using box-drawing characters to explicitly represent the
parent-child edges of the tree. This new mode is the default, but the
old behavior remains available with
`--parse-dump-format=yaml-postorder`.
This commit is contained in:
Geoff Romer
2026-07-31 16:44:18 +00:00
committed by GitHub
parent 2c91e5f5de
commit 6429c1655c
343 changed files with 11839 additions and 12185 deletions
+48 -49
View File
@@ -16,52 +16,51 @@ fn F() -> i32 {
}
// CHECK:STDOUT: - filename: pointer_value.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
// CHECK:STDOUT: {kind: 'IdentifierNameMaybeBeforeSignature', text: 'F'},
// CHECK:STDOUT: {kind: 'ExplicitParamListStart', text: '('},
// CHECK:STDOUT: {kind: 'ExplicitParamList', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 7},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'n'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 4},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'IntLiteral', text: '0'},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 9},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'p'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'PostfixOperatorStar', text: '*', subtree_size: 2},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 6},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'IdentifierNameExpr', text: 'n'},
// CHECK:STDOUT: {kind: 'PrefixOperatorAmp', text: '&', subtree_size: 2},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 11},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'q'},
// CHECK:STDOUT: {kind: 'BindingPatternTypeStart', text: ':'},
// CHECK:STDOUT: {kind: 'IntTypeLiteral', text: 'i32'},
// CHECK:STDOUT: {kind: 'PostfixOperatorStar', text: '*', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PostfixOperatorStar', text: '*', subtree_size: 3},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':', subtree_size: 6},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', subtree_size: 7},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '='},
// CHECK:STDOUT: {kind: 'IdentifierNameExpr', text: 'p'},
// CHECK:STDOUT: {kind: 'PrefixOperatorAmp', text: '&', subtree_size: 2},
// CHECK:STDOUT: {kind: 'VariableDecl', text: ';', subtree_size: 12},
// CHECK:STDOUT: {kind: 'ReturnStatementStart', text: 'return'},
// CHECK:STDOUT: {kind: 'IdentifierNameExpr', text: 'q'},
// CHECK:STDOUT: {kind: 'PrefixOperatorStar', text: '*', subtree_size: 2},
// CHECK:STDOUT: {kind: 'PrefixOperatorStar', text: '*', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ReturnStatement', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 45},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: ╭─FileStart ''
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'F'
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
// CHECK:STDOUT: │ │ ╭─IntTypeLiteral 'i32'
// CHECK:STDOUT: │ ├─ReturnType '->'
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '{'
// CHECK:STDOUT: │ │ ╭─VariableIntroducer 'var'
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'n'
// CHECK:STDOUT: │ │ │ ├─BindingPatternTypeStart ':'
// CHECK:STDOUT: │ │ │ ├─IntTypeLiteral 'i32'
// CHECK:STDOUT: │ │ │ ╭─VarBindingPattern ':'
// CHECK:STDOUT: │ │ ├─VariablePattern 'var'
// CHECK:STDOUT: │ │ ├─VariableInitializer '='
// CHECK:STDOUT: │ │ ├─IntLiteral '0'
// CHECK:STDOUT: │ ├─VariableDecl ';'
// CHECK:STDOUT: │ │ ╭─VariableIntroducer 'var'
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'p'
// CHECK:STDOUT: │ │ │ ├─BindingPatternTypeStart ':'
// CHECK:STDOUT: │ │ │ │ ╭─IntTypeLiteral 'i32'
// CHECK:STDOUT: │ │ │ ├─PostfixOperatorStar '*'
// CHECK:STDOUT: │ │ │ ╭─VarBindingPattern ':'
// CHECK:STDOUT: │ │ ├─VariablePattern 'var'
// CHECK:STDOUT: │ │ ├─VariableInitializer '='
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameExpr 'n'
// CHECK:STDOUT: │ │ ├─PrefixOperatorAmp '&'
// CHECK:STDOUT: │ ├─VariableDecl ';'
// CHECK:STDOUT: │ │ ╭─VariableIntroducer 'var'
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'q'
// CHECK:STDOUT: │ │ │ ├─BindingPatternTypeStart ':'
// CHECK:STDOUT: │ │ │ │ ╭─IntTypeLiteral 'i32'
// CHECK:STDOUT: │ │ │ │ ╭─PostfixOperatorStar '*'
// CHECK:STDOUT: │ │ │ ├─PostfixOperatorStar '*'
// CHECK:STDOUT: │ │ │ ╭─VarBindingPattern ':'
// CHECK:STDOUT: │ │ ├─VariablePattern 'var'
// CHECK:STDOUT: │ │ ├─VariableInitializer '='
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameExpr 'p'
// CHECK:STDOUT: │ │ ├─PrefixOperatorAmp '&'
// CHECK:STDOUT: │ ├─VariableDecl ';'
// CHECK:STDOUT: │ │ ╭─ReturnStatementStart 'return'
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameExpr 'q'
// CHECK:STDOUT: │ │ │ ╭─PrefixOperatorStar '*'
// CHECK:STDOUT: │ │ ├─PrefixOperatorStar '*'
// CHECK:STDOUT: │ ├─ReturnStatement ';'
// CHECK:STDOUT: ├─FunctionDefinition '}'
// CHECK:STDOUT: ├─FileEnd ''
// CHECK:STDOUT: (root)