From 5d4d78808123442b98198f69596da2c7630bcd80 Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Sat, 21 Jun 2014 18:15:33 -0500
Subject: [PATCH] Fix access range map error display

---
 loopy/kernel/creation.py | 7 +++----
 loopy/symbolic.py        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/loopy/kernel/creation.py b/loopy/kernel/creation.py
index 9c4de55cc..b57cf3e6e 100644
--- a/loopy/kernel/creation.py
+++ b/loopy/kernel/creation.py
@@ -864,10 +864,9 @@ def guess_arg_shape_if_requested(kernel, default_order):
             if armap.access_range is None:
                 if armap.bad_subscripts:
                     raise RuntimeError("cannot determine access range for '%s': "
-                            "undetermined index in subscripts '%s'"
-                            % (arg.name, " | ".join(
-                                "(%s)" % (
-                                    ", ".join(str(i) for i in armap.bad_subscripts)))))
+                            "undetermined index in subscript(s) '%s'"
+                            % (arg.name, ", ".join(
+                                    str(i) for i in armap.bad_subscripts)))
 
                 # no subscripts found, let's call it a scalar
                 shape = ()
diff --git a/loopy/symbolic.py b/loopy/symbolic.py
index 8f0cd02e3..be74e12bc 100644
--- a/loopy/symbolic.py
+++ b/loopy/symbolic.py
@@ -1024,7 +1024,7 @@ class AccessRangeMapper(WalkMapper):
             subscript = (subscript,)
 
         if not get_dependencies(subscript) <= set(domain.get_var_dict()):
-            self.bad_subscripts.append(subscript)
+            self.bad_subscripts.append(expr)
             return
 
         access_range = get_access_range(domain, subscript, self.kernel.assumptions)
-- 
GitLab