From ce93ef6b66c9e7cd3562945ad21acd27305aef9d Mon Sep 17 00:00:00 2001 From: flga Date: Thu, 6 Jul 2023 05:58:26 +0100 Subject: Walk back proc argument and array like comp lit changes --- tools/odinfmt/tests/.snapshots/assignments.odin | 10 +- .../tests/.snapshots/binary_expressions.odin | 7 +- tools/odinfmt/tests/.snapshots/calls.odin | 196 +++++++++------------ tools/odinfmt/tests/.snapshots/comp_lit.odin | 11 +- tools/odinfmt/tests/calls.odin | 34 +--- tools/odinfmt/tests/random/.snapshots/demo.odin | 36 +++- 6 files changed, 141 insertions(+), 153 deletions(-) (limited to 'tools') diff --git a/tools/odinfmt/tests/.snapshots/assignments.odin b/tools/odinfmt/tests/.snapshots/assignments.odin index a4a6cda..54bfbe3 100644 --- a/tools/odinfmt/tests/.snapshots/assignments.odin +++ b/tools/odinfmt/tests/.snapshots/assignments.odin @@ -10,10 +10,12 @@ assignments :: proc() { &big.Int{}, &big.Int{} - value += b4 * grad( - seed, - [3]i64{rbp.x, rbp.y - i_sign.y * PRIME_Y, rbp.z}, - [3]f32{ri.x, ri.y + f_sign.y, ri.z}, + value += + b4 * + grad( + seed, + [3]i64{rbp.x, rbp.y - i_sign.y * PRIME_Y, rbp.z}, + [3]f32{ri.x, ri.y + f_sign.y, ri.z}, ) a := diff --git a/tools/odinfmt/tests/.snapshots/binary_expressions.odin b/tools/odinfmt/tests/.snapshots/binary_expressions.odin index 21ac938..94f381f 100644 --- a/tools/odinfmt/tests/.snapshots/binary_expressions.odin +++ b/tools/odinfmt/tests/.snapshots/binary_expressions.odin @@ -43,10 +43,13 @@ binary :: proc() { 111111111111111111111111 == 22222222222222222222232323222 && 111123432411123232311 == 3333332323232432333333333333333333 - b = my_cool_function( + b = + my_cool_function( aaaaaaaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbb, - ) * 234234 + 223423423 + ) * + 234234 + + 223423423 b = diff --git a/tools/odinfmt/tests/.snapshots/calls.odin b/tools/odinfmt/tests/.snapshots/calls.odin index 72e37fb..919a5a0 100644 --- a/tools/odinfmt/tests/.snapshots/calls.odin +++ b/tools/odinfmt/tests/.snapshots/calls.odin @@ -57,26 +57,24 @@ calls :: proc() { ddddddddddddddddddddddddddddddddddddd, ), ) - result = vk.CreateInsance(my_really_cool_call( - T{ - 1, 2, 3, - }, - aaaaaaaaaaaaaaaaaaaaa, - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, - cccccccccccccccccccccccccccccccc, - ddddddddddddddddddddddddddddddddddddd, - )) - result = vk.CreateInsance(my_really_cool_call( - T{ - a = 1, - b = 2, - c = 3, - }, - aaaaaaaaaaaaaaaaaaaaa, - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, - cccccccccccccccccccccccccccccccc, - ddddddddddddddddddddddddddddddddddddd, - )) + result = vk.CreateInsance( + my_really_cool_call( + T{1, 2, 3}, + aaaaaaaaaaaaaaaaaaaaa, + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, + cccccccccccccccccccccccccccccccc, + ddddddddddddddddddddddddddddddddddddd, + ), + ) + result = vk.CreateInsance( + my_really_cool_call( + T{a = 1, b = 2, c = 3}, + aaaaaaaaaaaaaaaaaaaaa, + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, + cccccccccccccccccccccccccccccccc, + ddddddddddddddddddddddddddddddddddddd, + ), + ) result = vk.CreateInsance( @@ -99,113 +97,89 @@ calls :: proc() { }, ), ) - result = vk.CreateInsance(my_really_cool_call(T{ - aaaaaaaaaaaaaaaaaaaaa, - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, - cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd, - })) - result = vk.CreateInsance(my_really_cool_call(T{ - a = aaaaaaaaaaaaaaaaaaaaa, - b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, - c = cccccccccccccccccccccccccccccccc, - d = ddddddddddddddddddddddddddddddddddddd + - ddddddddddddddddddddddddddddddddddddd, - })) - result = vk.CreateInsance(my_really_cool_call(T{ - a = aaaaaaaaaaaaaaaaaaaaa, - b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, - c = cccccccccccccccccccccccccccccccc, - d = ddddddddddddddddddddddddddddddddddddd + 1, - })) + result = vk.CreateInsance( + my_really_cool_call( + T{ + aaaaaaaaaaaaaaaaaaaaa, + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, + cccccccccccccccccccccccccccccccc, + ddddddddddddddddddddddddddddddddddddd, + cccccccccccccccccccccccccccccccc, + ddddddddddddddddddddddddddddddddddddd, + }, + ), + ) + result = vk.CreateInsance( + my_really_cool_call( + T{ + a = aaaaaaaaaaaaaaaaaaaaa, + b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, + c = cccccccccccccccccccccccccccccccc, + d = ddddddddddddddddddddddddddddddddddddd + + ddddddddddddddddddddddddddddddddddddd, + }, + ), + ) + result = vk.CreateInsance( + my_really_cool_call( + T{ + a = aaaaaaaaaaaaaaaaaaaaa, + b = bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, + c = cccccccccccccccccccccccccccccccc, + d = ddddddddddddddddddddddddddddddddddddd + 1, + }, + ), + ) _ = vk.CreateInsance(my_really_cool_call(1, 2, 3)) - _ = vk.CreateInsance(my_really_cool_call( - 1, - 2, - 3, - )) - _ = vk.CreateInsance(my_really_cool_call( - 1, - 2, - 3, - )) + _ = vk.CreateInsance(my_really_cool_call(1, 2, 3)) + _ = vk.CreateInsance(my_really_cool_call(1, 2, 3)) + _ = vk.CreateInsance(1, 2, 3) _ = vk.CreateInsance(1, 2, 3) - _ = vk.CreateInsance( - 1, - 2, - 3, - ) _ = vk.CreateInsance(1) _ = vk.CreateInsance(Composite{a = 1, b = 2}) _ = vk.CreateInsance(Composite{a = 1, b = 2}) - _ = vk.CreateInsance(Composite{ - a = 1, - b = 2, - }) + _ = vk.CreateInsance(Composite{a = 1, b = 2}) + _ = vk.CreateInsance(Composite{1, 2, 3, 4}) _ = vk.CreateInsance(Composite{1, 2, 3, 4}) - _ = vk.CreateInsance(Composite{ - 1, 2, - 3, 4, - }) _ = vk.CreateInsance(matrix[2, 2]i32{ - 1, 2, - 3, 4, - }) + 1, 2, + 3, 4, + }) _ = vk.CreateInsance(matrix[2, 2]i32{ - 1, 2, - 3, 4, - }) + 1, 2, + 3, 4, + }) - _ = vk.CreateInsance(Composite{ - p = proc(_: int) -> int {return 42}, - }) - _ = vk.CreateInsance(Composite{ - p = proc(_: int) -> int { - return 42}, - }) - _ = vk.CreateInsance(Composite{ - p = proc(_: int) -> int { - return 42 - }, - }) - _ = vk.CreateInsance(Composite{ - p = proc(_: int) -> int { - return 42}, - }) - _ = vk.CreateInsance(Composite{ - p = proc(_: int) -> int { - return 42 + test_2( + Foo{ + field1 = 1, + field2 = "hello", + field3 = 1, + field4 = "world", + field5 = 1, + field6 = "!", + field7 = 1, + field8 = 1, }, - }) - _ = vk.CreateInsance(Composite{ - p = proc(_: int) -> int {return 42}, - }) - - test_2(Foo{ - field1 = 1, - field2 = "hello", - field3 = 1, - field4 = "world", - field5 = 1, - field6 = "!", - field7 = 1, - field8 = 1, - }) + ) slice.sort_by(fis, proc(a, b: os.File_Info) -> bool { return a.name < b.name }) - test3(Foo{ - field1 = 1, - field2 = "hello", - field3 = 1, - field4 = "world", - field5 = 1, - field6 = "!", - field7 = 1, - field8 = 1, - }) or_return + test3( + Foo{ + field1 = 1, + field2 = "hello", + field3 = 1, + field4 = "world", + field5 = 1, + field6 = "!", + field7 = 1, + field8 = 1, + }, + ) or_return ab := short_call(10, false) or_return diff --git a/tools/odinfmt/tests/.snapshots/comp_lit.odin b/tools/odinfmt/tests/.snapshots/comp_lit.odin index bbef149..d771cb0 100644 --- a/tools/odinfmt/tests/.snapshots/comp_lit.odin +++ b/tools/odinfmt/tests/.snapshots/comp_lit.odin @@ -7,7 +7,10 @@ main :: proc() { } _ = T{0, 0, 0, 0} _ = T{ - 0, 0, 0, 0, + 0, + 0, + 0, + 0, } _ = T{ 0, @@ -16,8 +19,10 @@ main :: proc() { 0, } _ = T{ - 0, 0, - 0, 0, + 0, + 0, + 0, + 0, } _ = T{a = 0, b = 0, c = 0, d = 0} _ = T{ diff --git a/tools/odinfmt/tests/calls.odin b/tools/odinfmt/tests/calls.odin index febe4de..47295bd 100644 --- a/tools/odinfmt/tests/calls.odin +++ b/tools/odinfmt/tests/calls.odin @@ -15,13 +15,13 @@ calls :: proc() { 1,2,3},aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd)) result = vk.CreateInsance(my_really_cool_call(T{ a=1,b=2,c=3},aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd)) - + result = vk.CreateInsance(my_really_cool_call(T{aaaaaaaaaaaaaaaaaaaaa, bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd})) result = vk.CreateInsance(my_really_cool_call(T{a=aaaaaaaaaaaaaaaaaaaaa,b=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,c=cccccccccccccccccccccccccccccccc,d=ddddddddddddddddddddddddddddddddddddd})) result = vk.CreateInsance(my_really_cool_call(T{ - aaaaaaaaaaaaaaaaaaaaa, - bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd})) + aaaaaaaaaaaaaaaaaaaaa, + bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd, cccccccccccccccccccccccccccccccc, ddddddddddddddddddddddddddddddddddddd,})) result = vk.CreateInsance(my_really_cool_call(T{ a=aaaaaaaaaaaaaaaaaaaaa, b=bbbbbbbbbbbbbbbbbbbbbbbbbbbbbb,c=cccccccccccccccccccccccccccccccc,d=ddddddddddddddddddddddddddddddddddddd+ddddddddddddddddddddddddddddddddddddd})) @@ -58,27 +58,11 @@ calls :: proc() { 3,4}, ) _ = vk.CreateInsance(matrix[2, 2]i32 { - 1, 2, - 3, 4, + 1, 2, + 3, 4, }) _ = vk.CreateInsance(matrix[2, 2]i32 {1, 2, 3, 4}) - _ = vk.CreateInsance( Composite{p=proc(int)->int { return 42 }},) - _ = vk.CreateInsance( Composite{p=proc(int)->int { - return 42 }},) - _ = vk.CreateInsance( Composite{p=proc(int)->int { - return 42 - }},) - _ = vk.CreateInsance( Composite{ - p=proc(int)->int { - return 42 }},) - _ = vk.CreateInsance( Composite{ - p=proc(int)->int { - return 42 - }},) - _ = vk.CreateInsance( Composite{ - p=proc(int)->int {return 42 }},) - test_2( Foo{field1 = 1, field2 = "hello", @@ -94,7 +78,7 @@ calls :: proc() { slice.sort_by(fis, proc(a, b: os.File_Info) -> bool { return a.name < b.name }) - + test3( Foo{field1 = 1, field2 = "hello", @@ -109,9 +93,9 @@ calls :: proc() { ab := short_call(10, false) or_return - resuuuuuuuuult := + resuuuuuuuuult := add_to_long_list_of_values( - fooooooooooooo, + fooooooooooooo, Foo{ field1 = 1, field2 = "hello", @@ -124,4 +108,4 @@ calls :: proc() { }, true, ) or_return -} \ No newline at end of file +} diff --git a/tools/odinfmt/tests/random/.snapshots/demo.odin b/tools/odinfmt/tests/random/.snapshots/demo.odin index e64d05e..ec39d44 100644 --- a/tools/odinfmt/tests/random/.snapshots/demo.odin +++ b/tools/odinfmt/tests/random/.snapshots/demo.odin @@ -2501,8 +2501,10 @@ matrix_type :: proc() { mat4 :: distinct matrix[4, 4]f32 m2 := mat2{ - 1, 3, - 2, 4, + 1, + 3, + 2, + 4, } m4 := mat4(m2) @@ -2514,10 +2516,22 @@ matrix_type :: proc() { assert(mat2(m4) == m2) b4 := mat4{ - 1, 2, 0, 0, - 3, 4, 0, 0, - 5, 0, 6, 0, - 0, 7, 0, 8, + 1, + 2, + 0, + 0, + 3, + 4, + 0, + 0, + 5, + 0, + 6, + 0, + 0, + 7, + 0, + 8, } fmt.println("b4", matrix_flatten(b4)) } @@ -2532,8 +2546,14 @@ matrix_type :: proc() { mat4x2 :: distinct matrix[4, 2]f32 x := mat2x4{ - 1, 3, 5, 7, - 2, 4, 6, 8, + 1, + 3, + 5, + 7, + 2, + 4, + 6, + 8, } y := mat4x2(x) -- cgit v1.2.3