1.1 --- a/optimiser.py Fri Nov 25 12:46:35 2016 +0100
1.2 +++ b/optimiser.py Fri Nov 25 18:36:10 2016 +0100
1.3 @@ -404,18 +404,8 @@
1.4
1.5 # Apply any test.
1.6
1.7 - if test == "specific-type":
1.8 - accessor = ("__test_specific_type", accessor, test_type)
1.9 - elif test == "specific-instance":
1.10 - accessor = ("__test_specific_instance", accessor, test_type)
1.11 - elif test == "specific-object":
1.12 - accessor = ("__test_specific_object", accessor, test_type)
1.13 - elif test == "common-type":
1.14 - accessor = ("__test_common_type", accessor, test_type)
1.15 - elif test == "common-instance":
1.16 - accessor = ("__test_common_instance", accessor, test_type)
1.17 - elif test == "common-object":
1.18 - accessor = ("__test_common_object", accessor, test_type)
1.19 + if test[0] == "test":
1.20 + accessor = ("__%s_%s_%s" % test, accessor, test_type)
1.21
1.22 # Perform the first or final access.
1.23 # The access only needs performing if the resulting accessor is used.