Skip to content
This repository
Browse code

Fix CALLER/inlining interaction and two new test files

  • Loading branch information...
commit f2fccf7bd45c1c08793da96d37071fa833e948fb 1 parent 48d6cd3
Stefan O'Rear authored

Showing 2 changed files with 5 additions and 2 deletions. Show diff stats Hide diff stats

  1. +3 2 lib/Kernel.cs
  2. +2 0  t/spectest.data
5 lib/Kernel.cs
@@ -2544,6 +2544,8 @@ public struct StashCursor {
2544 2544 if (f == null)
2545 2545 throw new NieczaException("No more calling frames");
2546 2546 r.p1 = f;
  2547 + r.p2 = f.info.FindControlEnt(f.ip, SubInfo.ON_VARLOOKUP, null);
  2548 + if (r.p2 < 0) r.p2 = 0;
2547 2549 }
2548 2550 return r;
2549 2551 }
@@ -2558,8 +2560,7 @@ public struct StashCursor {
2558 2560 r.p1 = f;
2559 2561 if (f == null)
2560 2562 throw new NieczaException("No more outer frames");
2561   - r.p2 = f.info.FindControlEnt(f.ip, SubInfo.ON_VARLOOKUP, null);
2562   - if (r.p2 < 0) r.p2 = 0;
  2563 + r.p2 = 0;
2563 2564 }
2564 2565 return r;
2565 2566 }
2  t/spectest.data
@@ -22,7 +22,9 @@ S02-magicals/block.t
22 22 S02-magicals/file_line.t
23 23 S02-magicals/sub.t
24 24 S02-names_and_variables/contextual.t
  25 +S02-names/caller.t
25 26 S02-names/identifier.t
  27 +S02-names/our.t
26 28 S02-names/symbolic-deref.t
27 29 S02-whitespace_and_comments/begin_end_pod.t
28 30 S02-whitespace_and_comments/pod-in-multi-line-exprs.t

0 comments on commit f2fccf7

Please sign in to comment.
Something went wrong with that request. Please try again.