refactor/merge curr_func & getcurrenv

fperrad · Sep 29, 2009 · 6df18b2 · 6df18b2
1 parent 4696621
commit 6df18b2
Showing 1 changed file with 6 additions and 12 deletions.
diff --git a/src/pmc/luauserdata.pmc b/src/pmc/luauserdata.pmc
@@ -28,15 +28,17 @@ _LuaUserdata_get_metatable(PARROT_INTERP, PMC *obj) {
     return u_mt(obj);
 }
 
-static PMC* curr_func(PARROT_INTERP) {
+static PMC* getcurrenv(PARROT_INTERP) {
     PMC *sub_ctx = Parrot_pcc_get_caller_ctx(interp, CURRENT_CONTEXT(interp));
     while (1) {
         PMC *cont;
         PMC *current_sub = Parrot_pcc_get_sub(interp, sub_ctx);
         if (!PMC_IS_NULL(current_sub)
-         && PMC_type(current_sub) == dynpmc_LuaFunction
-         && _LuaFunction_get_environment(interp, current_sub))
-            return current_sub;
+         && PMC_type(current_sub) == dynpmc_LuaFunction) {
+            PMC * const env = _LuaFunction_get_environment(interp, current_sub);
+            if (!PMC_IS_NULL(env))
+                return env;
+        }
         cont = Parrot_pcc_get_continuation(interp, sub_ctx);
         if (PMC_IS_NULL(cont))
             break;
@@ -47,14 +49,6 @@ static PMC* curr_func(PARROT_INTERP) {
     return NULL;
 }
 
-static PMC* getcurrenv(PARROT_INTERP) {
-    PMC * const sub = curr_func(interp);
-    if (sub) {
-        return _LuaFunction_get_environment(interp, sub);
-    }
-    return NULL;
-}
-
 
 pmclass LuaUserdata
     extends  LuaAny