AstralTransRocketries/OpenComputers
1
0
Fork 0
mirror of https://github.com/MightyPirates/OpenComputers.git synced 2025-09-18 11:48:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:MightyPirates/OpenComputers into master-MC1.7.10

Browse Source
This commit is contained in:
Florian Nücke 2014-08-15 01:05:05 +02:00
commit 093db6798b
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/resources/assets/opencomputers/loot/OpenOS/lib/filesystem.lua
View File

@ -157,7 +157,10 @@ end
function filesystem.isLink(path)
local node, rest, vnode, vrest = findNode(filesystem.path(path))
return not vrest and vnode.links[filesystem.name(path)] ~= nil
if not vrest and vnode.links[filesystem.name(path)] ~= nil then
return true, vnode.links[filesystem.name(path)]
end
return false
end
function filesystem.link(target, linkpath)

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

@ -101,6 +101,7 @@ private[oc] object Registry extends api.detail.DriverAPI {
case arg: Array[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg: Product => convertList(arg, arg.productIterator.zipWithIndex, memo)
case arg: Seq[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg: java.lang.Iterable[_] => convertList(arg, arg.zipWithIndex.iterator, memo)
case arg: Map[_, _] => convertMap(arg, arg, memo)
case arg: mutable.Map[_, _] => convertMap(arg, arg.toMap, memo)
@ -116,6 +117,11 @@ private[oc] object Registry extends api.detail.DriverAPI {
memo += arg -> 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 {
// 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