carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 22:02:55 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Finish bracketing of parse nodes. (#2430)

Browse Source 
- Finishes remaining "todo" parse nodes.
- Improving error recovery for invalid designators and structs, so that the parse tree still looks similar to a valid parse tree.
- Call expressions now have the thing being called as a child (of the start) instead of a sibling.
- Use of Start is replacing use of End in several parse nodes, like structs and call expressions.
- Adjusting documentation of parse node structures in an attempt to make it more consistent and understandable.
- The current state for interfaces and if/else is mostly being documented, not altered.
This commit is contained in:
Jon Ross-Perkins
2022-11-30 09:14:07 -08:00
committed by GitHub
parent 46f4887cf7
commit 6bfd202f4e
18 changed files with 243 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/parser/testdata/basics/fail_invalid_designators.carbon
Vendored
+7 -5
View File
@@ -11,16 +11,18 @@
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
// CHECK:STDOUT: {kind: 'NameReference', text: 'a'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', has_error: yes, subtree_size: 2},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'DesignatedName', text: ';', has_error: yes},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', has_error: yes, subtree_size: 4},
// CHECK:STDOUT: {kind: 'NameReference', text: 'a'},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'fn', has_error: yes},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 4},
// CHECK:STDOUT: {kind: 'NameReference', text: 'a'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', has_error: yes, subtree_size: 2},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 16},
// CHECK:STDOUT: {kind: 'DesignatedName', text: '42', has_error: yes},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', has_error: yes, subtree_size: 4},
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 18},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parser/testdata/basics/fail_paren_match_regression.carbon
Vendored
+2 -2
View File
@@ -6,9 +6,9 @@
// RUN: %{not} %{carbon-run-parser}
// CHECK:STDOUT: [
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'NameReference', text: 'foo'},
// CHECK:STDOUT: {kind: 'ParenExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'ParenExpression', text: '(', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'ParenExpression', text: ')', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '=', subtree_size: 4},
// CHECK:STDOUT: {kind: 'VariableDeclaration', text: 'var', has_error: yes, subtree_size: 6},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
toolchain/parser/testdata/basics/function_call.carbon
Vendored
+17 -17
View File
@@ -10,24 +10,24 @@
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
// CHECK:STDOUT: {kind: 'NameReference', text: 'a'},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'b'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'a'},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'b'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'f'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 5},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 6},
// CHECK:STDOUT: {kind: 'NameReference', text: 'c'},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'd'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'f'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 5},
// CHECK:STDOUT: {kind: 'NameReference', text: 'c'},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'd'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 3},
// CHECK:STDOUT: {kind: 'CallExpressionComma', text: ','},
// CHECK:STDOUT: {kind: 'NameReference', text: 'e'},
// CHECK:STDOUT: {kind: 'ParenExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'ParenExpression', text: '(', subtree_size: 3},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 14},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'g'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 16},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 18},
// CHECK:STDOUT: {kind: 'CallExpressionComma', text: ','},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'NameReference', text: 'e'},
// CHECK:STDOUT: {kind: 'ParenExpression', text: ')', subtree_size: 3},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 14},
// CHECK:STDOUT: {kind: 'DesignatedName', text: 'g'},
// CHECK:STDOUT: {kind: 'DesignatorExpression', text: '.', subtree_size: 16},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 17},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 18},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 19},
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 25},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
toolchain/parser/testdata/basics/tuples.carbon
Vendored
+12 -12
View File
@@ -7,31 +7,31 @@
// CHECK:STDOUT: [
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'x'},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'Literal', text: 'i32'},
// CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'Literal', text: 'i32'},
// CHECK:STDOUT: {kind: 'TupleLiteralEnd', text: ')'},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: '(', subtree_size: 5},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 5},
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 7},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'Literal', text: '1'},
// CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'Literal', text: '2'},
// CHECK:STDOUT: {kind: 'TupleLiteralEnd', text: ')'},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: '(', subtree_size: 5},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 5},
// CHECK:STDOUT: {kind: 'VariableInitializer', text: '=', subtree_size: 6},
// CHECK:STDOUT: {kind: 'VariableDeclaration', text: ';', subtree_size: 15},
// CHECK:STDOUT: {kind: 'VariableIntroducer', text: 'var'},
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'y'},
// CHECK:STDOUT: {kind: 'TupleLiteralEnd', text: ')'},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'TupleLiteralEnd', text: ')'},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'TupleLiteralComma', text: ','},
// CHECK:STDOUT: {kind: 'TupleLiteralEnd', text: ')'},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'TupleLiteralEnd', text: ')'},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: '(', subtree_size: 10},
// CHECK:STDOUT: {kind: 'ParenExpressionOrTupleLiteralStart', text: '('},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'TupleLiteral', text: ')', subtree_size: 10},
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 12},
// CHECK:STDOUT: {kind: 'VariableDeclaration', text: ';', subtree_size: 14},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
toolchain/parser/testdata/for/fail_colon_instead_of_in.carbon
Vendored
+3 -3
View File
@@ -19,10 +19,10 @@
// CHECK:STDOUT: {kind: 'NameReference', text: 'y'},
// CHECK:STDOUT: {kind: 'ForHeader', text: ')', subtree_size: 8},
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'NameReference', text: 'x'},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 4},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'ForStatement', text: 'for', subtree_size: 16},
toolchain/parser/testdata/for/fail_missing_in.carbon
Vendored
+3 -3
View File
@@ -19,10 +19,10 @@
// CHECK:STDOUT: {kind: 'NameReference', text: 'y'},
// CHECK:STDOUT: {kind: 'ForHeader', text: ')', subtree_size: 8},
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'NameReference', text: 'x'},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 4},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'ForStatement', text: 'for', subtree_size: 16},
toolchain/parser/testdata/for/fail_missing_var.carbon
Vendored
+3 -3
View File
@@ -14,10 +14,10 @@
// CHECK:STDOUT: {kind: 'NameReference', text: 'y'},
// CHECK:STDOUT: {kind: 'ForHeader', text: ')', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'NameReference', text: 'x'},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 4},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'ForStatement', text: 'for', subtree_size: 11},
toolchain/parser/testdata/for/nested.carbon
Vendored
+3 -3
View File
@@ -28,10 +28,10 @@
// CHECK:STDOUT: {kind: 'NameReference', text: 'y'},
// CHECK:STDOUT: {kind: 'ForHeader', text: ')', subtree_size: 8},
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'NameReference', text: 'z'},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 4},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'ForStatement', text: 'for', subtree_size: 16},
toolchain/parser/testdata/for/simple.carbon
Vendored
+3 -3
View File
@@ -19,10 +19,10 @@
// CHECK:STDOUT: {kind: 'NameReference', text: 'y'},
// CHECK:STDOUT: {kind: 'ForHeader', text: ')', subtree_size: 8},
// CHECK:STDOUT: {kind: 'CodeBlockStart', text: '{'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'Print'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'NameReference', text: 'x'},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 4},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 5},
// CHECK:STDOUT: {kind: 'CodeBlock', text: '}', subtree_size: 7},
// CHECK:STDOUT: {kind: 'ForStatement', text: 'for', subtree_size: 16},
toolchain/parser/testdata/function/definition/with_params.carbon
Vendored
+3 -3
View File
@@ -17,14 +17,14 @@
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 9},
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 12},
// CHECK:STDOUT: {kind: 'NameReference', text: 'foo'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'foo'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'NameReference', text: 'baz'},
// CHECK:STDOUT: {kind: 'CallExpressionComma', text: ','},
// CHECK:STDOUT: {kind: 'NameReference', text: 'bar'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'baz'},
// CHECK:STDOUT: {kind: 'InfixOperator', text: '+', subtree_size: 3},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 8},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 8},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 9},
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 22},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
toolchain/parser/testdata/generics/interface/fail_missing_name.carbon
Vendored
+2 -1
View File
@@ -5,9 +5,10 @@
// AUTOUPDATE
// RUN: %{not} %{carbon-run-parser}
// CHECK:STDOUT: [
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'interface', has_error: yes},
// CHECK:STDOUT: {kind: 'InterfaceBodyStart', text: '{'},
// CHECK:STDOUT: {kind: 'InterfaceBody', text: '}', subtree_size: 2},
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: 'interface', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: 'interface', has_error: yes, subtree_size: 4},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
toolchain/parser/testdata/operators/fixity_in_call.carbon
Vendored
+3 -3
View File
@@ -10,15 +10,15 @@
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 2},
// CHECK:STDOUT: {kind: 'FunctionDefinitionStart', text: '{', subtree_size: 5},
// CHECK:STDOUT: {kind: 'NameReference', text: 'G'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'G'},
// CHECK:STDOUT: {kind: 'CallExpressionStart', text: '(', subtree_size: 2},
// CHECK:STDOUT: {kind: 'Literal', text: 'i32'},
// CHECK:STDOUT: {kind: 'PostfixOperator', text: '*', subtree_size: 2},
// CHECK:STDOUT: {kind: 'CallExpressionComma', text: ','},
// CHECK:STDOUT: {kind: 'NameReference', text: 'n'},
// CHECK:STDOUT: {kind: 'NameReference', text: 'n'},
// CHECK:STDOUT: {kind: 'InfixOperator', text: '*', subtree_size: 3},
// CHECK:STDOUT: {kind: 'CallExpressionEnd', text: ')'},
// CHECK:STDOUT: {kind: 'CallExpression', text: '(', subtree_size: 9},
// CHECK:STDOUT: {kind: 'CallExpression', text: ')', subtree_size: 9},
// CHECK:STDOUT: {kind: 'ExpressionStatement', text: ';', subtree_size: 10},
// CHECK:STDOUT: {kind: 'FunctionDefinition', text: '}', subtree_size: 16},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},