# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1529794667 -7200
# Node ID a8a16ef13733ec600c1680aeb9d909726a37cf0a
# Parent  fd110815f7f9d341fdf4fd163216389406bd35bb
Simplify the logic around target usage for invocation contexts.

diff -r fd110815f7f9 -r a8a16ef13733 translator.py
--- a/translator.py	Sun Jun 24 00:09:33 2018 +0200
+++ b/translator.py	Sun Jun 24 00:57:47 2018 +0200
@@ -1234,16 +1234,14 @@
         # An expression featuring an accessor test.
 
         need_target_stored = defaults_target_var and not target_identity or \
-                             need_context_target and not target_named or \
+                             need_context_target and not target_identity or \
                              need_context_stored or \
                              tests_accessor and not target
 
         # Define stored target details.
 
         target_stored = "__tmp_targets[%d]" % self.function_target
-
         target_var = need_target_stored and target_stored or target_identity
-        context_var = need_target_stored and target_stored or target_named
 
         if need_target_stored:
             self.record_temp("__tmp_targets")
@@ -1259,7 +1257,7 @@
             if have_access_context:
                 args = [context_identity]
             else:
-                args = ["__CONTEXT_AS_VALUE(%s)" % context_var]
+                args = ["__CONTEXT_AS_VALUE(%s)" % target_var]
         else:
             args = ["__NULL"]
 
@@ -1410,7 +1408,7 @@
                             context_identity, target_expr))
                 else:
                     emit("__get_function(__CONTEXT_AS_VALUE(%s), %s)" % (
-                        context_var, target_expr))
+                        target_var, target_expr))
             else:
                 emit("_get_function_member(%s)" % target_expr)