From d1166edfdc63a0eff67fe590d81ffe0b9176903f Mon Sep 17 00:00:00 2001 From: Andrew Kennedy Date: Tue, 28 Jul 2020 04:39:29 -0700 Subject: [PATCH] Move tests for yield statement into own directory Summary: As title says. Exposed new errors by use default of no max errors. Reviewed By: vsiles Differential Revision: D22763217 fbshipit-source-id: 5518bfef33345f8aaab2c23e03144c34b01b6aef --- hphp/hack/test/typecheck/asyncgen3.php.exp | 2 -- hphp/hack/test/typecheck/asyncgen9.php.exp | 2 -- hphp/hack/test/typecheck/{ => yield}/asyncgen1.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen1.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen10.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen10.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen11.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen11.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen2.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen2.php.exp | 0 .../typecheck/{ => yield}/asyncgen2.php.like_types.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen3.php | 0 hphp/hack/test/typecheck/yield/asyncgen3.php.exp | 8 ++++++++ hphp/hack/test/typecheck/{ => yield}/asyncgen4.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen4.php.exp | 6 ++++++ .../typecheck/{ => yield}/asyncgen4.php.like_types.exp | 6 ++++++ hphp/hack/test/typecheck/{ => yield}/asyncgen5.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen5.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen6.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen6.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen7.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen7.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen8.php | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen8.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/asyncgen9.php | 0 hphp/hack/test/typecheck/yield/asyncgen9.php.exp | 8 ++++++++ .../hack/test/typecheck/{ => yield}/compile_test_yield.php | 0 .../test/typecheck/{ => yield}/compile_test_yield.php.exp | 0 .../typecheck/{ => yield}/compile_test_yield_erling.php | 0 .../{ => yield}/compile_test_yield_erling.php.exp | 0 .../test/typecheck/{ => yield}/test_ok_yield_return.php | 0 .../typecheck/{ => yield}/test_ok_yield_return.php.exp | 0 .../hack/test/typecheck/{ => yield}/yield_blank_result.php | 0 .../test/typecheck/{ => yield}/yield_blank_result.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_break.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_break.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_decl.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_decl.php.exp | 0 .../test/typecheck/{ => yield}/yield_implicit_result.php | 0 .../typecheck/{ => yield}/yield_implicit_result.php.exp | 0 .../test/typecheck/{ => yield}/yield_jan_test_case.php | 0 .../test/typecheck/{ => yield}/yield_jan_test_case.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv1.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv1.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv2.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv2.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv3.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv3.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv4.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_kv4.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_new.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_new.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_return1.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_return1.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_return2.php | 0 hphp/hack/test/typecheck/yield/yield_return2.php.exp | 8 ++++++++ hphp/hack/test/typecheck/{ => yield}/yield_return3.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_return3.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_return4.php | 0 hphp/hack/test/typecheck/yield/yield_return4.php.exp | 8 ++++++++ hphp/hack/test/typecheck/{ => yield}/yield_send1.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_send1.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_send2.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_send2.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_send3.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_send3.php.exp | 8 ++++++++ hphp/hack/test/typecheck/{ => yield}/yield_send4.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_send4.php.exp | 0 hphp/hack/test/typecheck/{ => yield}/yield_send5.php | 0 hphp/hack/test/typecheck/{ => yield}/yield_send5.php.exp | 0 .../typecheck/{ => yield}/yield_wait_for_result_bad2.php | 0 .../typecheck/yield/yield_wait_for_result_bad2.php.exp | 14 ++++++++++++++ hphp/hack/test/typecheck/yield_return2.php.exp | 2 -- hphp/hack/test/typecheck/yield_return4.php.exp | 2 -- .../hack/test/typecheck/yield_wait_for_result_bad2.php.exp | 6 ------ 75 files changed, 66 insertions(+), 14 deletions(-) delete mode 100644 hphp/hack/test/typecheck/asyncgen3.php.exp delete mode 100644 hphp/hack/test/typecheck/asyncgen9.php.exp rename hphp/hack/test/typecheck/{ => yield}/asyncgen1.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen1.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen10.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen10.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen11.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen11.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen2.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen2.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen2.php.like_types.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen3.php (100%) create mode 100644 hphp/hack/test/typecheck/yield/asyncgen3.php.exp rename hphp/hack/test/typecheck/{ => yield}/asyncgen4.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen4.php.exp (56%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen4.php.like_types.exp (56%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen5.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen5.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen6.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen6.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen7.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen7.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen8.php (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen8.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/asyncgen9.php (100%) create mode 100644 hphp/hack/test/typecheck/yield/asyncgen9.php.exp rename hphp/hack/test/typecheck/{ => yield}/compile_test_yield.php (100%) rename hphp/hack/test/typecheck/{ => yield}/compile_test_yield.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/compile_test_yield_erling.php (100%) rename hphp/hack/test/typecheck/{ => yield}/compile_test_yield_erling.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/test_ok_yield_return.php (100%) rename hphp/hack/test/typecheck/{ => yield}/test_ok_yield_return.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_blank_result.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_blank_result.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_break.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_break.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_decl.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_decl.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_implicit_result.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_implicit_result.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_jan_test_case.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_jan_test_case.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv1.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv1.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv2.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv2.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv3.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv3.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv4.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_kv4.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_new.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_new.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_return1.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_return1.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_return2.php (100%) create mode 100644 hphp/hack/test/typecheck/yield/yield_return2.php.exp rename hphp/hack/test/typecheck/{ => yield}/yield_return3.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_return3.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_return4.php (100%) create mode 100644 hphp/hack/test/typecheck/yield/yield_return4.php.exp rename hphp/hack/test/typecheck/{ => yield}/yield_send1.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send1.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send2.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send2.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send3.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send3.php.exp (54%) rename hphp/hack/test/typecheck/{ => yield}/yield_send4.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send4.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send5.php (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_send5.php.exp (100%) rename hphp/hack/test/typecheck/{ => yield}/yield_wait_for_result_bad2.php (100%) create mode 100644 hphp/hack/test/typecheck/yield/yield_wait_for_result_bad2.php.exp delete mode 100644 hphp/hack/test/typecheck/yield_return2.php.exp delete mode 100644 hphp/hack/test/typecheck/yield_return4.php.exp delete mode 100644 hphp/hack/test/typecheck/yield_wait_for_result_bad2.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen3.php.exp b/hphp/hack/test/typecheck/asyncgen3.php.exp deleted file mode 100644 index 965af82f9d3..00000000000 --- a/hphp/hack/test/typecheck/asyncgen3.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -File "asyncgen3.php", line 8, characters 8-18: -await can only be used inside async functions (NastCheck[3003]) diff --git a/hphp/hack/test/typecheck/asyncgen9.php.exp b/hphp/hack/test/typecheck/asyncgen9.php.exp deleted file mode 100644 index 7376779c227..00000000000 --- a/hphp/hack/test/typecheck/asyncgen9.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -File "asyncgen9.php", line 4, characters 16-20: -await can only be used inside async functions (NastCheck[3003]) diff --git a/hphp/hack/test/typecheck/asyncgen1.php b/hphp/hack/test/typecheck/yield/asyncgen1.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen1.php rename to hphp/hack/test/typecheck/yield/asyncgen1.php diff --git a/hphp/hack/test/typecheck/asyncgen1.php.exp b/hphp/hack/test/typecheck/yield/asyncgen1.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen1.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen1.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen10.php b/hphp/hack/test/typecheck/yield/asyncgen10.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen10.php rename to hphp/hack/test/typecheck/yield/asyncgen10.php diff --git a/hphp/hack/test/typecheck/asyncgen10.php.exp b/hphp/hack/test/typecheck/yield/asyncgen10.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen10.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen10.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen11.php b/hphp/hack/test/typecheck/yield/asyncgen11.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen11.php rename to hphp/hack/test/typecheck/yield/asyncgen11.php diff --git a/hphp/hack/test/typecheck/asyncgen11.php.exp b/hphp/hack/test/typecheck/yield/asyncgen11.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen11.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen11.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen2.php b/hphp/hack/test/typecheck/yield/asyncgen2.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen2.php rename to hphp/hack/test/typecheck/yield/asyncgen2.php diff --git a/hphp/hack/test/typecheck/asyncgen2.php.exp b/hphp/hack/test/typecheck/yield/asyncgen2.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen2.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen2.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen2.php.like_types.exp b/hphp/hack/test/typecheck/yield/asyncgen2.php.like_types.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen2.php.like_types.exp rename to hphp/hack/test/typecheck/yield/asyncgen2.php.like_types.exp diff --git a/hphp/hack/test/typecheck/asyncgen3.php b/hphp/hack/test/typecheck/yield/asyncgen3.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen3.php rename to hphp/hack/test/typecheck/yield/asyncgen3.php diff --git a/hphp/hack/test/typecheck/yield/asyncgen3.php.exp b/hphp/hack/test/typecheck/yield/asyncgen3.php.exp new file mode 100644 index 00000000000..0f0d2fb9bd9 --- /dev/null +++ b/hphp/hack/test/typecheck/yield/asyncgen3.php.exp @@ -0,0 +1,8 @@ +File "asyncgen3.php", line 8, characters 8-18: +await can only be used inside async functions (NastCheck[3003]) +File "asyncgen3.php", line 9, characters 3-16: +Invalid yield (Typing[4110]) +File "asyncgen3.php", line 7, characters 15-47: +Expected AsyncGenerator +File "asyncgen3.php", line 9, characters 3-16: +But got Generator (result of function with 'yield' in the body) diff --git a/hphp/hack/test/typecheck/asyncgen4.php b/hphp/hack/test/typecheck/yield/asyncgen4.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen4.php rename to hphp/hack/test/typecheck/yield/asyncgen4.php diff --git a/hphp/hack/test/typecheck/asyncgen4.php.exp b/hphp/hack/test/typecheck/yield/asyncgen4.php.exp similarity index 56% rename from hphp/hack/test/typecheck/asyncgen4.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen4.php.exp index a685e15cedc..f47df82a317 100644 --- a/hphp/hack/test/typecheck/asyncgen4.php.exp +++ b/hphp/hack/test/typecheck/yield/asyncgen4.php.exp @@ -8,3 +8,9 @@ File "asyncgen4.php", line 7, characters 21-48: Expected Generator File "asyncgen4.php", line 9, characters 3-16: But got AsyncGenerator (result of 'async function' with 'yield' in the body) +File "asyncgen4.php", line 13, characters 12-14: +Invalid foreach (Typing[4110]) +File "asyncgen4.php", line 13, characters 12-14: +Expected AsyncKeyedIterator<[unresolved], [unresolved]> because this is used in a foreach statement with "await as" +File "asyncgen4.php", line 7, characters 21-48: +But got Generator diff --git a/hphp/hack/test/typecheck/asyncgen4.php.like_types.exp b/hphp/hack/test/typecheck/yield/asyncgen4.php.like_types.exp similarity index 56% rename from hphp/hack/test/typecheck/asyncgen4.php.like_types.exp rename to hphp/hack/test/typecheck/yield/asyncgen4.php.like_types.exp index 852ed555aea..c27159ff1b5 100644 --- a/hphp/hack/test/typecheck/asyncgen4.php.like_types.exp +++ b/hphp/hack/test/typecheck/yield/asyncgen4.php.like_types.exp @@ -8,3 +8,9 @@ File "asyncgen4.php", line 7, characters 21-48: Expected Generator File "asyncgen4.php", line 9, characters 3-16: But got AsyncGenerator (result of 'async function' with 'yield' in the body) +File "asyncgen4.php", line 13, characters 12-14: +Invalid foreach (Typing[4110]) +File "asyncgen4.php", line 13, characters 12-14: +Expected AsyncKeyedIterator<[unresolved], [unresolved]> because this is used in a foreach statement with "await as" +File "asyncgen4.php", line 7, characters 21-48: +But got Generator diff --git a/hphp/hack/test/typecheck/asyncgen5.php b/hphp/hack/test/typecheck/yield/asyncgen5.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen5.php rename to hphp/hack/test/typecheck/yield/asyncgen5.php diff --git a/hphp/hack/test/typecheck/asyncgen5.php.exp b/hphp/hack/test/typecheck/yield/asyncgen5.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen5.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen5.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen6.php b/hphp/hack/test/typecheck/yield/asyncgen6.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen6.php rename to hphp/hack/test/typecheck/yield/asyncgen6.php diff --git a/hphp/hack/test/typecheck/asyncgen6.php.exp b/hphp/hack/test/typecheck/yield/asyncgen6.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen6.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen6.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen7.php b/hphp/hack/test/typecheck/yield/asyncgen7.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen7.php rename to hphp/hack/test/typecheck/yield/asyncgen7.php diff --git a/hphp/hack/test/typecheck/asyncgen7.php.exp b/hphp/hack/test/typecheck/yield/asyncgen7.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen7.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen7.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen8.php b/hphp/hack/test/typecheck/yield/asyncgen8.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen8.php rename to hphp/hack/test/typecheck/yield/asyncgen8.php diff --git a/hphp/hack/test/typecheck/asyncgen8.php.exp b/hphp/hack/test/typecheck/yield/asyncgen8.php.exp similarity index 100% rename from hphp/hack/test/typecheck/asyncgen8.php.exp rename to hphp/hack/test/typecheck/yield/asyncgen8.php.exp diff --git a/hphp/hack/test/typecheck/asyncgen9.php b/hphp/hack/test/typecheck/yield/asyncgen9.php similarity index 100% rename from hphp/hack/test/typecheck/asyncgen9.php rename to hphp/hack/test/typecheck/yield/asyncgen9.php diff --git a/hphp/hack/test/typecheck/yield/asyncgen9.php.exp b/hphp/hack/test/typecheck/yield/asyncgen9.php.exp new file mode 100644 index 00000000000..102a806d55d --- /dev/null +++ b/hphp/hack/test/typecheck/yield/asyncgen9.php.exp @@ -0,0 +1,8 @@ +File "asyncgen9.php", line 4, characters 16-20: +await can only be used inside async functions (NastCheck[3003]) +File "asyncgen9.php", line 4, characters 12-14: +Invalid foreach (Typing[4110]) +File "asyncgen9.php", line 4, characters 12-14: +Expected AsyncIterator<[unresolved]> because this is used in a foreach statement with "await as" +File "asyncgen9.php", line 8, characters 15-28: +But got Awaitable diff --git a/hphp/hack/test/typecheck/compile_test_yield.php b/hphp/hack/test/typecheck/yield/compile_test_yield.php similarity index 100% rename from hphp/hack/test/typecheck/compile_test_yield.php rename to hphp/hack/test/typecheck/yield/compile_test_yield.php diff --git a/hphp/hack/test/typecheck/compile_test_yield.php.exp b/hphp/hack/test/typecheck/yield/compile_test_yield.php.exp similarity index 100% rename from hphp/hack/test/typecheck/compile_test_yield.php.exp rename to hphp/hack/test/typecheck/yield/compile_test_yield.php.exp diff --git a/hphp/hack/test/typecheck/compile_test_yield_erling.php b/hphp/hack/test/typecheck/yield/compile_test_yield_erling.php similarity index 100% rename from hphp/hack/test/typecheck/compile_test_yield_erling.php rename to hphp/hack/test/typecheck/yield/compile_test_yield_erling.php diff --git a/hphp/hack/test/typecheck/compile_test_yield_erling.php.exp b/hphp/hack/test/typecheck/yield/compile_test_yield_erling.php.exp similarity index 100% rename from hphp/hack/test/typecheck/compile_test_yield_erling.php.exp rename to hphp/hack/test/typecheck/yield/compile_test_yield_erling.php.exp diff --git a/hphp/hack/test/typecheck/test_ok_yield_return.php b/hphp/hack/test/typecheck/yield/test_ok_yield_return.php similarity index 100% rename from hphp/hack/test/typecheck/test_ok_yield_return.php rename to hphp/hack/test/typecheck/yield/test_ok_yield_return.php diff --git a/hphp/hack/test/typecheck/test_ok_yield_return.php.exp b/hphp/hack/test/typecheck/yield/test_ok_yield_return.php.exp similarity index 100% rename from hphp/hack/test/typecheck/test_ok_yield_return.php.exp rename to hphp/hack/test/typecheck/yield/test_ok_yield_return.php.exp diff --git a/hphp/hack/test/typecheck/yield_blank_result.php b/hphp/hack/test/typecheck/yield/yield_blank_result.php similarity index 100% rename from hphp/hack/test/typecheck/yield_blank_result.php rename to hphp/hack/test/typecheck/yield/yield_blank_result.php diff --git a/hphp/hack/test/typecheck/yield_blank_result.php.exp b/hphp/hack/test/typecheck/yield/yield_blank_result.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_blank_result.php.exp rename to hphp/hack/test/typecheck/yield/yield_blank_result.php.exp diff --git a/hphp/hack/test/typecheck/yield_break.php b/hphp/hack/test/typecheck/yield/yield_break.php similarity index 100% rename from hphp/hack/test/typecheck/yield_break.php rename to hphp/hack/test/typecheck/yield/yield_break.php diff --git a/hphp/hack/test/typecheck/yield_break.php.exp b/hphp/hack/test/typecheck/yield/yield_break.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_break.php.exp rename to hphp/hack/test/typecheck/yield/yield_break.php.exp diff --git a/hphp/hack/test/typecheck/yield_decl.php b/hphp/hack/test/typecheck/yield/yield_decl.php similarity index 100% rename from hphp/hack/test/typecheck/yield_decl.php rename to hphp/hack/test/typecheck/yield/yield_decl.php diff --git a/hphp/hack/test/typecheck/yield_decl.php.exp b/hphp/hack/test/typecheck/yield/yield_decl.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_decl.php.exp rename to hphp/hack/test/typecheck/yield/yield_decl.php.exp diff --git a/hphp/hack/test/typecheck/yield_implicit_result.php b/hphp/hack/test/typecheck/yield/yield_implicit_result.php similarity index 100% rename from hphp/hack/test/typecheck/yield_implicit_result.php rename to hphp/hack/test/typecheck/yield/yield_implicit_result.php diff --git a/hphp/hack/test/typecheck/yield_implicit_result.php.exp b/hphp/hack/test/typecheck/yield/yield_implicit_result.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_implicit_result.php.exp rename to hphp/hack/test/typecheck/yield/yield_implicit_result.php.exp diff --git a/hphp/hack/test/typecheck/yield_jan_test_case.php b/hphp/hack/test/typecheck/yield/yield_jan_test_case.php similarity index 100% rename from hphp/hack/test/typecheck/yield_jan_test_case.php rename to hphp/hack/test/typecheck/yield/yield_jan_test_case.php diff --git a/hphp/hack/test/typecheck/yield_jan_test_case.php.exp b/hphp/hack/test/typecheck/yield/yield_jan_test_case.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_jan_test_case.php.exp rename to hphp/hack/test/typecheck/yield/yield_jan_test_case.php.exp diff --git a/hphp/hack/test/typecheck/yield_kv1.php b/hphp/hack/test/typecheck/yield/yield_kv1.php similarity index 100% rename from hphp/hack/test/typecheck/yield_kv1.php rename to hphp/hack/test/typecheck/yield/yield_kv1.php diff --git a/hphp/hack/test/typecheck/yield_kv1.php.exp b/hphp/hack/test/typecheck/yield/yield_kv1.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_kv1.php.exp rename to hphp/hack/test/typecheck/yield/yield_kv1.php.exp diff --git a/hphp/hack/test/typecheck/yield_kv2.php b/hphp/hack/test/typecheck/yield/yield_kv2.php similarity index 100% rename from hphp/hack/test/typecheck/yield_kv2.php rename to hphp/hack/test/typecheck/yield/yield_kv2.php diff --git a/hphp/hack/test/typecheck/yield_kv2.php.exp b/hphp/hack/test/typecheck/yield/yield_kv2.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_kv2.php.exp rename to hphp/hack/test/typecheck/yield/yield_kv2.php.exp diff --git a/hphp/hack/test/typecheck/yield_kv3.php b/hphp/hack/test/typecheck/yield/yield_kv3.php similarity index 100% rename from hphp/hack/test/typecheck/yield_kv3.php rename to hphp/hack/test/typecheck/yield/yield_kv3.php diff --git a/hphp/hack/test/typecheck/yield_kv3.php.exp b/hphp/hack/test/typecheck/yield/yield_kv3.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_kv3.php.exp rename to hphp/hack/test/typecheck/yield/yield_kv3.php.exp diff --git a/hphp/hack/test/typecheck/yield_kv4.php b/hphp/hack/test/typecheck/yield/yield_kv4.php similarity index 100% rename from hphp/hack/test/typecheck/yield_kv4.php rename to hphp/hack/test/typecheck/yield/yield_kv4.php diff --git a/hphp/hack/test/typecheck/yield_kv4.php.exp b/hphp/hack/test/typecheck/yield/yield_kv4.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_kv4.php.exp rename to hphp/hack/test/typecheck/yield/yield_kv4.php.exp diff --git a/hphp/hack/test/typecheck/yield_new.php b/hphp/hack/test/typecheck/yield/yield_new.php similarity index 100% rename from hphp/hack/test/typecheck/yield_new.php rename to hphp/hack/test/typecheck/yield/yield_new.php diff --git a/hphp/hack/test/typecheck/yield_new.php.exp b/hphp/hack/test/typecheck/yield/yield_new.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_new.php.exp rename to hphp/hack/test/typecheck/yield/yield_new.php.exp diff --git a/hphp/hack/test/typecheck/yield_return1.php b/hphp/hack/test/typecheck/yield/yield_return1.php similarity index 100% rename from hphp/hack/test/typecheck/yield_return1.php rename to hphp/hack/test/typecheck/yield/yield_return1.php diff --git a/hphp/hack/test/typecheck/yield_return1.php.exp b/hphp/hack/test/typecheck/yield/yield_return1.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_return1.php.exp rename to hphp/hack/test/typecheck/yield/yield_return1.php.exp diff --git a/hphp/hack/test/typecheck/yield_return2.php b/hphp/hack/test/typecheck/yield/yield_return2.php similarity index 100% rename from hphp/hack/test/typecheck/yield_return2.php rename to hphp/hack/test/typecheck/yield/yield_return2.php diff --git a/hphp/hack/test/typecheck/yield/yield_return2.php.exp b/hphp/hack/test/typecheck/yield/yield_return2.php.exp new file mode 100644 index 00000000000..dd42df39747 --- /dev/null +++ b/hphp/hack/test/typecheck/yield/yield_return2.php.exp @@ -0,0 +1,8 @@ +File "yield_return2.php", line 6, characters 5-16: +You cannot return a value in a generator (a generator is a function that uses yield) (NastCheck[3019]) +File "yield_return2.php", line 6, characters 12-15: +Invalid return type (Typing[4110]) +File "yield_return2.php", line 3, characters 15-39: +Expected Generator +File "yield_return2.php", line 6, characters 12-15: +But got string diff --git a/hphp/hack/test/typecheck/yield_return3.php b/hphp/hack/test/typecheck/yield/yield_return3.php similarity index 100% rename from hphp/hack/test/typecheck/yield_return3.php rename to hphp/hack/test/typecheck/yield/yield_return3.php diff --git a/hphp/hack/test/typecheck/yield_return3.php.exp b/hphp/hack/test/typecheck/yield/yield_return3.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_return3.php.exp rename to hphp/hack/test/typecheck/yield/yield_return3.php.exp diff --git a/hphp/hack/test/typecheck/yield_return4.php b/hphp/hack/test/typecheck/yield/yield_return4.php similarity index 100% rename from hphp/hack/test/typecheck/yield_return4.php rename to hphp/hack/test/typecheck/yield/yield_return4.php diff --git a/hphp/hack/test/typecheck/yield/yield_return4.php.exp b/hphp/hack/test/typecheck/yield/yield_return4.php.exp new file mode 100644 index 00000000000..c44160a1192 --- /dev/null +++ b/hphp/hack/test/typecheck/yield/yield_return4.php.exp @@ -0,0 +1,8 @@ +File "yield_return4.php", line 6, characters 5-16: +You cannot return a value in a generator (a generator is a function that uses yield) (NastCheck[3019]) +File "yield_return4.php", line 6, characters 12-15: +Invalid return type (Typing[4110]) +File "yield_return4.php", line 3, characters 21-51: +Expected AsyncGenerator +File "yield_return4.php", line 6, characters 12-15: +But got string diff --git a/hphp/hack/test/typecheck/yield_send1.php b/hphp/hack/test/typecheck/yield/yield_send1.php similarity index 100% rename from hphp/hack/test/typecheck/yield_send1.php rename to hphp/hack/test/typecheck/yield/yield_send1.php diff --git a/hphp/hack/test/typecheck/yield_send1.php.exp b/hphp/hack/test/typecheck/yield/yield_send1.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_send1.php.exp rename to hphp/hack/test/typecheck/yield/yield_send1.php.exp diff --git a/hphp/hack/test/typecheck/yield_send2.php b/hphp/hack/test/typecheck/yield/yield_send2.php similarity index 100% rename from hphp/hack/test/typecheck/yield_send2.php rename to hphp/hack/test/typecheck/yield/yield_send2.php diff --git a/hphp/hack/test/typecheck/yield_send2.php.exp b/hphp/hack/test/typecheck/yield/yield_send2.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_send2.php.exp rename to hphp/hack/test/typecheck/yield/yield_send2.php.exp diff --git a/hphp/hack/test/typecheck/yield_send3.php b/hphp/hack/test/typecheck/yield/yield_send3.php similarity index 100% rename from hphp/hack/test/typecheck/yield_send3.php rename to hphp/hack/test/typecheck/yield/yield_send3.php diff --git a/hphp/hack/test/typecheck/yield_send3.php.exp b/hphp/hack/test/typecheck/yield/yield_send3.php.exp similarity index 54% rename from hphp/hack/test/typecheck/yield_send3.php.exp rename to hphp/hack/test/typecheck/yield/yield_send3.php.exp index 1605e6c2d87..529cfa09928 100644 --- a/hphp/hack/test/typecheck/yield_send3.php.exp +++ b/hphp/hack/test/typecheck/yield/yield_send3.php.exp @@ -6,3 +6,11 @@ File "yield_send3.php", line 5, characters 39-44: But got string File "yield_send3.php", line 5, characters 39-44: Considering that this type argument is contravariant with respect to Generator +File "yield_send3.php", line 12, characters 14-14: +Invalid argument (Typing[4110]) +File "yield_send3.php", line 5, characters 39-44: +Expected string +File "classes.hhi", line 25, characters 25-26: + via this generic Ts +File "yield_send3.php", line 12, characters 14-14: +But got int diff --git a/hphp/hack/test/typecheck/yield_send4.php b/hphp/hack/test/typecheck/yield/yield_send4.php similarity index 100% rename from hphp/hack/test/typecheck/yield_send4.php rename to hphp/hack/test/typecheck/yield/yield_send4.php diff --git a/hphp/hack/test/typecheck/yield_send4.php.exp b/hphp/hack/test/typecheck/yield/yield_send4.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_send4.php.exp rename to hphp/hack/test/typecheck/yield/yield_send4.php.exp diff --git a/hphp/hack/test/typecheck/yield_send5.php b/hphp/hack/test/typecheck/yield/yield_send5.php similarity index 100% rename from hphp/hack/test/typecheck/yield_send5.php rename to hphp/hack/test/typecheck/yield/yield_send5.php diff --git a/hphp/hack/test/typecheck/yield_send5.php.exp b/hphp/hack/test/typecheck/yield/yield_send5.php.exp similarity index 100% rename from hphp/hack/test/typecheck/yield_send5.php.exp rename to hphp/hack/test/typecheck/yield/yield_send5.php.exp diff --git a/hphp/hack/test/typecheck/yield_wait_for_result_bad2.php b/hphp/hack/test/typecheck/yield/yield_wait_for_result_bad2.php similarity index 100% rename from hphp/hack/test/typecheck/yield_wait_for_result_bad2.php rename to hphp/hack/test/typecheck/yield/yield_wait_for_result_bad2.php diff --git a/hphp/hack/test/typecheck/yield/yield_wait_for_result_bad2.php.exp b/hphp/hack/test/typecheck/yield/yield_wait_for_result_bad2.php.exp new file mode 100644 index 00000000000..c1b25864e30 --- /dev/null +++ b/hphp/hack/test/typecheck/yield/yield_wait_for_result_bad2.php.exp @@ -0,0 +1,14 @@ +File "yield_wait_for_result_bad2.php", line 13, characters 3-11: +Invalid yield (Typing[4110]) +File "yield_wait_for_result_bad2.php", line 12, characters 17-30: +Expected Awaitable +File "yield_wait_for_result_bad2.php", line 13, characters 3-11: +But got Generator (result of function with 'yield' in the body) +File "yield_wait_for_result_bad2.php", line 21, characters 9-23: +Unbound name: wait_for_result (a global function) (Naming[2049]) +File "yield_wait_for_result_bad2.php", line 21, characters 3-30: +Invalid yield (Typing[4110]) +File "yield_wait_for_result_bad2.php", line 20, characters 17-30: +Expected Awaitable +File "yield_wait_for_result_bad2.php", line 21, characters 3-30: +But got Generator (result of function with 'yield' in the body) diff --git a/hphp/hack/test/typecheck/yield_return2.php.exp b/hphp/hack/test/typecheck/yield_return2.php.exp deleted file mode 100644 index c6fc31784ea..00000000000 --- a/hphp/hack/test/typecheck/yield_return2.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -File "yield_return2.php", line 6, characters 5-16: -You cannot return a value in a generator (a generator is a function that uses yield) (NastCheck[3019]) diff --git a/hphp/hack/test/typecheck/yield_return4.php.exp b/hphp/hack/test/typecheck/yield_return4.php.exp deleted file mode 100644 index 21b336ae732..00000000000 --- a/hphp/hack/test/typecheck/yield_return4.php.exp +++ /dev/null @@ -1,2 +0,0 @@ -File "yield_return4.php", line 6, characters 5-16: -You cannot return a value in a generator (a generator is a function that uses yield) (NastCheck[3019]) diff --git a/hphp/hack/test/typecheck/yield_wait_for_result_bad2.php.exp b/hphp/hack/test/typecheck/yield_wait_for_result_bad2.php.exp deleted file mode 100644 index cfdcf4170c6..00000000000 --- a/hphp/hack/test/typecheck/yield_wait_for_result_bad2.php.exp +++ /dev/null @@ -1,6 +0,0 @@ -File "yield_wait_for_result_bad2.php", line 13, characters 3-11: -Invalid yield (Typing[4110]) -File "yield_wait_for_result_bad2.php", line 12, characters 17-30: -Expected Awaitable -File "yield_wait_for_result_bad2.php", line 13, characters 3-11: -But got Generator (result of function with 'yield' in the body) -- 2.11.4.GIT