reducing indirection

jeanqasaur · Jun 26, 2015 · 80e6156 · 80e6156
1 parent 18fa407
commit 80e6156
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/JeevesLib.py b/JeevesLib.py
@@ -118,11 +118,6 @@ def concretize(ctxt, v):
     # jeevesState.concretecache.cache_value(cache_key, cval)
     # return cval
 
-@supports_jeeves
-def assignLabel(label):
-    pathvars = jeevesState.pathenv.getEnv()
-    return jeevesState.solverstate.assignLabel(label, pathvars)
-
 @supports_jeeves
 def jif(cond, thn_fn, els_fn):
     condTrans = fexpr_cast(cond).partialEval(jeevesState.pathenv.getEnv())

diff --git a/jeevesdb/JeevesModel.py b/jeevesdb/JeevesModel.py
@@ -65,16 +65,18 @@ def get(self, use_base_env=False, skip_optimize=False, **kwargs):
         viewer = JeevesLib.get_viewer()
         has_viewer = not isinstance(viewer, FNull)
 
+        pathenv = JeevesLib.jeevesState.pathenv.getEnv()
+        solverstate = JeevesLib.get_solverstate()
+
         cur = None
         for (row, conditions) in matches:
             old = cur
             cur = FObject(row)
             for var_name, val in conditions.iteritems():
                 label = acquire_label_by_name(self.model._meta.app_label
                     , var_name, obj=row)
-                viewer = JeevesLib.get_viewer()
                 if has_viewer and not skip_optimize:
-                    if JeevesLib.assignLabel(label):
+                    if solverstate.assignLabel(label, pathenv):
                         if not val:
                             cur = old
                     else:
@@ -134,14 +136,15 @@ def all(self):
             # Otherwise concretize early.
             elements = []
             env = JeevesLib.jeevesState.pathenv.getEnv()
+            solverstate = JeevesLib.get_solverstate()
 
             for val, cond in self.get_jiter():
                 for vname, vval in cond.iteritems():
                     if vname not in env:
                         vlabel = acquire_label_by_name(
                                     self.model._meta.app_label, vname
                                     , obj=val)
-                        label = JeevesLib.assignLabel(vlabel)
+                        label = solverstate.assignLabel(vlabel, env)
                         if label == vval:
                             elements.append(val)
             return elements