Rename main to Main for Carbon style consistency (#939)

Main() is more consistency with Carbon's naming guidelines. C# offers some precedent: https://docs.microsoft.com/en-us/dotnet/csharp/fundamentals/program-structure/main-command-line
This commit is contained in:
Jon Meow
2021-11-02 14:53:18 -07:00
committed by GitHub
parent 17be4adec6
commit 6d822ababb
126 changed files with 130 additions and 130 deletions
@@ -13,7 +13,7 @@ package ExecutableSemanticsTest api;
// Test that assignment performs a copy and does not create an alias.
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = -1;
{
var y: i32 = 0;
@@ -13,7 +13,7 @@ package ExecutableSemanticsTest api;
// Test that assignment performs a copy and does not create an alias.
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
var y: i32 = x;
x = 1;
+1 -1
View File
@@ -17,7 +17,7 @@ choice Ints {
Two(i32,i32)
}
fn main() -> i32 {
fn Main() -> i32 {
var x: auto = Ints.None();
var y: auto = Ints.One(42);
var n: auto = 0;
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
// error
x : i32;
return 1;
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main () -> i32
fn Main () -> i32
{
var x: i32 = 0;
return x;
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var _: auto = 1;
return 0;
}
+1 -1
View File
@@ -12,7 +12,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var s: auto = "Hello world!\n";
Print(s);
return 0;
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var t2: {.x: i32, .y: i32} = {.x = 2, .y = 5};
t2.y = 3;
return t2.y - t2.x - 1; // 3 - 2 - 1
+1 -1
View File
@@ -20,6 +20,6 @@ fn F(n: i32, p: i32*, q: i32***) -> i32* {
return **q;
}
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var (x: auto, y: auto) = (2, 3);
return y - x - 1;
}
+1 -1
View File
@@ -11,6 +11,6 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
+1 -1
View File
@@ -15,7 +15,7 @@ fn DoNothing() {
// Empty block
}
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
DoNothing();
return x;
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
{
var x: i32 = 1;
+1 -1
View File
@@ -16,7 +16,7 @@ class Point {
var y: i32;
}
fn main() -> i32 {
fn Main() -> i32 {
var p1: Point = {.x = 1, .y = 2};
var p2: auto = p1;
p2 = {.x = 3, .y = 2};
+1 -1
View File
@@ -16,7 +16,7 @@ class Point {
var y: i32;
}
fn main() -> i32 {
fn Main() -> i32 {
var p1: Point = {.x = 1, .y = 2};
var p2: auto = p1;
p2.x = 3;
@@ -16,7 +16,7 @@ class Point {
var y: i32;
}
fn main() -> i32 {
fn Main() -> i32 {
var p: Point = {.x = 1, .y = 2};
return p.z - 1;
}
@@ -16,7 +16,7 @@ class Point {
var y: i32;
}
fn main() -> i32 {
fn Main() -> i32 {
var p: Point = {.x = 1, .z = 2};
return p.x - 1;
}
@@ -16,7 +16,7 @@ class Point {
var y: i32;
}
fn main() -> i32 {
fn Main() -> i32 {
var p: Point = {.x = 1};
return p.x - 1;
}
+1 -1
View File
@@ -20,6 +20,6 @@ fn GetX(p: Point) -> i32 {
return p.x;
}
fn main() -> i32 {
fn Main() -> i32 {
return GetX({.x = 1, .y = 2}) - 1;
}
+1 -1
View File
@@ -18,6 +18,6 @@ class Point {
var p: Point = {.x = 1, .y = 2};
fn main() -> i32 {
fn Main() -> i32 {
return p.y - p.x - 1;
}
+1 -1
View File
@@ -20,6 +20,6 @@ fn MakePoint() -> Point {
return {.x = 1, .y = 2};
}
fn main() -> i32 {
fn Main() -> i32 {
return MakePoint().x - 1;
}
+1 -1
View File
@@ -16,7 +16,7 @@ class Point {
var y: i32;
}
fn main() -> i32 {
fn Main() -> i32 {
var p: Point = {.x = 1, .y = 2};
return p.y - p.x - 1;
}
@@ -13,7 +13,7 @@ package ExecutableSemanticsTest api;
// Test access to block-scoped variables upon resuming a continuation.
fn main() -> i32 {
fn Main() -> i32 {
var y: i32 = 0;
__continuation k {
var x: i32 = 0;
@@ -13,7 +13,7 @@ package ExecutableSemanticsTest api;
// Test that creating a continuation doesn't do anything.
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
__continuation k {
x = x + 1;
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
__continuation k x = 3;
__run k;
@@ -23,7 +23,7 @@ fn capture() -> __Continuation {
return k;
}
fn main() -> i32 {
fn Main() -> i32 {
var k: __Continuation = capture();
__run k; // error, lifetime of x is over
return 0;
@@ -27,7 +27,7 @@ fn CountUpTo(x: i32) -> i32 {
}
}
fn main() -> i32 {
fn Main() -> i32 {
__continuation k {
CountUpTo(5);
}
@@ -13,7 +13,7 @@ package ExecutableSemanticsTest api;
// Test creating and running a continuation.
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
__continuation k {
x = x + 1;
@@ -14,7 +14,7 @@ package ExecutableSemanticsTest api;
// Test pausing a continuation with `__await` and restarting it with
// `__run`.
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
__continuation k {
x = x + 1;
@@ -22,7 +22,7 @@ fn Foo() {
x = x + 2;
}
fn main() -> i32 {
fn Main() -> i32 {
__continuation k1 {
Foo();
}
@@ -13,6 +13,6 @@ package ExecutableSemanticsTest api;
fn add(x: i32, y: i32) -> auto { return x + y; }
fn main() -> i32 {
fn Main() -> i32 {
return add(1, 2) - 3;
}
@@ -20,6 +20,6 @@ fn Recurse(x: i32, do_recurse: Bool) -> auto {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return Recurse(1, true) - 3;
}
@@ -21,6 +21,6 @@ fn Add(x: i32, y: i32) -> auto {
}
}
fn main() -> i32 {
fn Main() -> i32 {
return Add(1, 2) - 3;
}
@@ -14,6 +14,6 @@ package ExecutableSemanticsTest api;
fn NoReturn() -> auto {
}
fn main() {
fn Main() {
NoReturn();
}
@@ -16,6 +16,6 @@ fn Add(x: i32, y: i32) -> auto;
fn Add(x: i32, y: i32) -> auto { return x + y; }
fn main() -> i32 {
fn Main() -> i32 {
return Add(1, 2) - 3;
}
@@ -19,6 +19,6 @@ fn f(x: Id(i32)) -> i32 {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return f(0);
}
@@ -15,6 +15,6 @@ fn Id(t: Type) -> auto { return t; }
// Test non-trivial type expression in return type.
fn main() -> Id(i32) {
fn Main() -> Id(i32) {
return 0;
}
@@ -15,7 +15,7 @@ fn Id(t: Type) -> auto { return t; }
// Test non-trivial type expression in variable declaration statement.
fn main() -> i32 {
fn Main() -> i32 {
var x: Id(i32) = 0;
return x;
}
+1 -1
View File
@@ -14,7 +14,7 @@ package ExecutableSemanticsTest api;
// Test empty parameters and return type
fn f() { }
fn main() -> i32 {
fn Main() -> i32 {
f();
return 0;
}
@@ -13,7 +13,7 @@ package ExecutableSemanticsTest api;
fn f(x: i32, y: i32) -> i32 { return x + y; }
fn main() -> i32 {
fn Main() -> i32 {
var xy: (i32, i32) = (1, 2);
// should fail to type-check
return f(xy);
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
match(0) {
case 1 => { x = 1; }
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
match (0) {
case 1 => { x = 1; }
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
match (0) {
case 1 => return 0;
}
+1 -1
View File
@@ -15,7 +15,7 @@ fn add1(x: i32) -> i32 {
return x + 1;
}
fn main() -> i32 {
fn Main() -> i32 {
var f: __Fn(i32)->i32 = add1;
return f(-1);
}
@@ -15,6 +15,6 @@ fn ReturnSecond(_: i32, x: i32) -> i32 {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return ReturnSecond(1, 0);
}
@@ -16,6 +16,6 @@ fn f(x: i32, y: i32) -> i32 {
return x + y;
}
fn main() -> i32 {
fn Main() -> i32 {
return f(2,3) - 5;
}
@@ -19,7 +19,7 @@ fn f(x: i32) -> i32 {
return 0;
}
fn main() -> i32 {
fn Main() -> i32 {
var a: i32 = 0; var b: i32 = 1;
f(a);
b = a;
+1 -1
View File
@@ -19,6 +19,6 @@ fn f(x: i32) -> i32 {
}
}
fn main() -> i32 {
fn Main() -> i32 {
return f(2);
}
+1 -1
View File
@@ -15,6 +15,6 @@ fn f(x: i32) -> i32 {
return x - 1;
}
fn main() -> i32 {
fn Main() -> i32 {
return f(1);
}
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
match (0) {
case _: auto => return 1;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var t: (auto, (i32, i32)) = ((1,2),(3,4));
return t[0][0] + t[1][1] - 5;
}
@@ -23,6 +23,6 @@ fn positive(x: Bool) -> i32 {
}
}
fn main() -> i32 {
fn Main() -> i32 {
return apply(positive, false);
}
@@ -17,6 +17,6 @@ fn id[T:! Type](x: T) -> T {
return x + 0;
}
fn main() -> i32 {
fn Main() -> i32 {
return id(0);
}
@@ -17,6 +17,6 @@ fn fst[T:! Type](x: T, y: T) -> T {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return fst(0, true);
}
@@ -15,6 +15,6 @@ fn id[T:! Type](x: i32) -> i32 {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return id(0);
}
@@ -15,6 +15,6 @@ fn snd[T:! Type](x: i32, y: T) -> T {
return y;
}
fn main() -> i32 {
fn Main() -> i32 {
return snd(0, 1);
}
@@ -15,6 +15,6 @@ fn id[T:! Type](x: T) -> T {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return id(0);
}
+1 -1
View File
@@ -15,6 +15,6 @@ fn swap[T:! Type, U:! Type](tuple: (T, U)) -> (U, T) {
return (tuple[1], tuple[0]);
}
fn main() -> i32 {
fn Main() -> i32 {
return swap((0, true))[1];
}
@@ -17,6 +17,6 @@ fn map[T:! Type](f: __Fn (T) -> T, tuple: (T, T)) -> (T, T) {
fn inc(x: i32) -> i32 { return x + 1; }
fn main() -> i32 {
fn Main() -> i32 {
return map(inc, (0, 2))[0];
}
@@ -15,6 +15,6 @@ fn fst[T:! Type](x: T, y: T) -> T {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return fst(0, 1);
}
@@ -18,6 +18,6 @@ var x: i32 = y;
var y: i32 = 0;
fn main() -> i32 {
fn Main() -> i32 {
return x;
}
@@ -15,6 +15,6 @@ package ExecutableSemanticsTest api;
var flag: i32 = true;
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
@@ -15,6 +15,6 @@ package ExecutableSemanticsTest api;
var zero: i32 = 0;
fn main() -> i32 {
fn Main() -> i32 {
return zero;
}
@@ -19,6 +19,6 @@ fn f() -> i32 {
var y: i32 = f();
fn main() -> i32 {
fn Main() -> i32 {
return y;
}
@@ -17,6 +17,6 @@ var x: i32 = 0;
var y: i32 = x;
fn main() -> i32 {
fn Main() -> i32 {
return y;
}
@@ -19,6 +19,6 @@ fn identity(x: i32) -> i32 {
return x;
}
fn main() -> i32 {
fn Main() -> i32 {
return identity(0);
}
+1 -1
View File
@@ -15,7 +15,7 @@ package ExecutableSemanticsTest api;
var zero: i32 = 1;
fn main() -> i32 {
fn Main() -> i32 {
zero = 0;
return zero;
}
@@ -20,7 +20,7 @@ fn flipFlag() {
flag = 0;
}
fn main() -> i32 {
fn Main() -> i32 {
flipFlag();
return flag;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
if (0 == 1) {
return 1;
} else {
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
if (0 == 1) {
return 1;
} else if (0 == 0) {
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
if (0 == 1) {
return 1;
} else if (0 == 2) {
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
if (0 == 1) {
return 1;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
if (0 == 0) {
if (0 == 1) {
return 1;
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
if (1 == 1) {
return 0;
}
@@ -15,6 +15,6 @@ package ExecutableSemanticsTest api;
import Nonexistent;
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
@@ -15,6 +15,6 @@ package ExecutableSemanticsTest api;
import ExecutableSemanticsTest library "Nonexistent";
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var t: auto = 5;
match (t) {
case x: i32 =>
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var t: auto = 5;
match (t) {
case 5 =>
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var t: auto = 5;
match (t) {
case 3 =>
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var x: i32 = 0;
match (x) {
case 1 =>
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var t: auto = (1, 2, 3, 4);
match (t) {
case (_: i32, _: auto, x: i32, y: auto) =>
+1 -1
View File
@@ -9,6 +9,6 @@
// AUTOUPDATE: executable_semantics %s
// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/package/fail_missing.carbon:12: syntax error, unexpected FN, expecting PACKAGE
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
+1 -1
View File
@@ -11,6 +11,6 @@
package ExecutableSemanticsTest library "Foo" api;
fn main() -> i32 {
fn Main() -> i32 {
return 0;
}
+1 -1
View File
@@ -15,7 +15,7 @@ fn F() -> () {
return ();
}
fn main() -> i32 {
fn Main() -> i32 {
F();
return 0;
}
@@ -14,7 +14,7 @@ package ExecutableSemanticsTest api;
fn F() -> () {
}
fn main() -> i32 {
fn Main() -> i32 {
F();
return 0;
}
@@ -15,7 +15,7 @@ fn F() -> () {
return;
}
fn main() -> i32 {
fn Main() -> i32 {
F();
return 0;
}
@@ -15,7 +15,7 @@ fn F() {
return ();
}
fn main() -> i32 {
fn Main() -> i32 {
F();
return 0;
}
@@ -14,7 +14,7 @@ package ExecutableSemanticsTest api;
fn F() {
}
fn main() -> i32 {
fn Main() -> i32 {
F();
return 0;
}
@@ -15,7 +15,7 @@ fn F() {
return;
}
fn main() -> i32 {
fn Main() -> i32 {
F();
return 0;
}
+1 -1
View File
@@ -18,6 +18,6 @@ fn CompareStr(s: String) -> i32 {
return 1;
}
fn main() -> i32 {
fn Main() -> i32 {
return CompareStr("str");
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
Print("str\xaa");
return 0;
}
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
Print("str\x");
return 0;
}
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
Print("str\e");
return 0;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
Print("new
line");
return 0;
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
Print("str\01");
return 0;
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
Print("new line");
return 0;
}
+1 -1
View File
@@ -18,6 +18,6 @@ fn CompareStr(s: String) -> i32 {
return 1;
}
fn main() -> i32 {
fn Main() -> i32 {
return CompareStr("\x73\x74\x72\x3B");
}
+1 -1
View File
@@ -18,6 +18,6 @@ fn CompareStr(s: String) -> i32 {
return 1;
}
fn main() -> i32 {
fn Main() -> i32 {
return CompareStr("str\n");
}
+1 -1
View File
@@ -11,7 +11,7 @@
package ExecutableSemanticsTest api;
fn main() -> i32 {
fn Main() -> i32 {
var x: auto = {.x = 0, .y = 1};
x = {.x = 5, .y = -5};
return x.x + x.y;

Some files were not shown because too many files have changed in this diff Show More