From 31c3953a5fe6d8b4a5643dca5ba408eac2dba2a1 Mon Sep 17 00:00:00 2001 From: Jon Ross-Perkins Date: Tue, 19 Jul 2022 06:17:46 -0400 Subject: [PATCH] Orient README around Print (#1409) --- docs/images/carbon_snippet.svg | 2 +- docs/images/cpp_snippet.svg | 2 +- docs/images/mixed_snippet.svg | 2 +- docs/images/snippets.md | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/images/carbon_snippet.svg b/docs/images/carbon_snippet.svg index 80c089c7682b..45f4c347431f 100644 --- a/docs/images/carbon_snippet.svg +++ b/docs/images/carbon_snippet.svg @@ -1 +1 @@ - + diff --git a/docs/images/cpp_snippet.svg b/docs/images/cpp_snippet.svg index 26226fc2f560..05eb6ceb10c7 100644 --- a/docs/images/cpp_snippet.svg +++ b/docs/images/cpp_snippet.svg @@ -1 +1 @@ - + diff --git a/docs/images/mixed_snippet.svg b/docs/images/mixed_snippet.svg index a04bf63ab106..2931df2c15ba 100644 --- a/docs/images/mixed_snippet.svg +++ b/docs/images/mixed_snippet.svg @@ -1 +1 @@ - + diff --git a/docs/images/snippets.md b/docs/images/snippets.md index 513616d54da5..b52594c08c4d 100644 --- a/docs/images/snippets.md +++ b/docs/images/snippets.md @@ -56,7 +56,7 @@ struct Circle { float r; }; -void WriteTotalArea(std::span circles) { +void PrintTotalArea(std::span circles) { float area = 0; for (const Circle& c : circles) { area += M_PI * c.r * c.r; @@ -67,7 +67,7 @@ void WriteTotalArea(std::span circles) { auto main(int argc, char** argv) -> int { std::vector 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 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; } ```