From ddcf885fb9c5c80acaeca9f92ede3e7c93f4cd35 Mon Sep 17 00:00:00 2001
From: Mark Harrah <dmharrah@gmail.com>
Date: Sat, 28 Apr 2012 18:58:38 -0400
Subject: [PATCH] fresh scope for each inherited definition when tagging type
 variables

---
 compile/api/TagTypeVariables.scala | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/compile/api/TagTypeVariables.scala b/compile/api/TagTypeVariables.scala
index ee1992bd7..3b8f762e3 100644
--- a/compile/api/TagTypeVariables.scala
+++ b/compile/api/TagTypeVariables.scala
@@ -23,10 +23,12 @@ private class TagTypeVariables
 
 	def tag(s: SourceAPI): TypeVars =
 	{
-		s.definitions.foreach(tagDefinition)
+		tagDefinitions(s.definitions)
 		tags
 	}
-	def tagDefinitions(ds: Seq[Definition]) = ds.foreach(tagDefinition)
+	def tagDefinitions(ds: Seq[Definition], eachFresh: Boolean = false): Unit =
+		for(d <- ds) if(eachFresh) freshScope(tagDefinition(d)) else tagDefinition(d)
+
 	def tagDefinition(d: Definition)
 	{
 		d match
@@ -123,7 +125,7 @@ private class TagTypeVariables
 	{
 		tagTypes(structure.parents)
 		tagDefinitions(structure.declared)
-		tagDefinitions(structure.inherited)
+		tagDefinitions(structure.inherited, eachFresh=true)
 	}
 	def tagParameters(parameters: Seq[TypeParameter], base: Type): Unit =
 		scope {
@@ -136,12 +138,24 @@ private class TagTypeVariables
 		val saveIndex = index
 		index = 0
 		level += 1
-		
+
 		action
 		
 		level -= 1
 		index = saveIndex
 	}
+	def freshScope(action: => Unit)
+	{
+		val saveIndex = index
+		val saveLevel = level
+		index = 0
+		level = 0
+	
+		action
+
+		level = saveLevel
+		index = saveIndex
+	}
 	def recordTypeParameter(id: Int)
 	{
 		tags(id) = (level, index)