mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-09-24 19:50:14 +01:00
Chandler Carruth
8be274cf60
Implement the toolchain side of proposal #7254, removing the `:!` binding syntax for generic and template parameters in favor of the keywords `generic`, `template`, and `runtime` plus contextual defaults for phase. For valid programs this is semantics-preserving: each binding resolves to the same phase, and produces the same SemIR, as it did under `:!`/`:`. The parser derives a binding's phase from its syntactic context plus any explicit phase keyword; new diagnostics and error recovery for misused keywords are described below. Implementation details for each component: - Lexer: remove the `:!` (`ColonExclaim`) token, move its virtual parse-node budget onto `:`, and add the `generic` and `runtime` keywords. - Parser: thread a `BindingContext` (`ExplicitParam`, `DeducedParam`, or `CompileTimeEntityParam`) from declaration introducers down through parameter lists to each binding pattern, using a one-token lookahead to distinguish a name-qualifier parameter list from a declaration's own final list. Parameters of a compile-time entity (`class`, `interface`, `constraint`, `choice`, `alias`, `export`, `namespace`) and deduced `[]` parameters default to checked generic; explicit function parameters and local bindings default to runtime. `HandleBindingPattern` resolves the phase from that context plus the keyword: a `generic` keyword needs no node of its own (the phase is carried by the binding's node kind), while a `runtime` keyword is preserved as a `RuntimeBindingName` node so `check` can name it in a diagnostic. A phase keyword that is merely redundant with the contextual default is diagnosed here, without invalidating the parse tree. - Check: a phase keyword that is invalid for its context (for example `runtime` on a checked-generic parameter) is diagnosed here, and recovers by building an error binding that still introduces the name so that later uses of it do not produce cascading errors. The removed `:!` syntax is now rejected as an ordinary parse error. The `form`/`:?`/`->?` ("extended types") portion of proposal #7254 is left for a separate change. Assisted-by: Claude Code
184 lines
7.1 KiB
Plaintext
184 lines
7.1 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
|
|
//
|
|
// INCLUDE-FILE: toolchain/testing/testdata/min_prelude/primitives.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/builtins/int/sadd.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/builtins/int/sadd.carbon
|
|
|
|
// --- i32.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Add(a: i32, b: i32) -> i32 = "int.sadd";
|
|
|
|
class Expect(N: i32) {}
|
|
fn Test(generic N: i32) -> Expect(N) { return {}; }
|
|
|
|
fn F() {
|
|
Test(Add(0, 0)) as Expect(0);
|
|
Test(Add(1, 2)) as Expect(3);
|
|
Test(Add(0x7FFF_FFFE, 1)) as Expect(0x7FFF_FFFF);
|
|
}
|
|
|
|
fn RuntimeCallIsValid(a: i32, b: i32) -> i32 {
|
|
//@dump-sem-ir-begin
|
|
return Add(a, b);
|
|
//@dump-sem-ir-end
|
|
}
|
|
|
|
// --- literal.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Add(a: Core.IntLiteral, b: Core.IntLiteral) -> Core.IntLiteral = "int.sadd";
|
|
|
|
class Expect(N: Core.IntLiteral) {}
|
|
fn Test(generic N: Core.IntLiteral) -> Expect(N) { return {}; }
|
|
|
|
fn F() {
|
|
Test(Add(0, 0)) as Expect(0);
|
|
Test(Add(1, 2)) as Expect(3);
|
|
|
|
// Test some cases that might -- but shouldn't -- overflow.
|
|
Test(Add(0x7FFF_FFFE, 1)) as Expect(0x7FFF_FFFF);
|
|
Test(Add(0x7FFF_FFFF, 1)) as Expect(0x8000_0000);
|
|
Test(Add(0x7FFF_FFFF_FFFF_FFFF, 1)) as Expect(0x8000_0000_0000_0000);
|
|
Test(Add(0xFFFF_FFFF_FFFF_FFFF, 1)) as Expect(0x1_0000_0000_0000_0000);
|
|
Test(Add(-0x8000_0000_0000_0000, -1)) as Expect(-0x8000_0000_0000_0001);
|
|
Test(Add(-0x8000_0000_0000_0000, -0x8000_0000_0000_0000)) as Expect(-0x1_0000_0000_0000_0000);
|
|
}
|
|
|
|
// --- fail_too_few.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// CHECK:STDERR: fail_too_few.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn TooFew(a: i32) -> i32 = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn TooFew(a: i32) -> i32 = "int.sadd";
|
|
|
|
// CHECK:STDERR: fail_too_few.carbon:[[@LINE+4]]:26: error: name `TooMany` not found [NameNotFound]
|
|
// CHECK:STDERR: var too_many: array(i32, TooMany(1, 2, 3));
|
|
// CHECK:STDERR: ^~~~~~~
|
|
// CHECK:STDERR:
|
|
var too_many: array(i32, TooMany(1, 2, 3));
|
|
|
|
fn RuntimeCallIsValidTooFew(a: i32) -> i32 {
|
|
return TooFew(a);
|
|
}
|
|
|
|
// --- fail_too_many.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// CHECK:STDERR: fail_too_many.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn TooMany(a: i32, b: i32, c: i32) -> i32 = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn TooMany(a: i32, b: i32, c: i32) -> i32 = "int.sadd";
|
|
|
|
// CHECK:STDERR: fail_too_many.carbon:[[@LINE+4]]:33: error: name `BadReturnType` not found [NameNotFound]
|
|
// CHECK:STDERR: var bad_return_type: array(i32, BadReturnType(1, 2));
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
var bad_return_type: array(i32, BadReturnType(1, 2));
|
|
|
|
fn RuntimeCallIsValidTooMany(a: i32, b: i32, c: i32) -> i32 {
|
|
return TooMany(a, b, c);
|
|
}
|
|
|
|
// --- fail_bad_return_type.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// CHECK:STDERR: fail_bad_return_type.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn BadReturnType(a: i32, b: i32) -> bool = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn BadReturnType(a: i32, b: i32) -> bool = "int.sadd";
|
|
|
|
// CHECK:STDERR: fail_bad_return_type.carbon:[[@LINE+4]]:25: error: name `TooFew` not found [NameNotFound]
|
|
// CHECK:STDERR: var too_few: array(i32, TooFew(1));
|
|
// CHECK:STDERR: ^~~~~~
|
|
// CHECK:STDERR:
|
|
var too_few: array(i32, TooFew(1));
|
|
|
|
fn RuntimeCallIsValidBadReturnType(a: i32, b: i32) -> bool {
|
|
return BadReturnType(a, b);
|
|
}
|
|
|
|
// --- fail_bad_call.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// CHECK:STDERR: fail_bad_call.carbon:[[@LINE+4]]:26: error: name `JustRight` not found [NameNotFound]
|
|
// CHECK:STDERR: var bad_call: array(i32, JustRight(1, 2, 3));
|
|
// CHECK:STDERR: ^~~~~~~~~
|
|
// CHECK:STDERR:
|
|
var bad_call: array(i32, JustRight(1, 2, 3));
|
|
|
|
// --- fail_mixed_add.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
// CHECK:STDERR: fail_mixed_add.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn MixedAdd1(a: i32, b: Core.IntLiteral) -> i32 = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn MixedAdd1(a: i32, b: Core.IntLiteral) -> i32 = "int.sadd";
|
|
// CHECK:STDERR: fail_mixed_add.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn MixedAdd2(a: Core.IntLiteral, b: i32) -> i32 = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn MixedAdd2(a: Core.IntLiteral, b: i32) -> i32 = "int.sadd";
|
|
// CHECK:STDERR: fail_mixed_add.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn MixedAdd3(a: i32, b: Core.IntLiteral) -> Core.IntLiteral = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn MixedAdd3(a: i32, b: Core.IntLiteral) -> Core.IntLiteral = "int.sadd";
|
|
// CHECK:STDERR: fail_mixed_add.carbon:[[@LINE+4]]:1: error: invalid signature for builtin function "int.sadd" [InvalidBuiltinSignature]
|
|
// CHECK:STDERR: fn MixedAdd4(a: Core.IntLiteral, b: i32) -> Core.IntLiteral = "int.sadd";
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
fn MixedAdd4(a: Core.IntLiteral, b: i32) -> Core.IntLiteral = "int.sadd";
|
|
|
|
// --- fail_overflow.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
fn Add(a: i32, b: i32) -> i32 = "int.sadd";
|
|
|
|
let a: i32 = Add(0x7FFFFFFF, 0);
|
|
// CHECK:STDERR: fail_overflow.carbon:[[@LINE+4]]:14: error: integer overflow in calculation `2147483647 + 1` [CompileTimeIntegerOverflow]
|
|
// CHECK:STDERR: let b: i32 = Add(0x7FFFFFFF, 1);
|
|
// CHECK:STDERR: ^~~~~~~~~~~~~~~~~~
|
|
// CHECK:STDERR:
|
|
let b: i32 = Add(0x7FFFFFFF, 1);
|
|
|
|
// CHECK:STDOUT: --- i32.carbon
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: constants {
|
|
// CHECK:STDOUT: %int_32: Core.IntLiteral = int_value 32 [concrete]
|
|
// CHECK:STDOUT: %i32: type = class_type @Int, @Int(%int_32) [concrete]
|
|
// CHECK:STDOUT: %Add.type: type = fn_type @Add [concrete]
|
|
// CHECK:STDOUT: %Add: %Add.type = struct_value () [concrete]
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: fn @RuntimeCallIsValid(%a.param: %i32, %b.param: %i32) -> out %return.param: %i32 {
|
|
// CHECK:STDOUT: !entry:
|
|
// CHECK:STDOUT: %Add.ref: %Add.type = name_ref Add, file.%Add.decl [concrete = constants.%Add]
|
|
// CHECK:STDOUT: %a.ref: %i32 = name_ref a, %a
|
|
// CHECK:STDOUT: %b.ref: %i32 = name_ref b, %b
|
|
// CHECK:STDOUT: %Add.call: init %i32 = call %Add.ref(%a.ref, %b.ref)
|
|
// CHECK:STDOUT: return %Add.call
|
|
// CHECK:STDOUT:
|
|
// CHECK:STDOUT: !observes:
|
|
// CHECK:STDOUT: }
|
|
// CHECK:STDOUT:
|