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

Fix IsConcreteType for generic classes and add IsType predicate. (#1204)

Browse Source 
* check that the return type is a type, add more implicit conversions

* update IsConcreteType for generic classes, add IsType predicate

* delete a comment

* trivial change

* move Witness wrt IsConcreteType and IsType

* added comments to tests

* update error line numbers
This commit is contained in:
Jeremy G. Siek
2022-04-25 16:25:22 -04:00
committed by GitHub
parent 0230ebdf38
commit adf1a85ee9
6 changed files with 174 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/testdata/basic_syntax/fail_var_type.carbon
Vendored
+19
View File
@@ -0,0 +1,19 @@
// 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
//
// RUN: %{not} %{executable_semantics} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{executable_semantics} %s
// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/basic_syntax/fail_var_type.carbon:17: Expected a type, but got 42
package ExecutableSemanticsTest api;
fn Main () -> i32
{
// 42 cannot be used as the type of a variable.
var x: 42 = 0;
return x;
}
executable_semantics/testdata/function/fail_parameter_type.carbon
Vendored
+21
View File
@@ -0,0 +1,21 @@
// 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
//
// RUN: %{not} %{executable_semantics} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{executable_semantics} %s
// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/function/fail_parameter_type.carbon:15: Expected a type, but got 42
package ExecutableSemanticsTest api;
// 42 cannot be used as the type of a parameter.
fn f(x: 42) -> i32 {
return x - 1;
}
fn Main() -> i32 {
return f(1);
}
executable_semantics/testdata/generic_class/fail_return_type_is_type.carbon
Vendored
+27
View File
@@ -0,0 +1,27 @@
// 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
//
// RUN: %{not} %{executable_semantics} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{executable_semantics} %s
// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/generic_class/fail_return_type_is_type.carbon:18: Expected a type, but got class Point
package ExecutableSemanticsTest api;
class Point(T:! Type) {
// The return type should be Point(T). Point by itself is not a type.
fn Create(x: T, y: T) -> Point {
return {.x = x, .y = y};
}
var x: T;
var y: T;
}
fn Main() -> i32 {
var p: Point(i32) = Point(i32).Create(0, 1);
return p.x;
}