AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-17 03:05:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

flatten converted values *after* recursive conversion, not instead of

Browse Source
This commit is contained in:
Ben Blank 2015-02-07 21:29:12 -08:00
parent fa5c66907d
commit 5b09d44944
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/scala/li/cil/oc/server/driver/Registry.scala
View File

@ -146,11 +146,6 @@ private[oc] object Registry extends api.detail.DriverAPI {
memo += arg -> null memo += arg -> null
null null
} }
else if (converted.size == 1 && converted.containsKey("oc:flatten")) {
val value = converted.get("oc:flatten")
memo += arg -> value // Update memoization map.
value
}
else { else {
// This is a little nasty but necessary because we need to keep the // This is a little nasty but necessary because we need to keep the
// 'converted' value up-to-date for any reference created to it in // 'converted' value up-to-date for any reference created to it in
@ -163,10 +158,17 @@ private[oc] object Registry extends api.detail.DriverAPI {
memo += converted -> converted // Makes convertMap re-use the map. memo += converted -> converted // Makes convertMap re-use the map.
convertRecursively(converted, memo, force = true) convertRecursively(converted, memo, force = true)
memo -= converted memo -= converted
if (converted.size == 1 && converted.containsKey("oc:flatten")) {
val value = converted.get("oc:flatten")
memo += arg -> value // Update memoization map.
value
}
else {
converted converted
} }
} }
} }
}
def convertList(obj: AnyRef, list: Iterator[(Any, Int)], memo: util.IdentityHashMap[AnyRef, AnyRef]) = { def convertList(obj: AnyRef, list: Iterator[(Any, Int)], memo: util.IdentityHashMap[AnyRef, AnyRef]) = {
val converted = mutable.ArrayBuffer.empty[AnyRef] val converted = mutable.ArrayBuffer.empty[AnyRef]