Skip to content

Commit 95c52a5

Browse files
nicolasstuckinicolasstucki
committed
Rename definitions to defn 
1 parent ddae49f commit 95c52a5

File tree

12 files changed

+97
-97
lines changed

12 files changed

+97
-97
lines changed

‎community-build/community-projects/sourcecode

‎library/src-bootstrapped/dotty/internal/StringContextMacro.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -625,11 +625,11 @@ object StringContextMacro {
625625
* nothing otherwise
626626
*/
627627
def checkTypeWithArgs(argument : (Type, Int), conversionChar : Char, partIndex : Int, flags : List[(Char, Int)]) = {
628-
val booleans = List(definitions.BooleanType, definitions.NullType)
629-
val dates = List(definitions.LongType, typeOf[java.util.Calendar], typeOf[java.util.Date])
630-
val floatingPoints = List(definitions.DoubleType, definitions.FloatType, typeOf[java.math.BigDecimal])
631-
val integral = List(definitions.IntType, definitions.LongType, definitions.ShortType, definitions.ByteType, typeOf[java.math.BigInteger])
632-
val character = List(definitions.CharType, definitions.ByteType, definitions.ShortType, definitions.IntType)
628+
val booleans = List(defn.BooleanType, defn.NullType)
629+
val dates = List(defn.LongType, typeOf[java.util.Calendar], typeOf[java.util.Date])
630+
val floatingPoints = List(defn.DoubleType, defn.FloatType, typeOf[java.math.BigDecimal])
631+
val integral = List(defn.IntType, defn.LongType, defn.ShortType, defn.ByteType, typeOf[java.math.BigInteger])
632+
val character = List(defn.CharType, defn.ByteType, defn.ShortType, defn.IntType)
633633

634634
val (argType, argIndex) = argument
635635
conversionChar match {

‎library/src-bootstrapped/scala/internal/quoted/Matcher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ object Matcher {
104104
case (IsTerm(scrutinee @ Typed(s, tpt1)), Typed(TypeApply(patternHole, tpt :: Nil), tpt2))
105105
if patternHole.symbol == internal.Definitions_InternalQuoted_patternHole &&
106106
s.tpe <:< tpt.tpe &&
107-
tpt2.tpe.derivesFrom(definitions.RepeatedParamClass) =>
107+
tpt2.tpe.derivesFrom(defn.RepeatedParamClass) =>
108108
matched(scrutinee.seal)
109109

110110
// Match a scala.internal.Quoted.patternHole and return the scrutinee tree

‎library/src-bootstrapped/scala/quoted/Liftable.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ object Liftable {
4141
/** Lift a `Class[T]` into `'{ classOf[T] }` */
4242
def toExpr(x: Class[T]) = given qctx => {
4343
import qctx.tasty._
44-
Ref(definitions.Predef_classOf).appliedToType(Type(x)).seal.asInstanceOf[Expr[Class[T]]]
44+
Ref(defn.Predef_classOf).appliedToType(Type(x)).seal.asInstanceOf[Expr[Class[T]]]
4545
}
4646
}
4747

‎library/src/scala/quoted/Type.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -19,47 +19,47 @@ package quoted {
1919

2020
given UnitTag as Type[Unit] given (qctx: QuoteContext) = {
2121
import qctx.tasty._
22-
definitions.UnitType.seal.asInstanceOf[quoted.Type[Unit]]
22+
defn.UnitType.seal.asInstanceOf[quoted.Type[Unit]]
2323
}
2424

2525
given BooleanTag as Type[Boolean] given (qctx: QuoteContext) = {
2626
import qctx.tasty._
27-
definitions.BooleanType.seal.asInstanceOf[quoted.Type[Boolean]]
27+
defn.BooleanType.seal.asInstanceOf[quoted.Type[Boolean]]
2828
}
2929

3030
given ByteTag as Type[Byte] given (qctx: QuoteContext) = {
3131
import qctx.tasty._
32-
definitions.ByteType.seal.asInstanceOf[quoted.Type[Byte]]
32+
defn.ByteType.seal.asInstanceOf[quoted.Type[Byte]]
3333
}
3434

3535
given CharTag as Type[Char] given (qctx: QuoteContext) = {
3636
import qctx.tasty._
37-
definitions.CharType.seal.asInstanceOf[quoted.Type[Char]]
37+
defn.CharType.seal.asInstanceOf[quoted.Type[Char]]
3838
}
3939

4040
given ShortTag as Type[Short] given (qctx: QuoteContext) = {
4141
import qctx.tasty._
42-
definitions.ShortType.seal.asInstanceOf[quoted.Type[Short]]
42+
defn.ShortType.seal.asInstanceOf[quoted.Type[Short]]
4343
}
4444

4545
given IntTag as Type[Int] given (qctx: QuoteContext) = {
4646
import qctx.tasty._
47-
definitions.IntType.seal.asInstanceOf[quoted.Type[Int]]
47+
defn.IntType.seal.asInstanceOf[quoted.Type[Int]]
4848
}
4949

5050
given LongTag as Type[Long] given (qctx: QuoteContext) = {
5151
import qctx.tasty._
52-
definitions.LongType.seal.asInstanceOf[quoted.Type[Long]]
52+
defn.LongType.seal.asInstanceOf[quoted.Type[Long]]
5353
}
5454

5555
given FloatTag as Type[Float] given (qctx: QuoteContext) = {
5656
import qctx.tasty._
57-
definitions.FloatType.seal.asInstanceOf[quoted.Type[Float]]
57+
defn.FloatType.seal.asInstanceOf[quoted.Type[Float]]
5858
}
5959

6060
given DoubleTag as Type[Double] given (qctx: QuoteContext) = {
6161
import qctx.tasty._
62-
definitions.DoubleType.seal.asInstanceOf[quoted.Type[Double]]
62+
defn.DoubleType.seal.asInstanceOf[quoted.Type[Double]]
6363
}
6464

6565
}

‎library/src/scala/tasty/reflect/Printers.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1898,7 +1898,7 @@ trait Printers
18981898

18991899
object ScalaPackage {
19001900
def unapply(tpe: TypeOrBounds) given (ctx: Context): Boolean = tpe match {
1901-
case Type.IsTermRef(tpe) => tpe.termSymbol == definitions.ScalaPackage
1901+
case Type.IsTermRef(tpe) => tpe.termSymbol == defn.ScalaPackage
19021902
case _ => false
19031903
}
19041904
}

‎library/src/scala/tasty/reflect/StandardDefinitions.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ trait StandardDefinitions extends Core {
66
/** A value containing all standard definitions in [[DefinitionsAPI]]
77
* @group Definitions
88
*/
9-
object definitions extends StandardSymbols with StandardTypes
9+
object defn extends StandardSymbols with StandardTypes
1010

1111
/** Defines standard symbols (and types via its base trait).
1212
* @group API

‎tests/run-macros/f-interpolation-1/FQuote_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ object FQuote {
4747
val Typed(Repeated(allArgs, _), _) = args.unseal.underlyingArgument
4848

4949
for ((arg, part) <- allArgs.zip(parts.tail)) {
50-
if (part.startsWith("%d") && !(arg.tpe <:< definitions.IntType)) {
50+
if (part.startsWith("%d") && !(arg.tpe <:< defn.IntType)) {
5151
return '{s"`${${arg.show}}` is not of type Int"}
5252
}
5353

‎tests/run-macros/tasty-definitions-1/quoted_1.scala

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -14,82 +14,82 @@ object Macros {
1414
buff += (try x catch { case ex => ex.getClass + ": " + ex.getMessage})
1515
}
1616

17-
printout(definitions.RootPackage.name)
18-
printout(definitions.ScalaPackage.name)
17+
printout(defn.RootPackage.name)
18+
printout(defn.ScalaPackage.name)
1919

20-
printout(definitions.AnyClass.name)
21-
printout(definitions.AnyValClass.name)
22-
printout(definitions.ObjectClass.name)
23-
printout(definitions.AnyRefClass.name)
20+
printout(defn.AnyClass.name)
21+
printout(defn.AnyValClass.name)
22+
printout(defn.ObjectClass.name)
23+
printout(defn.AnyRefClass.name)
2424

25-
printout(definitions.NullClass.name)
26-
printout(definitions.NothingClass.name)
25+
printout(defn.NullClass.name)
26+
printout(defn.NothingClass.name)
2727

28-
printout(definitions.UnitClass.name)
29-
printout(definitions.ByteClass.name)
30-
printout(definitions.ShortClass.name)
31-
printout(definitions.CharClass.name)
32-
printout(definitions.IntClass.name)
33-
printout(definitions.LongClass.name)
34-
printout(definitions.FloatClass.name)
35-
printout(definitions.DoubleClass.name)
36-
printout(definitions.BooleanClass.name)
28+
printout(defn.UnitClass.name)
29+
printout(defn.ByteClass.name)
30+
printout(defn.ShortClass.name)
31+
printout(defn.CharClass.name)
32+
printout(defn.IntClass.name)
33+
printout(defn.LongClass.name)
34+
printout(defn.FloatClass.name)
35+
printout(defn.DoubleClass.name)
36+
printout(defn.BooleanClass.name)
3737

38-
printout(definitions.StringClass.name)
39-
printout(definitions.ClassClass.name)
40-
printout(definitions.ArrayClass.name)
41-
printout(definitions.PredefModule.name)
38+
printout(defn.StringClass.name)
39+
printout(defn.ClassClass.name)
40+
printout(defn.ArrayClass.name)
41+
printout(defn.PredefModule.name)
4242

43-
printout(definitions.JavaLangPackage.name)
43+
printout(defn.JavaLangPackage.name)
4444

45-
printout(definitions.ArrayModule.name)
45+
printout(defn.ArrayModule.name)
4646

47-
printout(definitions.Array_apply.name)
48-
printout(definitions.Array_clone.name)
49-
printout(definitions.Array_length.name)
50-
printout(definitions.Array_update.name)
47+
printout(defn.Array_apply.name)
48+
printout(defn.Array_clone.name)
49+
printout(defn.Array_length.name)
50+
printout(defn.Array_update.name)
5151

52-
printout(definitions.RepeatedParamClass.name)
52+
printout(defn.RepeatedParamClass.name)
5353

54-
printout(definitions.OptionClass.name)
55-
printout(definitions.NoneModule.name)
56-
printout(definitions.SomeModule.name)
54+
printout(defn.OptionClass.name)
55+
printout(defn.NoneModule.name)
56+
printout(defn.SomeModule.name)
5757

58-
printout(definitions.ProductClass.name)
58+
printout(defn.ProductClass.name)
5959

6060
for (i <- 0 to 25)
61-
printout(definitions.FunctionClass(i).name)
61+
printout(defn.FunctionClass(i).name)
6262

6363
for (i <- 0 to 25)
64-
printout(definitions.FunctionClass(i, isImplicit = true).name)
64+
printout(defn.FunctionClass(i, isImplicit = true).name)
6565

6666
for (i <- 1 to 25)
67-
printout(definitions.FunctionClass(i, isErased = true).name)
67+
printout(defn.FunctionClass(i, isErased = true).name)
6868

6969
for (i <- 1 to 25)
70-
printout(definitions.FunctionClass(i, isImplicit = true, isErased = true).name)
70+
printout(defn.FunctionClass(i, isImplicit = true, isErased = true).name)
7171

7272
for (i <- 2 to 22)
73-
printout(definitions.TupleClass(i).name)
74-
75-
printout(definitions.ScalaPrimitiveValueClasses.map(_.name).toString)
76-
printout(definitions.ScalaNumericValueClasses.map(_.name).toString)
77-
78-
printout(definitions.UnitType.showExtractors)
79-
printout(definitions.ByteType.showExtractors)
80-
printout(definitions.CharType.showExtractors)
81-
printout(definitions.IntType.showExtractors)
82-
printout(definitions.LongType.showExtractors)
83-
printout(definitions.FloatType.showExtractors)
84-
printout(definitions.DoubleType.showExtractors)
85-
printout(definitions.BooleanType.showExtractors)
86-
printout(definitions.AnyType.showExtractors)
87-
printout(definitions.AnyValType.showExtractors)
88-
printout(definitions.AnyRefType.showExtractors)
89-
printout(definitions.ObjectType.showExtractors)
90-
printout(definitions.NothingType.showExtractors)
91-
printout(definitions.NullType.showExtractors)
92-
printout(definitions.StringType.showExtractors)
73+
printout(defn.TupleClass(i).name)
74+
75+
printout(defn.ScalaPrimitiveValueClasses.map(_.name).toString)
76+
printout(defn.ScalaNumericValueClasses.map(_.name).toString)
77+
78+
printout(defn.UnitType.showExtractors)
79+
printout(defn.ByteType.showExtractors)
80+
printout(defn.CharType.showExtractors)
81+
printout(defn.IntType.showExtractors)
82+
printout(defn.LongType.showExtractors)
83+
printout(defn.FloatType.showExtractors)
84+
printout(defn.DoubleType.showExtractors)
85+
printout(defn.BooleanType.showExtractors)
86+
printout(defn.AnyType.showExtractors)
87+
printout(defn.AnyValType.showExtractors)
88+
printout(defn.AnyRefType.showExtractors)
89+
printout(defn.ObjectType.showExtractors)
90+
printout(defn.NothingType.showExtractors)
91+
printout(defn.NullType.showExtractors)
92+
printout(defn.StringType.showExtractors)
9393

9494

9595
'{println(${buff.result().mkString("\n")})}

‎tests/run-macros/tasty-location/quoted_1.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ object Location {
1111
import qctx.tasty._
1212

1313
def listOwnerNames(sym: Symbol, acc: List[String]): List[String] =
14-
if (sym == definitions.RootClass || sym == definitions.EmptyPackageClass) acc
14+
if (sym == defn.RootClass || sym == defn.EmptyPackageClass) acc
1515
else listOwnerNames(sym.owner, sym.name :: acc)
1616

1717
val list = listOwnerNames(rootContext.owner, Nil)

‎tests/run-macros/tasty-typeof/Macro_1.scala

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,21 @@ object Macros {
88
private def testTypeOfImpl given (qctx: QuoteContext): Expr[Unit] = {
99
import qctx.tasty._
1010
'{
11-
assert(${(typeOf[Unit] =:= definitions.UnitType)}, "Unit")
12-
assert(${(typeOf[Byte] =:= definitions.ByteType)}, "Byte")
13-
assert(${(typeOf[Short] =:= definitions.ShortType)}, "Short")
14-
assert(${(typeOf[Int] =:= definitions.IntType)}, "Int")
15-
assert(${(typeOf[Long] =:= definitions.LongType)}, "Long")
16-
assert(${(typeOf[Float] =:= definitions.FloatType)}, "Float")
17-
assert(${(typeOf[Double] =:= definitions.DoubleType)}, "Double")
18-
assert(${(typeOf[Char] =:= definitions.CharType)}, "Char")
19-
assert(${(typeOf[String] =:= definitions.StringType)}, "String")
11+
assert(${(typeOf[Unit] =:= defn.UnitType)}, "Unit")
12+
assert(${(typeOf[Byte] =:= defn.ByteType)}, "Byte")
13+
assert(${(typeOf[Short] =:= defn.ShortType)}, "Short")
14+
assert(${(typeOf[Int] =:= defn.IntType)}, "Int")
15+
assert(${(typeOf[Long] =:= defn.LongType)}, "Long")
16+
assert(${(typeOf[Float] =:= defn.FloatType)}, "Float")
17+
assert(${(typeOf[Double] =:= defn.DoubleType)}, "Double")
18+
assert(${(typeOf[Char] =:= defn.CharType)}, "Char")
19+
assert(${(typeOf[String] =:= defn.StringType)}, "String")
2020

21-
assert(${(typeOf[Any] =:= definitions.AnyType)}, "Any")
22-
assert(${(typeOf[AnyRef] =:= definitions.AnyRefType)}, "AnyRef")
23-
assert(${(typeOf[AnyVal] =:= definitions.AnyValType)}, "AnyVal")
24-
assert(${(typeOf[Object] =:= definitions.ObjectType)}, "Object")
25-
assert(${(typeOf[Nothing] =:= definitions.NothingType)}, "Nothing")
21+
assert(${(typeOf[Any] =:= defn.AnyType)}, "Any")
22+
assert(${(typeOf[AnyRef] =:= defn.AnyRefType)}, "AnyRef")
23+
assert(${(typeOf[AnyVal] =:= defn.AnyValType)}, "AnyVal")
24+
assert(${(typeOf[Object] =:= defn.ObjectType)}, "Object")
25+
assert(${(typeOf[Nothing] =:= defn.NothingType)}, "Nothing")
2626

2727
println(${typeOf[List[Int]].show})
2828
println(${typeOf[Macros].show})

‎tests/run-with-compiler-custom-args/tasty-interpreter/interpreter/TreeInterpreter.scala

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,15 +193,15 @@ abstract class TreeInterpreter[R <: Reflection & Singleton](val reflect: R) {
193193
isIntegralPrimitive(tpe) || isFractionalPrimitive(tpe)
194194

195195
private def isIntegralPrimitive(tpe: Type): Boolean = {
196-
tpe <:< definitions.ByteType ||
197-
tpe <:< definitions.CharType ||
198-
tpe <:< definitions.ShortType ||
199-
tpe <:< definitions.IntType ||
200-
tpe <:< definitions.LongType
196+
tpe <:< defn.ByteType ||
197+
tpe <:< defn.CharType ||
198+
tpe <:< defn.ShortType ||
199+
tpe <:< defn.IntType ||
200+
tpe <:< defn.LongType
201201
}
202202

203203
private def isFractionalPrimitive(tpe: Type): Boolean =
204-
tpe <:< definitions.FloatType || tpe <:< definitions.DoubleType
204+
tpe <:< defn.FloatType || tpe <:< defn.DoubleType
205205

206206

207207
private object Call {

0 commit comments

Comments
 (0)