Permalink
Browse files

Fix CALLER/inlining interaction and two new test files

  • Loading branch information...
1 parent 48d6cd3 commit f2fccf7bd45c1c08793da96d37071fa833e948fb @sorear committed Aug 2, 2011
Showing with 5 additions and 2 deletions.
  1. +3 −2 lib/Kernel.cs
  2. +2 −0 t/spectest.data
View
5 lib/Kernel.cs
@@ -2544,6 +2544,8 @@ public struct StashCursor {
if (f == null)
throw new NieczaException("No more calling frames");
r.p1 = f;
+ r.p2 = f.info.FindControlEnt(f.ip, SubInfo.ON_VARLOOKUP, null);
+ if (r.p2 < 0) r.p2 = 0;
}
return r;
}
@@ -2558,8 +2560,7 @@ public struct StashCursor {
r.p1 = f;
if (f == null)
throw new NieczaException("No more outer frames");
- r.p2 = f.info.FindControlEnt(f.ip, SubInfo.ON_VARLOOKUP, null);
- if (r.p2 < 0) r.p2 = 0;
+ r.p2 = 0;
}
return r;
}
View
2 t/spectest.data
@@ -22,7 +22,9 @@ S02-magicals/block.t
S02-magicals/file_line.t
S02-magicals/sub.t
S02-names_and_variables/contextual.t
+S02-names/caller.t
S02-names/identifier.t
+S02-names/our.t
S02-names/symbolic-deref.t
S02-whitespace_and_comments/begin_end_pod.t
S02-whitespace_and_comments/pod-in-multi-line-exprs.t

0 comments on commit f2fccf7

Please sign in to comment.