Changed all Type references in MultipartGenerator to String and reduced scala reflect dependancy to ScalaCompilerFactory

This commit is contained in:
Chicken Bones committed 2013-06-23 17:02:33 +10:00
1 parent 4704baff55
commit 35f877ccd8
3 files changed
+43 -46

No files matched your search

+29 -35
View File
@@ -1,6 +1,5 @@
package codechicken.multipart
import scala.reflect.runtime.universe._
import net.minecraft.tileentity.TileEntity
import scala.collection.immutable.Map
import net.minecraft.world.World
@@ -17,37 +16,36 @@ import codechicken.multipart.asm.ScalaCompilerFactory
object MultipartGenerator
{
var mirror = scala.reflect.runtime.currentMirror
private var tileTraitMap:Map[Class[_], Set[Type]] = Map()
private var interfaceTraitMap_c:Map[Type, Type] = Map()
private var interfaceTraitMap_s:Map[Type, Type] = Map()
private var partTraitMap_c:Map[Class[_], Seq[Type]] = Map()
private var partTraitMap_s:Map[Class[_], Seq[Type]] = Map()
private var tileTraitMap:Map[Class[_], Set[String]] = Map()
private var interfaceTraitMap_c:Map[String, String] = Map()
private var interfaceTraitMap_s:Map[String, String] = Map()
private var partTraitMap_c:Map[Class[_], Seq[String]] = Map()
private var partTraitMap_s:Map[Class[_], Seq[String]] = Map()
var factory:IMultipartFactory = ScalaCompilerFactory
def getType(obj:Any) = mirror.classSymbol(obj.getClass).toType
def partTraitMap(client:Boolean) = if(client) partTraitMap_c else partTraitMap_s
def interfaceTraitMap(client:Boolean) = if(client) partTraitMap_c else interfaceTraitMap_s
def traitsForPart(part:TMultiPart, client:Boolean):Seq[Type] =
def traitsForPart(part:TMultiPart, client:Boolean):Seq[String] =
{
var ret = partTraitMap(client).getOrElse(part.getClass, null)
if(ret == null)
{
def heirachy(clazz:Class[_]):Seq[Class[_]] =
{
var superClasses:Seq[Class[_]] = clazz.getInterfaces:+clazz
if(clazz.getSuperclass != null)
superClasses = superClasses++heirachy(clazz.getSuperclass)
return superClasses
}
ret = heirachy(part.getClass).flatMap(c => interfaceTraitMap_c.get(c.getName)).distinct
if(client)
{
ret = getType(part).baseClasses.flatMap(s => interfaceTraitMap_c.get(s.asClass.toType)).distinct
partTraitMap_c = partTraitMap_c+(part.getClass -> ret)
}
else
{
ret = getType(part).baseClasses.flatMap(s => interfaceTraitMap_s.get(s.asClass.toType)).distinct
partTraitMap_s = partTraitMap_s+(part.getClass -> ret)
}
}
return ret
}
@@ -138,22 +136,19 @@ object MultipartGenerator
*/
def registerTrait(s_interface:String, c_trait:String, s_trait:String)
{
val iSymbol = mirror.staticClass(s_interface).asClass
if(c_trait != null)
{
val tSymbol = mirror.staticClass(c_trait).asClass
if(interfaceTraitMap_c.contains(iSymbol.toType))
System.err.println("Trait already registered for "+iSymbol)
if(interfaceTraitMap_c.contains(s_interface))
System.err.println("Trait already registered for "+s_interface)
else
interfaceTraitMap_c = interfaceTraitMap_c+(iSymbol.toType->tSymbol.toType)
interfaceTraitMap_c = interfaceTraitMap_c+(s_interface->c_trait)
}
if(s_trait != null)
{
val tSymbol = mirror.staticClass(s_trait).asClass
if(interfaceTraitMap_s.contains(iSymbol.toType))
System.err.println("Trait already registered for "+iSymbol)
if(interfaceTraitMap_s.contains(s_interface))
System.err.println("Trait already registered for "+s_interface)
else
interfaceTraitMap_s = interfaceTraitMap_s+(iSymbol.toType->tSymbol.toType)
interfaceTraitMap_s = interfaceTraitMap_s+(s_interface->s_trait)
}
}
@@ -161,25 +156,24 @@ object MultipartGenerator
def registerPassThroughInterface(s_interface:String, client:Boolean, server:Boolean)
{
val iSymbol = mirror.staticClass(s_interface).asClass
val tType = factory.generatePassThroughTrait(iSymbol)
val tType = factory.generatePassThroughTrait(s_interface)
if(client)
{
if(interfaceTraitMap_c.contains(iSymbol.toType))
System.err.println("Trait already registered for "+iSymbol)
if(interfaceTraitMap_c.contains(s_interface))
System.err.println("Trait already registered for "+s_interface)
else
interfaceTraitMap_c = interfaceTraitMap_c+(iSymbol.toType->tType)
interfaceTraitMap_c = interfaceTraitMap_c+(s_interface->tType)
}
if(server)
{
if(interfaceTraitMap_s.contains(iSymbol.toType))
System.err.println("Trait already registered for "+iSymbol)
if(interfaceTraitMap_s.contains(s_interface))
System.err.println("Trait already registered for "+s_interface)
else
interfaceTraitMap_s = interfaceTraitMap_s+(iSymbol.toType->tType)
interfaceTraitMap_s = interfaceTraitMap_s+(s_interface->tType)
}
}
def registerTileClass(clazz:Class[_ <: TileEntity], traits:Set[Type])
def registerTileClass(clazz:Class[_ <: TileEntity], traits:Set[String])
{
tileTraitMap=tileTraitMap+(clazz->traits)
MultipartProxy.onTileClassBuilt(clazz)
@@ -5,7 +5,7 @@ import codechicken.multipart.TileMultipart
trait IMultipartFactory
{
def generatePassThroughTrait(iSymbol:ClassSymbol):Type
def generatePassThroughTrait(s_interface:String):String
def generateTile(types:Seq[Type], client:Boolean):TileMultipart
def generateTile(types:Seq[String], client:Boolean):TileMultipart
}
@@ -18,6 +18,8 @@ object ScalaCompilerFactory extends IMultipartFactory
var mirror = scala.reflect.runtime.currentMirror
var tb = mirror.mkToolBox()
def getType(obj:Any) = mirror.classSymbol(obj.getClass).toType
def Apply(f:Tree, args:Tree*) = scala.reflect.runtime.universe.Apply(f, List(args:_*))
def Apply(f:Tree, args:List[Tree]) = scala.reflect.runtime.universe.Apply(f, args)
def TypeApply(f:Tree, args:Tree*) = scala.reflect.runtime.universe.TypeApply(f, List(args:_*))
@@ -69,15 +71,15 @@ object ScalaCompilerFactory extends IMultipartFactory
object SuperSet
{
val TileMultipartType = typeOf[TileMultipart]
val TileMultipartClientType = typeOf[TileMultipartClient]
def apply(types:Seq[Type], client:Boolean) = new SuperSet(types, client)
val TileMultipartType = classOf[TileMultipart].getName
val TileMultipartClientType = classOf[TileMultipartClient].getName
def apply(types:Seq[String], client:Boolean) = new SuperSet(types, client)
}
class SuperSet(types:Seq[Type], client:Boolean)
class SuperSet(types:Seq[String], client:Boolean)
{
import SuperSet._
val set = baseType+:types.sortWith(_.toString < _.toString)
val set = baseType+:types.sorted
def interfaces = set
def baseType = if(client) TileMultipartClientType else TileMultipartType
@@ -111,7 +113,7 @@ object ScalaCompilerFactory extends IMultipartFactory
normalClassDef(
NoFlags,
uniqueName("TileMultipart_cmp"),
set.map(_.typeSymbol.asType).toList,
set.map(s => mirror.staticClass(s).asType).toList,
List(
defaultConstructor
)
@@ -179,8 +181,9 @@ object ScalaCompilerFactory extends IMultipartFactory
private def passThroughTraitName(iName:String) =
"T" + (if(iName.startsWith("I")) iName.substring(1) else iName)
def generatePassThroughTrait(iSymbol:ClassSymbol):Type =
def generatePassThroughTrait(s_interface:String):String =
{
val iSymbol = mirror.staticClass(s_interface)
val tname = uniqueName(passThroughTraitName(iSymbol.name.decoded))
val methods = iSymbol.toType.members.filter(_.isJava).map(m => passThroughMethod(tname, m.asMethod))
val traitDef =
@@ -291,8 +294,8 @@ object ScalaCompilerFactory extends IMultipartFactory
Ident(tname:TypeName))
val clazz = tb.eval(Block(traitDef, retType)).asInstanceOf[Class[_]]
return mirror.classSymbol(clazz).asType.toType
return clazz.getName
}
def generateTile(types:Seq[Type], client:Boolean) = SuperSet(types, client).generate
def generateTile(types:Seq[String], client:Boolean) = SuperSet(types, client).generate
}