mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-17 06:18:13 +00:00
Support for terse => function bodies (#7895)
Treat the function as having a `-> auto` return type. Reject calls to functions that still have a non-deduced `-> auto` return type, and rewrite the function to have the actual return type once it is known. Assisted-by: Gemini via Antigravity
This commit is contained in:
1 parent
d08805f1a6
commit
b766aa4d16
30 files changed
+1323
-322
No files matched your search
+18
-12
@@ -157,7 +157,7 @@ fn ComplexReturnForm() ->? X.Y(Z);
|
||||
|
||||
fn RefReturn() -> ref u32;
|
||||
fn ComplexRefReturn() -> ref X.Y(Z);
|
||||
let a: auto = fn -> ref u32 => 0;
|
||||
let a: auto = fn -> ref u32 { return 0; };
|
||||
|
||||
// --- fail_ref_return_missing_type.carbon
|
||||
|
||||
@@ -170,8 +170,8 @@ fn RefReturn() -> ref;
|
||||
fn ValReturn() -> val u32;
|
||||
fn VarReturn() -> var u32;
|
||||
fn ComplexValReturn() -> val X.Y(Z);
|
||||
let a: auto = fn -> val u32 => 0;
|
||||
let b: auto = fn -> var u32 => 0;
|
||||
let a: auto = fn -> val u32 { return 0; };
|
||||
let b: auto = fn -> var u32 { return 0; };
|
||||
|
||||
// --- fail_val_return_missing_type.carbon
|
||||
|
||||
@@ -534,9 +534,11 @@ fn ValReturn() -> val;
|
||||
// CHECK:STDOUT: │ │ │ ╭─UnsignedIntTypeLiteral 'u32'
|
||||
// CHECK:STDOUT: │ │ │ ╭─RefPrimitiveForm 'ref'
|
||||
// CHECK:STDOUT: │ │ ├─ReturnType '->'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ ├─Lambda 'fn'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '{'
|
||||
// CHECK:STDOUT: │ │ │ ╭─ReturnStatementStart 'return'
|
||||
// CHECK:STDOUT: │ │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ │ ├─ReturnStatement ';'
|
||||
// CHECK:STDOUT: │ ├─Lambda '}'
|
||||
// CHECK:STDOUT: ├─LetDecl ';'
|
||||
// CHECK:STDOUT: ├─FileEnd ''
|
||||
// CHECK:STDOUT: (root)
|
||||
@@ -593,9 +595,11 @@ fn ValReturn() -> val;
|
||||
// CHECK:STDOUT: │ │ │ ╭─UnsignedIntTypeLiteral 'u32'
|
||||
// CHECK:STDOUT: │ │ │ ╭─ValPrimitiveForm 'val'
|
||||
// CHECK:STDOUT: │ │ ├─ReturnType '->'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ ├─Lambda 'fn'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '{'
|
||||
// CHECK:STDOUT: │ │ │ ╭─ReturnStatementStart 'return'
|
||||
// CHECK:STDOUT: │ │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ │ ├─ReturnStatement ';'
|
||||
// CHECK:STDOUT: │ ├─Lambda '}'
|
||||
// CHECK:STDOUT: ├─LetDecl ';'
|
||||
// CHECK:STDOUT: │ ╭─LetIntroducer 'let'
|
||||
// CHECK:STDOUT: │ │ ╭─IdentifierNameNotBeforeSignature 'b'
|
||||
@@ -607,9 +611,11 @@ fn ValReturn() -> val;
|
||||
// CHECK:STDOUT: │ │ │ ╭─UnsignedIntTypeLiteral 'u32'
|
||||
// CHECK:STDOUT: │ │ │ ╭─VarPrimitiveForm 'var'
|
||||
// CHECK:STDOUT: │ │ ├─ReturnType '->'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ ├─Lambda 'fn'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '{'
|
||||
// CHECK:STDOUT: │ │ │ ╭─ReturnStatementStart 'return'
|
||||
// CHECK:STDOUT: │ │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ │ ├─ReturnStatement ';'
|
||||
// CHECK:STDOUT: │ ├─Lambda '}'
|
||||
// CHECK:STDOUT: ├─LetDecl ';'
|
||||
// CHECK:STDOUT: ├─FileEnd ''
|
||||
// CHECK:STDOUT: (root)
|
||||
|
||||
+2
-2
@@ -85,9 +85,9 @@ var b: auto = fn (x: i32 = 0) => x;
|
||||
// CHECK:STDOUT: │ │ │ │ ├─IntLiteral '0'
|
||||
// CHECK:STDOUT: │ │ │ ├─DefaultValuePattern '='
|
||||
// CHECK:STDOUT: │ │ ├─ExplicitParamList ')'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ │ ╭─LambdaTerseDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ │ ├─IdentifierNameExpr 'x'
|
||||
// CHECK:STDOUT: │ ├─Lambda 'fn'
|
||||
// CHECK:STDOUT: │ ├─LambdaTerseDefinition 'fn'
|
||||
// CHECK:STDOUT: ├─VariableDecl ';'
|
||||
// CHECK:STDOUT: ├─FileEnd ''
|
||||
// CHECK:STDOUT: (root)
|
||||
+1
-16
@@ -10,8 +10,6 @@
|
||||
|
||||
fn F(x: i32) => x;
|
||||
|
||||
fn G(x: i32) -> i32 => x;
|
||||
|
||||
// CHECK:STDOUT: - filename: terse.carbon
|
||||
// CHECK:STDOUT: ╭─FileStart ''
|
||||
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
||||
@@ -22,20 +20,7 @@ fn G(x: i32) -> i32 => x;
|
||||
// CHECK:STDOUT: │ │ │ ├─IntTypeLiteral 'i32'
|
||||
// CHECK:STDOUT: │ │ ├─LetBindingPattern ':'
|
||||
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
||||
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ ├─IdentifierNameExpr 'x'
|
||||
// CHECK:STDOUT: ├─FunctionTerseDefinition ';'
|
||||
// CHECK:STDOUT: │ ╭─FunctionIntroducer 'fn'
|
||||
// CHECK:STDOUT: │ ├─IdentifierNameMaybeBeforeSignature 'G'
|
||||
// CHECK:STDOUT: │ │ ╭─ExplicitParamListStart '('
|
||||
// CHECK:STDOUT: │ │ │ ╭─IdentifierNameNotBeforeSignature 'x'
|
||||
// CHECK:STDOUT: │ │ │ ├─BindingPatternTypeStart ':'
|
||||
// CHECK:STDOUT: │ │ │ ├─IntTypeLiteral 'i32'
|
||||
// CHECK:STDOUT: │ │ ├─LetBindingPattern ':'
|
||||
// CHECK:STDOUT: │ ├─ExplicitParamList ')'
|
||||
// CHECK:STDOUT: │ │ ╭─IntTypeLiteral 'i32'
|
||||
// CHECK:STDOUT: │ ├─ReturnType '->'
|
||||
// CHECK:STDOUT: │ ╭─FunctionDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ ╭─FunctionTerseDefinitionStart '=>'
|
||||
// CHECK:STDOUT: │ ├─IdentifierNameExpr 'x'
|
||||
// CHECK:STDOUT: ├─FunctionTerseDefinition ';'
|
||||
// CHECK:STDOUT: ├─FileEnd ''
|
||||
|
||||
Reference in new issue
Block a user