Skip to content

Fix #9100: Add error when experimental macros are not enabled #9124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions compiler/src/dotty/tools/dotc/config/Feature.scala
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ object Feature:
def dependentEnabled(using Context) =
enabled(nme.dependent, defn.LanguageExperimentalModule.moduleClass)

def scala2ExperimentalMacroEnabled(using Context) =
enabled("macros".toTermName, defn.LanguageExperimentalModule.moduleClass)

def sourceVersionSetting(using Context): SourceVersion =
SourceVersion.valueOf(ctx.settings.source.value)

Expand Down
10 changes: 10 additions & 0 deletions compiler/src/dotty/tools/dotc/typer/Typer.scala
Original file line number Diff line number Diff line change
Expand Up @@ -3581,6 +3581,16 @@ class Typer extends Namer
}
}
if ctx.phase.isTyper then
call match
case untpd.Ident(nme.???) => // Instinsic macros ignored
case _ =>
if !config.Feature.scala2ExperimentalMacroEnabled then
ctx.error(
"""Scala 2 macro definition needs to be enabled
|by making the implicit value scala.language.experimental.macros visible.
|This can be achieved by adding the import clause 'import scala.language.experimental.macros'
|or by setting the compiler option -language:experimental.macros.
""".stripMargin, call.sourcePos)
call match
case call: untpd.Ident =>
typedIdent(call, defn.AnyType)
Expand Down
3 changes: 3 additions & 0 deletions tests/neg/i9100.scala
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
object FooMacros {
def foo[T]: String = macro Foo.fooImpl[T] // error: Scala 2 macro definition needs to be enabled
}
2 changes: 1 addition & 1 deletion tests/semanticdb/expect/Classes.expect.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package classes

import scala.language/*->scalaShadowing::language.*/.experimental/*->scalaShadowing::language.experimental.*/.macros/*->scalaShadowing::language.experimental.macros.*/
class C1/*<-classes::C1#*/(val x1/*<-classes::C1#x1.*/: Int/*->scala::Int#*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/

class C2/*<-classes::C2#*/(val x2/*<-classes::C2#x2.*/: Int/*->scala::Int#*/) extends AnyVal/*->scala::AnyVal#*//*->scala::AnyVal#`<init>`().*/
Expand Down
2 changes: 1 addition & 1 deletion tests/semanticdb/expect/Classes.scala
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
package classes

import scala.language.experimental.macros
class C1(val x1: Int) extends AnyVal

class C2(val x2: Int) extends AnyVal
Expand Down
6 changes: 5 additions & 1 deletion tests/semanticdb/metac.expect
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ Uri => Classes.scala
Text => empty
Language => Scala
Symbols => 106 entries
Occurrences => 126 entries
Occurrences => 130 entries

Symbols:
classes/C1# => final class C1
Expand Down Expand Up @@ -452,6 +452,10 @@ local3 => val local local

Occurrences:
[0:8..0:15): classes <- classes/
[1:7..1:12): scala -> scala/
[1:13..1:21): language -> scalaShadowing/language.
[1:22..1:34): experimental -> scalaShadowing/language.experimental.
[1:35..1:41): macros -> scalaShadowing/language.experimental.macros.
[2:6..2:8): C1 <- classes/C1#
[2:8..2:21): <- classes/C1#`<init>`().
[2:13..2:15): x1 <- classes/C1#x1.
Expand Down