Readapt tests

Author: nicolasstucki

tests/run-custom-args/Yretain-trees/tasty-definitions-2/Macro_1.scala

@@ -15,7 +15,7 @@ object Foo {
     }
     x.unseal match {
       case Term.Inlined(None, Nil, arg) => definitionString(arg)
-      case Term.Block(Nil, arg) => definitionString(arg) // TODO should all by name parameters be in an inline node?
+      case arg => definitionString(arg) // TODO should all by name parameters be in an inline node?
     }
   }
 

tests/run-custom-args/Yretain-trees/tasty-definitions-3/Macro_1.scala

@@ -15,7 +15,7 @@ object Foo {
     }
     x.unseal match {
       case Term.Inlined(None, Nil, arg) => definitionString(arg)
-      case Term.Block(Nil, arg) => definitionString(arg) // TODO should all by name parameters be in an inline node?
+      case arg => definitionString(arg) // TODO should all by name parameters be in an inline node?
     }
   }
 }

tests/run-custom-args/Yretain-trees/tasty-load-tree-1.check

@@ -1,2 +1,2 @@
 DefDef("foo", Nil, Nil, TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+"), List(Term.Literal(Constant.Int(2))))))
-NO DEFINTION
+ValDef("bar", TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+"), List(Term.Literal(Constant.Int(3))))))

tests/run-custom-args/Yretain-trees/tasty-load-tree-2.check

@@ -1,2 +1,2 @@
 DefDef("foo", Nil, Nil, TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(1)), "+"), List(Term.Literal(Constant.Int(2))))))
-NO DEFINTION
+ValDef("bar", TypeTree.Ident("Int"), Some(Term.Apply(Term.Select(Term.Literal(Constant.Int(2)), "+"), List(Term.Literal(Constant.Int(3))))))

tests/run/tasty-argument-tree-1.check

@@ -1,33 +1,33 @@
 
-tree: Term.Block(Nil, Term.Literal(Constant.Int(3)))
+tree: Term.Literal(Constant.Int(3))
 tree deref. vals: Term.Literal(Constant.Int(3))
 
-tree: Term.Block(Nil, Term.Ident("v"))
+tree: Term.Ident("v")
 tree deref. vals: Term.Literal(Constant.Int(1))
 
-tree: Term.Block(Nil, Term.Ident("x"))
+tree: Term.Ident("x")
 tree deref. vals: Term.Literal(Constant.Int(2))
 
-tree: Term.Block(Nil, Term.Ident("l"))
+tree: Term.Ident("l")
 tree deref. vals: Term.Literal(Constant.Int(3))
 
-tree: Term.Block(Nil, Term.Ident("a"))
+tree: Term.Ident("a")
 tree deref. vals: Term.Ident("a")
 
-tree: Term.Block(Nil, Term.Ident("x"))
+tree: Term.Ident("x")
 tree deref. vals: Term.Ident("b")
 
-tree: Term.Block(Nil, Term.Ident("vv"))
+tree: Term.Ident("vv")
 tree deref. vals: Term.Literal(Constant.Int(1))
 
-tree: Term.Block(Nil, Term.Ident("x"))
+tree: Term.Ident("x")
 tree deref. vals: Term.Literal(Constant.Int(1))
 
-tree: Term.Block(Nil, Term.Ident("vd"))
+tree: Term.Ident("vd")
 tree deref. vals: Term.Literal(Constant.Int(2))
 
-tree: Term.Block(Nil, Term.Ident("x"))
+tree: Term.Ident("x")
 tree deref. vals: Term.Literal(Constant.Int(2))
 
-tree: Term.Block(Nil, Term.Ident("x"))
+tree: Term.Ident("x")
 tree deref. vals: Term.Apply(Term.TypeApply(Term.Select(Term.Ident("Tuple2"), "apply"), List(TypeTree.Inferred(), TypeTree.Inferred())), List(Term.Literal(Constant.Int(1)), Term.Literal(Constant.Int(2))))

tests/run/tasty-extractors-1.check

@@ -1,19 +1,19 @@
-Term.Block(Nil, Term.Literal(Constant.Boolean(true)))
+Term.Literal(Constant.Boolean(true))
 Type.ConstantType(Constant.Boolean(true))
 
-Term.Block(Nil, Term.Literal(Constant.Int(1)))
+Term.Literal(Constant.Int(1))
 Type.ConstantType(Constant.Int(1))
 
-Term.Block(Nil, Term.Literal(Constant.Long(2)))
+Term.Literal(Constant.Long(2))
 Type.ConstantType(Constant.Long(2))
 
-Term.Block(Nil, Term.Literal(Constant.Float(2.1)))
+Term.Literal(Constant.Float(2.1))
 Type.ConstantType(Constant.Float(2.1))
 
-Term.Block(Nil, Term.Literal(Constant.Double(2.2)))
+Term.Literal(Constant.Double(2.2))
 Type.ConstantType(Constant.Double(2.2))
 
-Term.Block(Nil, Term.Literal(Constant.String("abc")))
+Term.Literal(Constant.String("abc"))
 Type.ConstantType(Constant.String("abc"))
 
 Term.Inlined(None, Nil, Term.Apply(Term.Ident("println"), List(Term.Literal(Constant.String("abc")))))
@@ -28,7 +28,7 @@ Type.SymRef(IsClassSymbol(<scala.Byte>), Type.SymRef(IsPackageSymbol(<scala>), T
 Term.Inlined(None, Nil, Term.Typed(Term.Literal(Constant.Short(8)), TypeTree.Ident("Short")))
 Type.SymRef(IsClassSymbol(<scala.Short>), Type.SymRef(IsPackageSymbol(<scala>), Type.ThisType(Type.SymRef(IsPackageSymbol(<<root>>), NoPrefix()))))
 
-Term.Block(Nil, Term.Literal(Constant.Char(a)))
+Term.Literal(Constant.Char(a))
 Type.ConstantType(Constant.Char(a))
 
 Term.Inlined(None, Nil, Term.Block(List(Term.Literal(Constant.Int(1)), Term.Literal(Constant.Int(2))), Term.Literal(Constant.Int(3))))

tests/run/tasty-extractors-2.check

@@ -7,7 +7,7 @@ Type.AppliedType(Type.SymRef(IsClassSymbol(<scala.Function1>), Type.ThisType(Typ
 Term.Inlined(None, Nil, Term.Ident("???"))
 Type.SymRef(IsDefSymbol(<scala.Predef$.???>), Type.SymRef(IsValSymbol(<scala.Predef>), Type.ThisType(Type.SymRef(IsPackageSymbol(<scala>), NoPrefix()))))
 
-Term.Block(Nil, Term.Literal(Constant.Int(1)))
+Term.Literal(Constant.Int(1))
 Type.ConstantType(Constant.Int(1))
 
 Term.Inlined(None, Nil, Term.Typed(Term.Literal(Constant.Int(1)), TypeTree.Ident("Int")))

tests/run/tasty-macro-const/quoted_1.scala

@@ -9,7 +9,7 @@ object Macros {
     import reflection._
     val xTree: Term = x.unseal
     xTree match {
-      case Term.Block(Nil, Term.Literal(Constant.Int(n))) =>
+      case Term.Literal(Constant.Int(n)) =>
         if (n <= 0)
           throw new QuoteError("Parameter must be natural number")
         xTree.seal[Int]