Changeset b966a96 in sasmodels for sasmodels/generate.py

Timestamp:

Jul 21, 2016 5:12:18 PM (8 years ago)

Author:

Paul Kienzle <pkienzle@…>

Branches:

master, core_shell_microgels, costrafo411, magnetic_model, release_v0.94, release_v0.95, ticket-1257-vesicle-product, ticket_1156, ticket_1265_superball, ticket_822_more_unit_tests

Children:

6a0d6aa

Parents:

32e3c9b

Message:

better line numbers for compiler errors; tinycc support (mostly)

File:

• sasmodels/generate.py (modified) (4 diffs)

sasmodels/generate.py

@@ -540 +540 @@
 
     # Define the parameter table
+    # TODO: plug in current line number
+    source.append('#line 542 "sasmodels/generate.py"')
     source.append("#define PARAMETER_TABLE \\")
     source.append("\\\n".join(p.as_definition()
@@ -580 +582 @@
 
     source.append("#if defined(USE_OPENCL)")
-    source.extend(_add_kernels(ocl_code[0], call_iq, call_iqxy, model_info.name))
+    source.extend(_add_kernels(ocl_code, call_iq, call_iqxy, model_info.name))
     source.append("#else /* !USE_OPENCL */")
-    source.extend(_add_kernels(dll_code[0], call_iq, call_iqxy, model_info.name))
+    source.extend(_add_kernels(dll_code, call_iq, call_iqxy, model_info.name))
     source.append("#endif /* !USE_OPENCL */")
     return '\n'.join(source)
 
 
-def _add_kernels(kernel_code, call_iq, call_iqxy, name):
-    # type: (str, str, str, str) -> List[str]
+def _add_kernels(kernel, call_iq, call_iqxy, name):
+    # type: ([str,str], str, str, str) -> List[str]
+    code = kernel[0]
+    path = kernel[1].replace('\\', '\\\\')
     source = [
         # define the Iq kernel
         "#define KERNEL_NAME %s_Iq" % name,
         call_iq,
-        kernel_code,
+        '#line 1 "%s-Iq"' % path,
+        code,
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",
@@ -600 +605 @@
         "#define KERNEL_NAME %s_Iqxy" % name,
         call_iqxy,
-        kernel_code,
+        '#line 1 "%s-Iqxy"' % path,
+        code,
         "#undef CALL_IQ",
         "#undef KERNEL_NAME",
@@ -608 +614 @@
         "#define MAGNETIC 1",
         call_iqxy,
-        kernel_code,
+        '#line 1 "%s-Imagnetic"' % path,
+        code,
         "#undef MAGNETIC",
         "#undef CALL_IQ",