From 0111161a0b6c0337ad0ccc814e948e2dd3212b1e Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Fri, 16 Jun 2023 14:45:36 +0200 Subject: [PATCH] Move all macro tests to macro test folders We should only execute macro tests on the bootstrap compiler. [Cherry-picked e6e14013eb61cb2f715ef4139230211b6cd7144e] --- .../higher-order-quoted-expressions.scala | 0 tests/{neg => neg-macros}/i12019.scala | 0 tests/{neg => neg-macros}/i12196.scala | 0 tests/{neg => neg-macros}/i12196b.scala | 0 tests/{neg => neg-macros}/i12344.scala | 0 tests/{neg => neg-macros}/i12606.scala | 0 tests/{neg => neg-macros}/i13407.scala | 0 tests/{neg => neg-macros}/i14772.check | 2 +- tests/{neg => neg-macros}/i14772.scala | 0 tests/{neg => neg-macros}/i15009a.check | 12 ++++++------ tests/{neg => neg-macros}/i15009a.scala | 0 tests/{neg => neg-macros}/i16861a.scala | 0 tests/{neg => neg-macros}/splice-pat.check | 4 ++-- tests/{neg => neg-macros}/splice-pat.scala | 0 tests/{pos => pos-macros}/i11415.scala | 0 tests/{pos => pos-macros}/i12019.scala | 0 tests/{pos => pos-macros}/i12802.scala | 0 tests/{pos => pos-macros}/i15650.scala | 0 tests/{pos => pos-macros}/i6693.scala | 0 tests/{pos => pos-macros}/i9361.scala | 0 tests/{pos => pos-macros}/splice-pat.scala | 0 tests/pos/i10107c.scala | 2 -- tests/pos/i11184a.scala | 2 -- tests/pos/i11184b.scala | 2 -- tests/pos/i11184c.scala | 2 -- tests/pos/i11184d.scala | 2 -- tests/pos/i12958.scala | 2 -- .../opaque-inline/EmailAddress.scala | 0 .../opaque-inline/EmailAddressOps.scala | 0 tests/{run => run-macros}/opaque-inline/Test.scala | 0 .../opaque-inline/TestEmail.scala | 0 tests/{run => run-macros}/splice-position.check | 0 tests/{run => run-macros}/splice-position/Test.scala | 0 .../{run => run-macros}/splice-position/macros.scala | 0 tests/run/i12052/MirrorType.scala | 1 - tests/run/i8577a.scala | 2 -- tests/run/i8577b.scala | 2 -- tests/run/i8577c.scala | 2 -- tests/run/i8577d.scala | 2 -- tests/run/i8577e.scala | 2 -- tests/run/i8577f.scala | 2 -- tests/run/i8577g.scala | 2 -- tests/run/i8577h.scala | 2 -- tests/run/i8577i.scala | 2 -- tests/run/whitebox-inline.scala | 2 -- 45 files changed, 9 insertions(+), 42 deletions(-) rename tests/{neg => neg-macros}/higher-order-quoted-expressions.scala (100%) rename tests/{neg => neg-macros}/i12019.scala (100%) rename tests/{neg => neg-macros}/i12196.scala (100%) rename tests/{neg => neg-macros}/i12196b.scala (100%) rename tests/{neg => neg-macros}/i12344.scala (100%) rename tests/{neg => neg-macros}/i12606.scala (100%) rename tests/{neg => neg-macros}/i13407.scala (100%) rename tests/{neg => neg-macros}/i14772.check (78%) rename tests/{neg => neg-macros}/i14772.scala (100%) rename tests/{neg => neg-macros}/i15009a.check (79%) rename tests/{neg => neg-macros}/i15009a.scala (100%) rename tests/{neg => neg-macros}/i16861a.scala (100%) rename tests/{neg => neg-macros}/splice-pat.check (74%) rename tests/{neg => neg-macros}/splice-pat.scala (100%) rename tests/{pos => pos-macros}/i11415.scala (100%) rename tests/{pos => pos-macros}/i12019.scala (100%) rename tests/{pos => pos-macros}/i12802.scala (100%) rename tests/{pos => pos-macros}/i15650.scala (100%) rename tests/{pos => pos-macros}/i6693.scala (100%) rename tests/{pos => pos-macros}/i9361.scala (100%) rename tests/{pos => pos-macros}/splice-pat.scala (100%) rename tests/{run => run-macros}/opaque-inline/EmailAddress.scala (100%) rename tests/{run => run-macros}/opaque-inline/EmailAddressOps.scala (100%) rename tests/{run => run-macros}/opaque-inline/Test.scala (100%) rename tests/{run => run-macros}/opaque-inline/TestEmail.scala (100%) rename tests/{run => run-macros}/splice-position.check (100%) rename tests/{run => run-macros}/splice-position/Test.scala (100%) rename tests/{run => run-macros}/splice-position/macros.scala (100%) diff --git a/tests/neg/higher-order-quoted-expressions.scala b/tests/neg-macros/higher-order-quoted-expressions.scala similarity index 100% rename from tests/neg/higher-order-quoted-expressions.scala rename to tests/neg-macros/higher-order-quoted-expressions.scala diff --git a/tests/neg/i12019.scala b/tests/neg-macros/i12019.scala similarity index 100% rename from tests/neg/i12019.scala rename to tests/neg-macros/i12019.scala diff --git a/tests/neg/i12196.scala b/tests/neg-macros/i12196.scala similarity index 100% rename from tests/neg/i12196.scala rename to tests/neg-macros/i12196.scala diff --git a/tests/neg/i12196b.scala b/tests/neg-macros/i12196b.scala similarity index 100% rename from tests/neg/i12196b.scala rename to tests/neg-macros/i12196b.scala diff --git a/tests/neg/i12344.scala b/tests/neg-macros/i12344.scala similarity index 100% rename from tests/neg/i12344.scala rename to tests/neg-macros/i12344.scala diff --git a/tests/neg/i12606.scala b/tests/neg-macros/i12606.scala similarity index 100% rename from tests/neg/i12606.scala rename to tests/neg-macros/i12606.scala diff --git a/tests/neg/i13407.scala b/tests/neg-macros/i13407.scala similarity index 100% rename from tests/neg/i13407.scala rename to tests/neg-macros/i13407.scala diff --git a/tests/neg/i14772.check b/tests/neg-macros/i14772.check similarity index 78% rename from tests/neg/i14772.check rename to tests/neg-macros/i14772.check index 4fb5b7f7cd5f..42f78b76754c 100644 --- a/tests/neg/i14772.check +++ b/tests/neg-macros/i14772.check @@ -1,4 +1,4 @@ --- [E044] Cyclic Error: tests/neg/i14772.scala:7:7 --------------------------------------------------------------------- +-- [E044] Cyclic Error: tests/neg-macros/i14772.scala:7:7 -------------------------------------------------------------- 7 | foo(a) // error | ^ | Overloaded or recursive method impl needs return type diff --git a/tests/neg/i14772.scala b/tests/neg-macros/i14772.scala similarity index 100% rename from tests/neg/i14772.scala rename to tests/neg-macros/i14772.scala diff --git a/tests/neg/i15009a.check b/tests/neg-macros/i15009a.check similarity index 79% rename from tests/neg/i15009a.check rename to tests/neg-macros/i15009a.check index 4bdca5318d38..7f12378b2158 100644 --- a/tests/neg/i15009a.check +++ b/tests/neg-macros/i15009a.check @@ -1,34 +1,34 @@ --- Error: tests/neg/i15009a.scala:4:9 ---------------------------------------------------------------------------------- +-- Error: tests/neg-macros/i15009a.scala:4:9 --------------------------------------------------------------------------- 4 | '[List[${Type.of[Int]}]] // error | ^^^^^^^^^^^^^^^ | Type splicing with `$` in quotes not supported anymore | | Hint: To use a given Type[T] in a quote just write T directly --- Error: tests/neg/i15009a.scala:7:16 --------------------------------------------------------------------------------- +-- Error: tests/neg-macros/i15009a.scala:7:16 -------------------------------------------------------------------------- 7 | case '[List[$a]] => // error | ^^ | Type splicing with `$` in quotes not supported anymore | | Hint: Use lower cased variable name without the `$` instead --- Error: tests/neg/i15009a.scala:10:16 -------------------------------------------------------------------------------- +-- Error: tests/neg-macros/i15009a.scala:10:16 ------------------------------------------------------------------------- 10 | '{ List.empty[$int] } // error | ^^^^ | Type splicing with `$` in quotes not supported anymore | | Hint: To use a given Type[T] in a quote just write T directly --- Error: tests/neg/i15009a.scala:11:9 --------------------------------------------------------------------------------- +-- Error: tests/neg-macros/i15009a.scala:11:9 -------------------------------------------------------------------------- 11 | val t: ${int} = ??? // error | ^^^^^^ | Type splicing with `$` in quotes not supported anymore | | Hint: To use a given Type[T] in a quote just write T directly --- Error: tests/neg/i15009a.scala:3:2 ---------------------------------------------------------------------------------- +-- Error: tests/neg-macros/i15009a.scala:3:2 --------------------------------------------------------------------------- 3 | '[Int] // error | ^^^^^^ | Quoted types `'[..]` can only be used in patterns. | | Hint: To get a scala.quoted.Type[T] use scala.quoted.Type.of[T] instead. --- [E006] Not Found Error: tests/neg/i15009a.scala:12:2 ---------------------------------------------------------------- +-- [E006] Not Found Error: tests/neg-macros/i15009a.scala:12:2 --------------------------------------------------------- 12 | $int // error: Not found: $int | ^^^^ | Not found: $int diff --git a/tests/neg/i15009a.scala b/tests/neg-macros/i15009a.scala similarity index 100% rename from tests/neg/i15009a.scala rename to tests/neg-macros/i15009a.scala diff --git a/tests/neg/i16861a.scala b/tests/neg-macros/i16861a.scala similarity index 100% rename from tests/neg/i16861a.scala rename to tests/neg-macros/i16861a.scala diff --git a/tests/neg/splice-pat.check b/tests/neg-macros/splice-pat.check similarity index 74% rename from tests/neg/splice-pat.check rename to tests/neg-macros/splice-pat.check index 32af3ad6308e..e81834adef92 100644 --- a/tests/neg/splice-pat.check +++ b/tests/neg-macros/splice-pat.check @@ -1,10 +1,10 @@ --- [E032] Syntax Error: tests/neg/splice-pat.scala:12:16 --------------------------------------------------------------- +-- [E032] Syntax Error: tests/neg-macros/splice-pat.scala:12:16 -------------------------------------------------------- 12 | case '{ foo(${ // error: pattern expected | ^ | pattern expected | | longer explanation available when compiling with `-explain` --- [E040] Syntax Error: tests/neg/splice-pat.scala:15:5 ---------------------------------------------------------------- +-- [E040] Syntax Error: tests/neg-macros/splice-pat.scala:15:5 --------------------------------------------------------- 15 | })} => ??? // error | ^ | '=>' expected, but ')' found diff --git a/tests/neg/splice-pat.scala b/tests/neg-macros/splice-pat.scala similarity index 100% rename from tests/neg/splice-pat.scala rename to tests/neg-macros/splice-pat.scala diff --git a/tests/pos/i11415.scala b/tests/pos-macros/i11415.scala similarity index 100% rename from tests/pos/i11415.scala rename to tests/pos-macros/i11415.scala diff --git a/tests/pos/i12019.scala b/tests/pos-macros/i12019.scala similarity index 100% rename from tests/pos/i12019.scala rename to tests/pos-macros/i12019.scala diff --git a/tests/pos/i12802.scala b/tests/pos-macros/i12802.scala similarity index 100% rename from tests/pos/i12802.scala rename to tests/pos-macros/i12802.scala diff --git a/tests/pos/i15650.scala b/tests/pos-macros/i15650.scala similarity index 100% rename from tests/pos/i15650.scala rename to tests/pos-macros/i15650.scala diff --git a/tests/pos/i6693.scala b/tests/pos-macros/i6693.scala similarity index 100% rename from tests/pos/i6693.scala rename to tests/pos-macros/i6693.scala diff --git a/tests/pos/i9361.scala b/tests/pos-macros/i9361.scala similarity index 100% rename from tests/pos/i9361.scala rename to tests/pos-macros/i9361.scala diff --git a/tests/pos/splice-pat.scala b/tests/pos-macros/splice-pat.scala similarity index 100% rename from tests/pos/splice-pat.scala rename to tests/pos-macros/splice-pat.scala diff --git a/tests/pos/i10107c.scala b/tests/pos/i10107c.scala index b42e62ddb7dc..98b839e29ef4 100644 --- a/tests/pos/i10107c.scala +++ b/tests/pos/i10107c.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - inline def isTrue: Boolean = true inline def oneOf(): String = { diff --git a/tests/pos/i11184a.scala b/tests/pos/i11184a.scala index b4b0beca45ee..200cc39d5199 100644 --- a/tests/pos/i11184a.scala +++ b/tests/pos/i11184a.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - inline def isTrue: Boolean = true inline def oneOf: String = inline if isTrue then "foo" else "bar" def test1 = oneOf diff --git a/tests/pos/i11184b.scala b/tests/pos/i11184b.scala index 16a12b92d15b..7d5ac480fbaf 100644 --- a/tests/pos/i11184b.scala +++ b/tests/pos/i11184b.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - inline def isTrue(): Boolean = true inline def oneOf: String = inline if isTrue() then "foo" else "bar" def test1 = oneOf diff --git a/tests/pos/i11184c.scala b/tests/pos/i11184c.scala index bcd83fb056a2..138df57e7c44 100644 --- a/tests/pos/i11184c.scala +++ b/tests/pos/i11184c.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Foo: inline def isTrue: Boolean = true inline def oneOf: String = inline if Foo.isTrue then "foo" else "bar" diff --git a/tests/pos/i11184d.scala b/tests/pos/i11184d.scala index 3807159a9c5d..37091190a175 100644 --- a/tests/pos/i11184d.scala +++ b/tests/pos/i11184d.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - inline def isTrue: Boolean = true transparent inline def oneOf: Any = inline if isTrue then isTrue else "bar" def test1 = oneOf diff --git a/tests/pos/i12958.scala b/tests/pos/i12958.scala index 4c6cfec1f786..e509973d6898 100644 --- a/tests/pos/i12958.scala +++ b/tests/pos/i12958.scala @@ -1,5 +1,3 @@ -import scala.quoted.* - package mylib: object Export: transparent inline def exported: Any = 1 diff --git a/tests/run/opaque-inline/EmailAddress.scala b/tests/run-macros/opaque-inline/EmailAddress.scala similarity index 100% rename from tests/run/opaque-inline/EmailAddress.scala rename to tests/run-macros/opaque-inline/EmailAddress.scala diff --git a/tests/run/opaque-inline/EmailAddressOps.scala b/tests/run-macros/opaque-inline/EmailAddressOps.scala similarity index 100% rename from tests/run/opaque-inline/EmailAddressOps.scala rename to tests/run-macros/opaque-inline/EmailAddressOps.scala diff --git a/tests/run/opaque-inline/Test.scala b/tests/run-macros/opaque-inline/Test.scala similarity index 100% rename from tests/run/opaque-inline/Test.scala rename to tests/run-macros/opaque-inline/Test.scala diff --git a/tests/run/opaque-inline/TestEmail.scala b/tests/run-macros/opaque-inline/TestEmail.scala similarity index 100% rename from tests/run/opaque-inline/TestEmail.scala rename to tests/run-macros/opaque-inline/TestEmail.scala diff --git a/tests/run/splice-position.check b/tests/run-macros/splice-position.check similarity index 100% rename from tests/run/splice-position.check rename to tests/run-macros/splice-position.check diff --git a/tests/run/splice-position/Test.scala b/tests/run-macros/splice-position/Test.scala similarity index 100% rename from tests/run/splice-position/Test.scala rename to tests/run-macros/splice-position/Test.scala diff --git a/tests/run/splice-position/macros.scala b/tests/run-macros/splice-position/macros.scala similarity index 100% rename from tests/run/splice-position/macros.scala rename to tests/run-macros/splice-position/macros.scala diff --git a/tests/run/i12052/MirrorType.scala b/tests/run/i12052/MirrorType.scala index b8b0b442690e..cdab9a94d600 100644 --- a/tests/run/i12052/MirrorType.scala +++ b/tests/run/i12052/MirrorType.scala @@ -1,4 +1,3 @@ -import scala.quoted._ import scala.deriving._ import scala.compiletime.{erasedValue, constValue, summonFrom, summonInline} diff --git a/tests/run/i8577a.scala b/tests/run/i8577a.scala index fa9d23cb928a..1a5a50c73721 100644 --- a/tests/run/i8577a.scala +++ b/tests/run/i8577a.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577b.scala b/tests/run/i8577b.scala index 91744cf48527..2e3e7977f871 100644 --- a/tests/run/i8577b.scala +++ b/tests/run/i8577b.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577c.scala b/tests/run/i8577c.scala index e49743306ce4..bdc89eb7183a 100644 --- a/tests/run/i8577c.scala +++ b/tests/run/i8577c.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577d.scala b/tests/run/i8577d.scala index 8af8fad7cd56..b05d7c1ccc14 100644 --- a/tests/run/i8577d.scala +++ b/tests/run/i8577d.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577e.scala b/tests/run/i8577e.scala index 89d391ded2fd..c112f2bfde10 100644 --- a/tests/run/i8577e.scala +++ b/tests/run/i8577e.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577f.scala b/tests/run/i8577f.scala index 6ddaedc7b39f..eafa5c6f242e 100644 --- a/tests/run/i8577f.scala +++ b/tests/run/i8577f.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577g.scala b/tests/run/i8577g.scala index ec5019d4c353..e5d0991543c4 100644 --- a/tests/run/i8577g.scala +++ b/tests/run/i8577g.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577h.scala b/tests/run/i8577h.scala index 457c8138d840..7e741cb16cd2 100644 --- a/tests/run/i8577h.scala +++ b/tests/run/i8577h.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/i8577i.scala b/tests/run/i8577i.scala index 1893425b8782..0a5ee76e07e1 100644 --- a/tests/run/i8577i.scala +++ b/tests/run/i8577i.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Macro: opaque type StrCtx = StringContext def apply(ctx: StringContext): StrCtx = ctx diff --git a/tests/run/whitebox-inline.scala b/tests/run/whitebox-inline.scala index 09e7911caaa1..74266d670075 100644 --- a/tests/run/whitebox-inline.scala +++ b/tests/run/whitebox-inline.scala @@ -1,5 +1,3 @@ -import scala.quoted._ - object Test { def main(args: Array[String]): Unit = { val a: Int = blackbox