@@ -16,7 +16,7 @@ import core.Flags
1616object ModifiersParsingTest {
1717 implicit val ctx : Context = (new ContextBase ).initialCtx
1818
19- implicit def parse (code : String ): Tree = {
19+ def parse (code : String ): Tree = {
2020 val (_, stats) = new Parser (new SourceFile (" <meta>" , code)).templateStatSeq()
2121 stats match { case List (stat) => stat; case stats => Thicket (stats) }
2222 }
@@ -78,42 +78,42 @@ class ModifiersParsingTest {
7878
7979
8080 @ Test def valDef = {
81- var source : Tree = " class A(var a: Int)"
81+ var source = parse( " class A(var a: Int)" )
8282 assert(source.firstConstrValDef.modifiers == List (Mod .Var ()))
8383
84- source = " class A(val a: Int)"
84+ source = parse( " class A(val a: Int)" )
8585 assert(source.firstConstrValDef.modifiers == List ())
8686
87- source = " class A(private val a: Int)"
87+ source = parse( " class A(private val a: Int)" )
8888 assert(source.firstConstrValDef.modifiers == List (Mod .Private ()))
8989
90- source = " class A(protected var a: Int)"
90+ source = parse( " class A(protected var a: Int)" )
9191 assert(source.firstConstrValDef.modifiers == List (Mod .Protected (), Mod .Var ()))
9292
93- source = " class A(protected implicit val a: Int)"
93+ source = parse( " class A(protected implicit val a: Int)" )
9494 assert(source.firstConstrValDef.modifiers == List (Mod .Protected (), Mod .Implicit ()))
9595
96- source = " class A[T]"
96+ source = parse( " class A[T]" )
9797 assert(source.firstTypeParam.modifiers == List ())
9898 }
9999
100100 @ Test def typeDef = {
101- var source : Tree = " class A"
101+ var source = parse( " class A" )
102102 assert(source.modifiers == List ())
103103
104- source = " sealed class A"
104+ source = parse( " sealed class A" )
105105 assert(source.modifiers == List (Mod .Sealed ()))
106106
107- source = " implicit class A"
107+ source = parse( " implicit class A" )
108108 assert(source.modifiers == List (Mod .Implicit ()))
109109
110- source = " abstract sealed class A"
110+ source = parse( " abstract sealed class A" )
111111 assert(source.modifiers == List (Mod .Abstract (), Mod .Sealed ()))
112112 }
113113
114114 @ Test def fieldDef = {
115- val source : Tree =
116- """
115+ val source =
116+ parse( """
117117 | class A {
118118 | lazy var a = ???
119119 | lazy private val b = ???
@@ -122,7 +122,7 @@ class ModifiersParsingTest {
122122 | abstract override def f: Boolean
123123 | transparent def g(n: Int) = ???
124124 | }
125- """ .stripMargin
125+ """ .stripMargin)
126126
127127 assert(source.field(" a" ).modifiers == List (Mod .Lazy (), Mod .Var ()))
128128 assert(source.field(" b" ).modifiers == List (Mod .Lazy (), Mod .Private ()))
@@ -132,29 +132,29 @@ class ModifiersParsingTest {
132132 }
133133
134134 @ Test def paramDef = {
135- var source : Tree = " def f(transparent a: Int) = ???"
135+ var source : Tree = parse( " def f(transparent a: Int) = ???" )
136136 assert(source.defParam(0 ).modifiers == List (Mod .Transparent ()))
137137
138- source = " def f(implicit a: Int, b: Int) = ???"
138+ source = parse( " def f(implicit a: Int, b: Int) = ???" )
139139 assert(source.defParam(0 ).modifiers == List (Mod .Implicit ()))
140140 assert(source.defParam(1 ).modifiers == List (Mod .Implicit ()))
141141
142- source = " def f(x: Int, y: Int)(implicit a: Int, b: Int) = ???"
142+ source = parse( " def f(x: Int, y: Int)(implicit a: Int, b: Int) = ???" )
143143 assert(source.defParam(0 , 0 ).modifiers == List ())
144144 assert(source.defParam(1 , 0 ).modifiers == List (Mod .Implicit ()))
145145 }
146146
147147 @ Test def blockDef = {
148- var source : Tree = " implicit val x : A = ???"
148+ var source : Tree = parse( " implicit val x : A = ???" )
149149 assert(source.modifiers == List (Mod .Implicit ()))
150150
151- source = " implicit var x : A = ???"
151+ source = parse( " implicit var x : A = ???" )
152152 assert(source.modifiers == List (Mod .Implicit (), Mod .Var ()))
153153
154- source = " { implicit var x : A = ??? }"
154+ source = parse( " { implicit var x : A = ??? }" )
155155 assert(source.stat(0 ).modifiers == List (Mod .Implicit (), Mod .Var ()))
156156
157- source = " { implicit x => x * x }"
157+ source = parse( " { implicit x => x * x }" )
158158 assert(source.stat(0 ).funParam(0 ).modifiers == List (Mod .Implicit ()))
159159 }
160160}
0 commit comments