summaryrefslogtreecommitdiff
path: root/src/reflect
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2013-08-08 08:15:56 -0700
committerEugene Burmako <xeno.by@gmail.com>2013-08-08 08:15:56 -0700
commited5c1abbfca18a880c79048cc7e9578ae932101d (patch)
tree7f4dd7f6ea5aaa42b2d473f5095d5134924f7c66 /src/reflect
parente9ccb416b307d853120411572a57cb57867a9afc (diff)
parent36524c21964696ec71170970c6a65f9bb7aec8f0 (diff)
downloadscala-ed5c1abbfca18a880c79048cc7e9578ae932101d.tar.gz
scala-ed5c1abbfca18a880c79048cc7e9578ae932101d.tar.bz2
scala-ed5c1abbfca18a880c79048cc7e9578ae932101d.zip
Merge pull request #2800 from densh/topic/toolbox-positions
SI-7331 tb.parse returns unpositioned trees
Diffstat (limited to 'src/reflect')
-rw-r--r--src/reflect/scala/reflect/internal/Importers.scala7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/reflect/scala/reflect/internal/Importers.scala b/src/reflect/scala/reflect/internal/Importers.scala
index 43902c1930..9a8dee1f15 100644
--- a/src/reflect/scala/reflect/internal/Importers.scala
+++ b/src/reflect/scala/reflect/internal/Importers.scala
@@ -443,7 +443,12 @@ trait Importers extends api.Importers { self: SymbolTable =>
}
})
tryFixup()
- mytree
+ // we have to be careful with position import as some shared trees
+ // like EmptyTree, emptyValDef don't support position assignment
+ if (tree.pos != NoPosition)
+ mytree.setPos(importPosition(tree.pos))
+ else
+ mytree
}
def importValDef(tree: from.ValDef): ValDef = importTree(tree).asInstanceOf[ValDef]