992 - c++ chain spaces for lexical scope

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/027space b/cpp/027space
index 2fa6f36d..0e1686f0 100644
--- a/cpp/027space
+++ b/cpp/027space
@@ -26,7 +26,7 @@ reagent absolutize(reagent x) {
 //?   cout << "not raw: " << x.to_string() << '\n'; //? 1
   assert(x.initialized);
   reagent r = x;
-  r.set_value(address(r.value, Current_routine.calls.top().default_space));
+  r.set_value(address(r.value, space(r)));
 //?   cout << "after absolutize: " << r.value << '\n'; //? 1
   if (r.properties.empty())
     r.properties.push_back(pair<string, vector<string> >("", vector<string>()));
@@ -35,6 +35,10 @@ reagent absolutize(reagent x) {
   return r;
 }
 
+int space(const reagent& x) {
+  return Current_routine.calls.top().default_space;
+}
+
 int address(int offset, int base) {
   if (base == 0) return offset;  // raw
   return base+offset+1;