carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-09-24 19:20:13 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Disallow :? within var (#6812)

Browse Source 
Co-authored-by: David Blaikie <dblaikie@gmail.com>
This commit is contained in:
Geoff Romer
2026-03-06 21:08:22 +00:00
committed by GitHub
co-authored by David Blaikie
parent 53729325a0
commit 2e155567bd
6 changed files with 35 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
toolchain/check/testdata/function/declaration/fail_todo_no_params.carbon
Vendored
+1 -1
View File
@@ -71,7 +71,7 @@ library "[[@TEST_NAME]]";
// CHECK:STDERR: var x:! () = ();
// CHECK:STDERR: ^~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_invalid_file_generic_regression_test.carbon:[[@LINE+4]]:12: error: `var` pattern cannot declare a compile-time binding [CompileTimeBindingInVarDecl]
// CHECK:STDERR: fail_invalid_file_generic_regression_test.carbon:[[@LINE+4]]:12: error: found `:!` pattern inside `var` pattern [NonRegularBindingInVarDecl]
// CHECK:STDERR: var x:! () = ();
// CHECK:STDERR: ^
// CHECK:STDERR:
toolchain/check/testdata/var/fail_generic.carbon
Vendored
+1 -1
View File
@@ -17,7 +17,7 @@ fn Main() {
// CHECK:STDERR: var x:! () = ();
// CHECK:STDERR: ^~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_generic.carbon:[[@LINE+4]]:14: error: `var` pattern cannot declare a compile-time binding [CompileTimeBindingInVarDecl]
// CHECK:STDERR: fail_generic.carbon:[[@LINE+4]]:14: error: found `:!` pattern inside `var` pattern [NonRegularBindingInVarDecl]
// CHECK:STDERR: var x:! () = ();
// CHECK:STDERR: ^
// CHECK:STDERR:
toolchain/check/testdata/var/var_pattern.carbon
Vendored
+2 -2
View File
@@ -98,7 +98,7 @@ fn f() {
// CHECK:STDERR: var T:! type;
// CHECK:STDERR: ^~~~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_compile_time.carbon:[[@LINE+4]]:15: error: `var` pattern cannot declare a compile-time binding [CompileTimeBindingInVarDecl]
// CHECK:STDERR: fail_compile_time.carbon:[[@LINE+4]]:15: error: found `:!` pattern inside `var` pattern [NonRegularBindingInVarDecl]
// CHECK:STDERR: var T:! type;
// CHECK:STDERR: ^
// CHECK:STDERR:
@@ -120,7 +120,7 @@ fn F[var u: ()]();
// CHECK:STDERR: fn G[var T:! type]();
// CHECK:STDERR: ^~~~~~~~
// CHECK:STDERR:
// CHECK:STDERR: fail_implicit.carbon:[[@LINE+4]]:18: error: `var` pattern cannot declare a compile-time binding [CompileTimeBindingInVarDecl]
// CHECK:STDERR: fail_implicit.carbon:[[@LINE+4]]:18: error: found `:!` pattern inside `var` pattern [NonRegularBindingInVarDecl]
// CHECK:STDERR: fn G[var T:! type]();
// CHECK:STDERR: ^
// CHECK:STDERR:
toolchain/diagnostics/kind.def
+1 -1
View File
@@ -434,7 +434,6 @@ CARBON_DIAGNOSTIC_KIND(CoreNameNotFound)
CARBON_DIAGNOSTIC_KIND(CoreNotFound)
CARBON_DIAGNOSTIC_KIND(DerefOfNonPointer)
CARBON_DIAGNOSTIC_KIND(DerefOfType)
CARBON_DIAGNOSTIC_KIND(CompileTimeBindingInVarDecl)
CARBON_DIAGNOSTIC_KIND(CompoundMemberAccessDoesNotUseBase)
CARBON_DIAGNOSTIC_KIND(EvalRequiresConstantValue)
CARBON_DIAGNOSTIC_KIND(FormExprEvaluationFailure)
@@ -466,6 +465,7 @@ CARBON_DIAGNOSTIC_KIND(IntWidthTooLarge)
CARBON_DIAGNOSTIC_KIND(InvalidArrayExpr)
CARBON_DIAGNOSTIC_KIND(NegativeIntInUnsignedType)
CARBON_DIAGNOSTIC_KIND(NonConstantCallToCompTimeOnlyFunction)
CARBON_DIAGNOSTIC_KIND(NonRegularBindingInVarDecl)
CARBON_DIAGNOSTIC_KIND(CompTimeOnlyFunctionHere)
CARBON_DIAGNOSTIC_KIND(SelfOutsideImplicitParamList)
CARBON_DIAGNOSTIC_KIND(StringAtIndexOutOfBounds)
toolchain/parse/handle_binding_pattern.cpp
+8 -5
View File
@@ -112,7 +112,7 @@ auto HandleBindingPattern(Context& context) -> void {
}
}
// Handles BindingPatternFinishAs(Generic|Regular).
// Handles BindingPatternFinishAs(Generic|Regular|Form).
static auto HandleBindingPatternFinish(Context& context, StateKind finish_kind)
-> void {
auto state = context.PopState();
@@ -120,10 +120,13 @@ static auto HandleBindingPatternFinish(Context& context, StateKind finish_kind)
auto node_kind = NodeKind::InvalidParse;
if (state.in_var_pattern) {
node_kind = NodeKind::VarBindingPattern;
if (finish_kind == StateKind::BindingPatternFinishAsGeneric) {
CARBON_DIAGNOSTIC(CompileTimeBindingInVarDecl, Error,
"`var` pattern cannot declare a compile-time binding");
context.emitter().Emit(*context.position(), CompileTimeBindingInVarDecl);
if (finish_kind != StateKind::BindingPatternFinishAsRegular) {
CARBON_DIAGNOSTIC(NonRegularBindingInVarDecl, Error,
"found {0:`:!`|`:?`} pattern inside `var` pattern",
Diagnostics::BoolAsSelect);
context.emitter().Emit(
*context.position(), NonRegularBindingInVarDecl,
finish_kind == StateKind::BindingPatternFinishAsGeneric);
state.has_error = true;
}
} else {
toolchain/parse/testdata/function/declaration.carbon
Vendored
+22
View File
@@ -175,6 +175,14 @@ fn ComplexFormParam(x:? X.Y(Z));
// CHECK:STDERR:
fn F(ref x:? Form);
// --- fail_form_within_var.carbon
// CHECK:STDERR: fail_form_within_var.carbon:[[@LINE+4]]:26: error: found `:?` pattern inside `var` pattern [NonRegularBindingInVarDecl]
// CHECK:STDERR: fn FormInVar(var x:? Form);
// CHECK:STDERR: ^
// CHECK:STDERR:
fn FormInVar(var x:? Form);
// --- return_form.carbon
fn SimpleReturnForm() ->? Form;
@@ -479,6 +487,20 @@ fn ComplexReturnForm() ->? X.Y(Z);
// CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 9},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: fail_form_within_var.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},
// CHECK:STDOUT: {kind: 'FunctionIntroducer', text: 'fn'},
// CHECK:STDOUT: {kind: 'IdentifierNameMaybeBeforeSignature', text: 'FormInVar'},
// CHECK:STDOUT: {kind: 'ExplicitParamListStart', text: '('},
// CHECK:STDOUT: {kind: 'IdentifierNameNotBeforeSignature', text: 'x'},
// CHECK:STDOUT: {kind: 'IdentifierNameExpr', text: 'Form'},
// CHECK:STDOUT: {kind: 'VarBindingPattern', text: ':?', has_error: yes, subtree_size: 3},
// CHECK:STDOUT: {kind: 'VariablePattern', text: 'var', has_error: yes, subtree_size: 4},
// CHECK:STDOUT: {kind: 'ExplicitParamList', text: ')', has_error: yes, subtree_size: 6},
// CHECK:STDOUT: {kind: 'FunctionDecl', text: ';', subtree_size: 9},
// CHECK:STDOUT: {kind: 'FileEnd', text: ''},
// CHECK:STDOUT: ]
// CHECK:STDOUT: - filename: return_form.carbon
// CHECK:STDOUT: parse_tree: [
// CHECK:STDOUT: {kind: 'FileStart', text: ''},