Parameterized impl declarations (#1189)

* parameterized impls, first step

* bug fixes, comments, etc.

* added another test case, fix a bug in impl lookup

* simplify tests, removing tuple stuff

* don't create impl bindings for -bound implicit parameters

* remove a redundant 'private'

* CamelCase

* add missing backtick

* add a comment
This commit is contained in:
Jeremy G. Siek
2022-04-20 10:18:01 -04:00
committed by GitHub
parent 958fb8e529
commit b784458aef
20 changed files with 893 additions and 386 deletions
@@ -0,0 +1,52 @@
// 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/impl/fail_ambiguous_impl.carbon:50: ambiguous implementations of interface Vector for class Point
package ExecutableSemanticsTest api;
interface Vector {
fn Add[me: Self](b: Self) -> Self;
fn Scale[me: Self](v: i32) -> Self;
}
class Point {
var x: i32;
var y: i32;
}
external impl Point as Vector {
fn Add[me: Point](b: Point) -> Point {
return {.x = me.x + b.x, .y = me.y + b.y};
}
fn Scale[me: Point](v: i32) -> Point {
return {.x = me.x * v, .y = me.y * v};
}
}
external impl Point as Vector {
fn Add[me: Point](b: Point) -> Point {
return {.x = me.x + b.x, .y = me.y + b.y};
}
fn Scale[me: Point](v: i32) -> Point {
return {.x = me.x * v, .y = me.y * v};
}
}
fn AddAndScaleGeneric[T:! Vector](a: T, b: T, s: i32) -> T {
return a.Add(b).Scale(s);
}
fn Main() -> i32 {
var a: Point = {.x = 1, .y = 1};
var b: Point = {.x = 2, .y = 3};
var p: Point = AddAndScaleGeneric(a, b, 5);
return p.x - 15;
}
+48
View File
@@ -0,0 +1,48 @@
// 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: %{executable_semantics} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{executable_semantics} %s
// CHECK: result: 0
package ExecutableSemanticsTest api;
interface Number {
fn Zero() -> Self;
fn Add[me: Self](other: Self) -> Self;
}
class Point(T:! Number) {
var x: T;
var y: T;
}
external impl i32 as Number {
fn Zero() -> i32 { return 0; }
fn Add[me: i32](other: i32) -> i32 { return me + other; }
}
external impl forall [U:! Number] Point(U) as Number {
fn Zero() -> Point(U) { return {.x = U.Zero(), .y = U.Zero() }; }
fn Add[me: Point(U)](other: Point(U)) -> Point(U) {
return {.x = me.x.Add(other.x), .y = me.y.Add(other.y)};
}
}
fn Sum[E:! Number](x: E, y: E) -> E {
var total: E = E.Zero();
total = total.Add(x);
total = total.Add(y);
return total;
}
fn Main() -> i32 {
var p: Point(i32) = {.x = 1, .y = 2};
var q: Point(i32) = {.x = 4, .y = 3};
var r: Point(i32) = Sum(p, q);
return r.x - r.y;
}
+52
View File
@@ -0,0 +1,52 @@
// 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: %{executable_semantics} %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes=false %s
// RUN: %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
// RUN: %{FileCheck} --match-full-lines --allow-unused-prefixes %s
// AUTOUPDATE: %{executable_semantics} %s
// CHECK: result: 0
package ExecutableSemanticsTest api;
interface Number {
fn Zero() -> Self;
fn Add[me: Self](other: Self) -> Self;
}
class Point(T:! Number) {
var x: T;
var y: T;
}
external impl i32 as Number {
fn Zero() -> i32 { return 0; }
fn Add[me: i32](other: i32) -> i32 { return me + other; }
}
external impl forall [U:! Number] Point(U) as Number {
fn Zero() -> Point(U) { return {.x = U.Zero(), .y = U.Zero() }; }
fn Add[me: Point(U)](other: Point(U)) -> Point(U) {
return {.x = me.x.Add(other.x), .y = me.y.Add(other.y)};
}
}
fn Sum[E:! Number](x: E, y: E) -> E {
var total: E = E.Zero();
total = total.Add(x);
total = total.Add(y);
return total;
}
fn SumPoints[E:! Number](p: Point(E), q: Point(E)) -> Point(E) {
return Sum(p, q);
}
fn Main() -> i32 {
var p: Point(i32) = {.x = 1, .y = 2};
var q: Point(i32) = {.x = 4, .y = 3};
var r: Point(i32) = SumPoints(p, q);
return r.x - r.y;
}