Permalink
Browse files

Top removal: CLR binding

  • Loading branch information...
1 parent c7d9a56 commit 3a38229fe675d8c55082e512775467aaac173468 @sorear committed Sep 24, 2012
Showing with 89 additions and 83 deletions.
  1. +2 −2 lib/Kernel.cs
  2. +86 −80 lib/NieczaCLR.cs
  3. +1 −1 lib/Serialize.cs
View
@@ -4333,7 +4333,7 @@ public struct StashCursor {
throw new NieczaException("CLR objects may not be used directly in safe mode");
if (bind_to != null)
throw new NieczaException("Cannot bind interop namespaces");
- v = CLRWrapperProvider.GetNamedWrapper((string)p1 + "." + key).typeObj;
+ v = CLRWrapperProvider.GetNamedWrapper(Compartment.Top, (string)p1 + "." + key).typeObj;
goto have_v;
}
else if (type == WHO) {
@@ -5153,7 +5153,7 @@ internal class MMDCandidate : MultiCandidate {
if (craw == null) { group_n++; continue; }
mc.Add(new MMDCandidate(craw, group_n, filter_n++));
}
- cs = new CandidateSet(dth.info.name, mc.ToArray());
+ cs = new CandidateSet(th.info.setting, dth.info.name, mc.ToArray());
Interlocked.CompareExchange(ref dth.info.param[1], cs, null);
}
if (tailcall) th = th.Return();
Oops, something went wrong.

0 comments on commit 3a38229

Please sign in to comment.