mirror of
https://github.com/carbon-language/carbon-lang.git
synced 2026-10-05 22:02:55 +01:00
Orient README around Print (#1409)
This commit is contained in:
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 280 KiB After Width: | Height: | Size: 271 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 278 KiB After Width: | Height: | Size: 278 KiB |
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 404 KiB After Width: | Height: | Size: 395 KiB |
@@ -56,7 +56,7 @@ struct Circle {
|
||||
float r;
|
||||
};
|
||||
|
||||
void WriteTotalArea(std::span<Circle> circles) {
|
||||
void PrintTotalArea(std::span<Circle> circles) {
|
||||
float area = 0;
|
||||
for (const Circle& c : circles) {
|
||||
area += M_PI * c.r * c.r;
|
||||
@@ -67,7 +67,7 @@ void WriteTotalArea(std::span<Circle> circles) {
|
||||
auto main(int argc, char** argv) -> int {
|
||||
std::vector<Circle> circles = {{1.0}, {2.0}};
|
||||
// Implicitly constructors `span` from `vector`.
|
||||
WriteTotalArea(circles);
|
||||
PrintTotalArea(circles);
|
||||
return 0;
|
||||
}
|
||||
```
|
||||
@@ -83,19 +83,19 @@ class Circle {
|
||||
var r: f32;
|
||||
}
|
||||
|
||||
fn WriteTotalArea(circles: Slice(Circle)) {
|
||||
fn PrintTotalArea(circles: Slice(Circle)) {
|
||||
var area: f32 = 0;
|
||||
for (c: Circle in circles) {
|
||||
area += Math.Pi * c.r * c.r;
|
||||
}
|
||||
Console.WriteLine("Total area: {0}", area);
|
||||
Print("Total area: {0}", area);
|
||||
}
|
||||
|
||||
fn Main() -> i32 {
|
||||
// A dynamically sized array, like `std::vector`.
|
||||
var circles: Array(Circle) = ({.r = 1.0}, {.r = 2.0});
|
||||
// Implicitly constructs `Slice` from `Array`.
|
||||
WriteTotalArea(circles);
|
||||
PrintTotalArea(circles);
|
||||
return 0;
|
||||
}
|
||||
```
|
||||
@@ -113,12 +113,12 @@ package Geometry api;
|
||||
import Cpp library "circle.h";
|
||||
import Math;
|
||||
|
||||
fn WriteTotalArea(circles: Slice(Cpp.Circle)) {
|
||||
fn PrintTotalArea(circles: Slice(Cpp.Circle)) {
|
||||
var area: f32 = 0;
|
||||
for (c: Cpp.Circle in circles) {
|
||||
area += Math.Pi * c.r * c.r;
|
||||
}
|
||||
Console.WriteLine("Total area: {0}", area);
|
||||
Print("Total area: {0}", area);
|
||||
}
|
||||
|
||||
// C++ calling Carbon:
|
||||
@@ -130,7 +130,7 @@ auto main(int argc, char** argv) -> int {
|
||||
std::vector<Circle> circles = {{1.0}, {2.0}};
|
||||
// Carbon's `Slice` supports implicit construction from `std::vector`,
|
||||
// similar to `std::span`.
|
||||
Geometry::WriteTotalArea(circles);
|
||||
Geometry::PrintTotalArea(circles);
|
||||
return 0;
|
||||
}
|
||||
```
|
||||
|
||||
Reference in New Issue
Block a user