File tree Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Expand file tree Collapse file tree 6 files changed +9
-9
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ import fromtasty.TASTYCompiler
17
17
class Driver extends DotClass {
18
18
19
19
protected def newCompiler (implicit ctx : Context ): Compiler =
20
- if (ctx.settings.tasty .value) new TASTYCompiler
20
+ if (ctx.settings.fromTasty .value) new TASTYCompiler
21
21
else new Compiler
22
22
23
23
protected def emptyReporter : Reporter = new StoreReporter (null )
Original file line number Diff line number Diff line change @@ -42,7 +42,7 @@ class ScalaSettings extends Settings.SettingGroup {
42
42
val language = MultiStringSetting (" -language" , " feature" , " Enable one or more language features." )
43
43
val rewrite = OptionSetting [Rewrites ](" -rewrite" , " When used in conjunction with -language:Scala2 rewrites sources to migrate to new syntax" )
44
44
val silentWarnings = BooleanSetting (" -nowarn" , " Silence all warnings." )
45
- val tasty = BooleanSetting (" -tasty" , " Compile classes from tasty in classpath. The arguments are used as class names." )
45
+ val fromTasty = BooleanSetting (" -from -tasty" , " Compile classes from tasty in classpath. The arguments are used as class names." )
46
46
47
47
/** -X "Advanced" settings
48
48
*/
Original file line number Diff line number Diff line change @@ -337,7 +337,7 @@ class ClassfileLoader(val classfile: AbstractFile) extends SymbolLoader {
337
337
}
338
338
339
339
private def mayLoadTreesFromTasty (implicit ctx : Context ): Boolean =
340
- ctx.settings.YretainTrees .value || ctx.settings.XlinkOptimise .value || ctx.settings.tasty .value
340
+ ctx.settings.YretainTrees .value || ctx.settings.XlinkOptimise .value || ctx.settings.fromTasty .value
341
341
}
342
342
343
343
class SourcefileLoader (val srcfile : AbstractFile ) extends SymbolLoader {
Original file line number Diff line number Diff line change @@ -395,7 +395,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
395
395
protected def compileFromTasty (flags0 : TestFlags , suppressErrors : Boolean , targetDir : JFile ): TestReporter = {
396
396
val tastyOutput = new JFile (targetDir.getPath + " _from-tasty" )
397
397
tastyOutput.mkdir()
398
- val flags = flags0 and (" -d" , tastyOutput.getAbsolutePath) and " -tasty"
398
+ val flags = flags0 and (" -d" , tastyOutput.getAbsolutePath) and " -from- tasty"
399
399
400
400
def hasTastyFileToClassName (f : JFile ): String =
401
401
targetDir.toPath.relativize(f.toPath).toString.dropRight(" .hasTasty" .length).replace('/' , '.' )
@@ -1099,7 +1099,7 @@ trait ParallelTesting extends RunnerOrchestration { self =>
1099
1099
val target = JointCompilationSource (
1100
1100
testGroup.name,
1101
1101
Array (sourceFile),
1102
- flags.withClasspath(tastySource.getPath) and " -tasty" ,
1102
+ flags.withClasspath(tastySource.getPath) and " -from- tasty" ,
1103
1103
tastySource,
1104
1104
fromTasty = true
1105
1105
)
Original file line number Diff line number Diff line change @@ -21,11 +21,11 @@ mkdir out/scriptedtest0
21
21
22
22
23
23
# check that `dotc` compiles and `dotr` runs it
24
- echo " testing sbt dotc -tasty and dotr -classpath"
24
+ echo " testing sbt dotc -from- tasty and dotr -classpath"
25
25
mkdir out/scriptedtest1
26
26
mkdir out/scriptedtest2
27
27
./bin/dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/
28
- ./bin/dotc -tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test
28
+ ./bin/dotc -from- tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test
29
29
# FIXME #3477
30
30
# ./bin/dotr -classpath out/scriptedtest2/ dotrtest.Test" > sbtdotr2.out
31
31
# if grep -e "dotr test ok" sbtdotr2.out; then
Original file line number Diff line number Diff line change 15
15
fi
16
16
17
17
# check that `sbt dotc` compiles and `sbt dotr` runs it
18
- echo " testing sbt dotc -tasty and dotr -classpath"
18
+ echo " testing sbt dotc -from- tasty and dotr -classpath"
19
19
mkdir out/scriptedtest1
20
20
mkdir out/scriptedtest2
21
- ./project/scripts/sbt " ;dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/; dotc -tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test; dotr -classpath out/scriptedtest2/ dotrtest.Test" > sbtdotr2.out
21
+ ./project/scripts/sbt " ;dotc tests/pos/sbtDotrTest.scala -d out/scriptedtest1/; dotc -from- tasty -classpath out/scriptedtest1/ -d out/scriptedtest2/ dotrtest.Test; dotr -classpath out/scriptedtest2/ dotrtest.Test" > sbtdotr2.out
22
22
cat sbtdotr2.out
23
23
if grep -e " dotr test ok" sbtdotr2.out; then
24
24
echo " output ok"
You can’t perform that action at this time.
0 commit comments