From b35ddb3afedeaf704eee82b9c7fc1cf5902259df Mon Sep 17 00:00:00 2001
From: Andreas Kloeckner <inform@tiker.net>
Date: Thu, 28 Mar 2013 16:15:44 -0400
Subject: [PATCH] Improve generated struct formatting. Noodle template argument
lists through template machinery if requested.
---
pyopencl/tools.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/pyopencl/tools.py b/pyopencl/tools.py
index 07e1b266..753e5357 100644
--- a/pyopencl/tools.py
+++ b/pyopencl/tools.py
@@ -452,7 +452,7 @@ def match_dtype_to_c_struct(device, name, dtype, context=None):
for field_name, (field_dtype, offset) in fields:
c_fields.append(" %s %s;" % (dtype_to_ctype(field_dtype), field_name))
- c_decl = "typedef struct {\n%s\n} %s;" % (
+ c_decl = "typedef struct {\n%s\n} %s;\n\n" % (
"\n".join(c_fields),
name)
@@ -663,8 +663,8 @@ class _TemplateRenderer(object):
for arg_list in arg_lists:
if isinstance(arg_list, str):
- if arg_list.startswith("//CL//"):
- arg_list = arg_list[6:]
+ arg_list = str(
+ self.template.get_text_template(arg_list).render(self.var_dict))
arg_list = self._C_COMMENT_FINDER.sub("", arg_list)
arg_list = arg_list.replace("\n", " ")
--
GitLab