mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-11-15 16:28:10 +00:00
Chandler Carruth
c608c35e12
There were a number of iterations on the design that weren't reflected in the initial port to the terminal rendering library. This PR tries to complete the rendering side of things to match the design we landed on: code-focused, with messages attached by lines to the code, and condensed as much as possible to avoid the vertical space. It also improves the styling to make things more visually distinguishable such as adding a `->` to the main error line, and making the underlines and connectors for it have a heavy weight (when the font supports that). Another major change is having multiple messages on a single line be drawn in source lexical order. This requires the connectors to cross without joining, but makes it easier to read the messages. This PR also has some refactorings to enable these improvements, and a _number_ of improvements to comment prose and terminology to try and avoid jargon and make things read more naturally. Sorry for the fact that Claude left a bunch of this mannerly language in comments despite my efforts, but I'm continuing to try and drive the prose towards something direct and simple to read. Some of the terminology improvements also needed to be made in the design doc and those have been made here. Note that I don't think this rendering is perfect or should be viewed as final. I'm happy to iterate on it further, and have a few adjustments in mind already, but would like to focus this on getting the _implementation_ of the current rendering design in place, and then we can make targeted changes or tweaks as needed. For example, I'm not yet fully happy with the rendering when messages are too long and we move them all the way to the left, but am leaving that for a follow-up. Assisted-by: Claude Code
204 lines
5.7 KiB
Plaintext
204 lines
5.7 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/convert.carbon
|
|
//
|
|
// AUTOUPDATE
|
|
// TIP: To test this file alone, run:
|
|
// TIP: bazel test //toolchain/testing:file_test --test_arg=--file_tests=toolchain/check/testdata/impl/eval_musteval.carbon
|
|
// TIP: To dump output, run:
|
|
// TIP: bazel run //toolchain/testing:file_test -- --dump_output --file_tests=toolchain/check/testdata/impl/eval_musteval.carbon
|
|
|
|
// --- interface.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
interface Runtime {
|
|
fn F(self) -> type;
|
|
}
|
|
|
|
interface Eval {
|
|
eval fn F(self) -> type;
|
|
}
|
|
|
|
interface MustEval {
|
|
musteval fn F(self) -> type;
|
|
}
|
|
|
|
// --- impl_runtime.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class A { adapt {}; }
|
|
|
|
impl A as Runtime {
|
|
fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
impl A as Eval {
|
|
// TODO: Consider rejecting this, as compile-time evaluation would always
|
|
// fail.
|
|
fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
impl A as MustEval {
|
|
// TODO: Consider rejecting this, as compile-time evaluation would always
|
|
// fail.
|
|
fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
fn Call() {
|
|
({} as A).(Runtime.F)();
|
|
({} as A).(Eval.F)();
|
|
({} as A).(MustEval.F)();
|
|
}
|
|
|
|
// --- fail_impl_runtime_eval.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class A { adapt {}; }
|
|
|
|
impl A as Runtime {
|
|
fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
impl A as Eval {
|
|
fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
impl A as MustEval {
|
|
fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
fn Call() {
|
|
// CHECK:STDERR: fail_impl_runtime_eval.carbon:[[@LINE+2]]:17-39: error: cannot evaluate type expression [TypeExprEvaluationFailure]
|
|
// CHECK:STDERR:
|
|
let unused t: ({} as A).(Runtime.F)() = {} as A;
|
|
// CHECK:STDERR: fail_impl_runtime_eval.carbon:[[@LINE+2]]:17-36: error: cannot evaluate type expression [TypeExprEvaluationFailure]
|
|
// CHECK:STDERR:
|
|
let unused u: ({} as A).(Eval.F)() = {} as A;
|
|
// CHECK:STDERR: fail_impl_runtime_eval.carbon:[[@LINE+2]]:17-40: error: cannot evaluate type expression [TypeExprEvaluationFailure]
|
|
// CHECK:STDERR:
|
|
let unused v: ({} as A).(MustEval.F)() = {} as A;
|
|
}
|
|
|
|
// --- impl_eval.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class A { adapt {}; }
|
|
|
|
impl A as Runtime {
|
|
eval fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
impl A as Eval {
|
|
eval fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
impl A as MustEval {
|
|
eval fn F(unused self) -> type { return A; }
|
|
}
|
|
|
|
fn Call() {
|
|
// TODO: Should we allow calling this at compile time? This is not allowed if
|
|
// we generate a thunk; see the next split for an example.
|
|
let unused t: ({} as A).(Runtime.F)() = {} as A;
|
|
let unused u: ({} as A).(Eval.F)() = {} as A;
|
|
let unused v: ({} as A).(MustEval.F)() = {} as A;
|
|
}
|
|
|
|
// --- fail_todo_impl_eval_from_runtime_thunk.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class B {}
|
|
|
|
class BView {}
|
|
impl B as Core.ImplicitAs(BView) {
|
|
fn Convert(unused self) -> BView { return {}; }
|
|
}
|
|
|
|
impl B as Runtime {
|
|
eval fn F(unused self: BView) -> type { return B; }
|
|
}
|
|
|
|
fn Call() {
|
|
// TODO: Should we allow calling this at compile time? This is allowed if we
|
|
// don't generate a thunk.
|
|
// CHECK:STDERR: fail_todo_impl_eval_from_runtime_thunk.carbon:[[@LINE+2]]:17-39: error: cannot evaluate type expression [TypeExprEvaluationFailure]
|
|
// CHECK:STDERR:
|
|
let unused t: ({} as B).(Runtime.F)() = {} as B;
|
|
}
|
|
|
|
// --- fail_impl_musteval.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class B { adapt {}; }
|
|
|
|
impl B as Runtime {
|
|
// CHECK:STDERR: fail_impl_musteval.carbon:[[@LINE+4]]:3-38: error: non-constant call to compile-time-only function [NonConstantCallToCompTimeOnlyFunction]
|
|
// CHECK:STDERR: fail_impl_musteval.carbon:[[@LINE+3]]:3-38: note: compile-time-only function declared here [CompTimeOnlyFunctionHere]
|
|
// CHECK:STDERR: interface.carbon:5:3-21: note: while building thunk to match the signature of this function [ThunkSignature]
|
|
// CHECK:STDERR:
|
|
musteval fn F(unused self) -> type { return B; }
|
|
}
|
|
|
|
impl B as Eval {
|
|
// CHECK:STDERR: fail_impl_musteval.carbon:[[@LINE+4]]:3-38: error: non-constant call to compile-time-only function [NonConstantCallToCompTimeOnlyFunction]
|
|
// CHECK:STDERR: fail_impl_musteval.carbon:[[@LINE+3]]:3-38: note: compile-time-only function declared here [CompTimeOnlyFunctionHere]
|
|
// CHECK:STDERR: interface.carbon:9:3-26: note: while building thunk to match the signature of this function [ThunkSignature]
|
|
// CHECK:STDERR:
|
|
musteval fn F(unused self) -> type { return B; }
|
|
}
|
|
|
|
// --- impl_musteval_from_musteval.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class B { adapt {}; }
|
|
|
|
impl B as MustEval {
|
|
musteval fn F(unused self) -> type { return B; }
|
|
}
|
|
|
|
fn Call() {
|
|
let unused t: ({} as B).(MustEval.F)() = {} as B;
|
|
}
|
|
|
|
// --- fail_todo_impl_musteval_from_musteval_thunk.carbon
|
|
|
|
library "[[@TEST_NAME]]";
|
|
|
|
import library "interface";
|
|
|
|
class B {}
|
|
|
|
class BView {}
|
|
impl B as Core.ImplicitAs(BView) {
|
|
fn Convert(unused self) -> BView { return {}; }
|
|
}
|
|
|
|
impl B as MustEval {
|
|
// CHECK:STDERR: fail_todo_impl_musteval_from_musteval_thunk.carbon:[[@LINE+4]]:3-45: error: non-constant call to compile-time-only function [NonConstantCallToCompTimeOnlyFunction]
|
|
// CHECK:STDERR: fail_todo_impl_musteval_from_musteval_thunk.carbon:[[@LINE+3]]:3-45: note: compile-time-only function declared here [CompTimeOnlyFunctionHere]
|
|
// CHECK:STDERR: interface.carbon:13:3-30: note: while building thunk to match the signature of this function [ThunkSignature]
|
|
// CHECK:STDERR:
|
|
musteval fn F(unused self: BView) -> type { return B; }
|
|
}
|