mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-01 06:44:58 +01:00
Jon Ross-Perkins
4083d7f5b9
The comments in parse_node_kind.def capture the change being made here. Before: ``` // _external_: DeclaredName // InterfaceBodyStart // _external_: statements // InterfaceBodyEnd // InterfaceDefinition ``` After: ``` // InterfaceIntroducer // DeclaredName // InterfaceDefinitionStart // _external_: declarations // InterfaceDefinition ``` Really I just want to treat introduced things consistently. `var` defines my philosophy here: it doesn't always have a `DeclaredName`, so the `VarIntroducer` _must_ be the bounding node. By being consistent with that, I believe that overall the structure becomes easier to understand (that is, there are fewer inconsistencies to understand). This also adds InterfaceDeclaration, since I think it can be predicted we'll have that, and it's helpful for making recover consistent with HandleDeclarationError. Similarly, I'm also trying to standardize the loop processing a little with HandleDeclarationLoop. In the current approach, InterfaceDefinitionFinish isn't a necessary state, so I'm removing it.
79 lines
4.5 KiB
Plaintext
79 lines
4.5 KiB
Plaintext
// Part of the Carbon Language project, under the Apache License v2.0 with LLVM
|
|
// Exceptions. See /LICENSE for license information.
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
|
//
|
|
// AUTOUPDATE
|
|
// RUN: %{not} %{carbon-run-parser}
|
|
// CHECK:STDOUT: [
|
|
// CHECK:STDOUT: {kind: 'InterfaceIntroducer', text: 'interface'},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'Foo'},
|
|
// CHECK:STDOUT: {kind: 'InterfaceDefinitionStart', text: '{', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'Add'},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDeclaration', text: ';', subtree_size: 10},
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'Sub'},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterListStart', text: '['},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterList', text: ']', has_error: yes, subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDeclaration', text: ';', subtree_size: 12},
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'Mul'},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterListStart', text: '['},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterList', text: ']', has_error: yes, subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDeclaration', text: ';', subtree_size: 12},
|
|
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'Rem'},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterListStart', text: '['},
|
|
// CHECK:STDOUT: {kind: 'DeducedParameterList', text: ']', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'ParameterListStart', text: '('},
|
|
// CHECK:STDOUT: {kind: 'DeclaredName', text: 'b'},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'PatternBinding', text: ':', subtree_size: 3},
|
|
// CHECK:STDOUT: {kind: 'ParameterList', text: ')', subtree_size: 5},
|
|
// CHECK:STDOUT: {kind: 'SelfType', text: 'Self'},
|
|
// CHECK:STDOUT: {kind: 'ReturnType', text: '->', subtree_size: 2},
|
|
// CHECK:STDOUT: {kind: 'FunctionDeclaration', text: ';', subtree_size: 12},
|
|
// CHECK:STDOUT: {kind: 'InterfaceDefinition', text: '}', subtree_size: 50},
|
|
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
|
|
// CHECK:STDOUT: ]
|
|
interface Foo {
|
|
fn Add(b: Self) -> Self;
|
|
|
|
// CHECK:STDERR: {{.*}}/toolchain/parser/testdata/generics/interface/fail_self_param_syntax.carbon:[[@LINE+1]]:10: Deduced parameters must be of the form: `<name>: <Type>` or `addr <name>: <Type>`.
|
|
fn Sub[me Self](b: Self) -> Self;
|
|
|
|
// CHECK:STDERR: {{.*}}/toolchain/parser/testdata/generics/interface/fail_self_param_syntax.carbon:[[@LINE+1]]:10: Deduced parameters must be of the form: `<name>: <Type>` or `addr <name>: <Type>`.
|
|
fn Mul[Self](b: Self) -> Self;
|
|
|
|
// TODO: The recovery token is currently inserted after the `;`:
|
|
// ```
|
|
// fn Div[me: Self(b: Self) -> Self;]
|
|
// ```
|
|
// Fix and uncomment this to test error handling.
|
|
// fn Div[me: Self(b: Self) -> Self;
|
|
|
|
// It is fine to have an empty deduced parameter list.
|
|
fn Rem[](b: Self) -> Self;
|
|
}
|