Changeset 3832f27 in sasmodels

Timestamp:

May 4, 2016 8:04:45 PM (9 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:

47e498b

Parents:

5a91c6b

Message:

add line directives to generated source so compiler errors are reported correctly

Location:

sasmodels

Files:

• generate.py (modified) (7 diffs)
• kernel_template.c (modified) (1 diff)

sasmodels/generate.py

@@ -215 +215 @@
 import warnings
 from collections import namedtuple
+import inspect
 
 import numpy as np
@@ -460 +461 @@
 
     # Load additional sources
-    source = [open(f).read() for f in model_sources(model_info)]
+    source = [p
+              for f in model_sources(model_info)
+              # Add #line directives at the start of each file
+              for p in ('#line 0 "%s"'%f, open(f).read())
+              ]
+    source.append('#line 133 "%s"'%C_KERNEL_TEMPLATE_PATH)
 
     # Prepare defines
@@ -498 +504 @@
 double form_volume(VOLUME_PARAMETER_DECLARATIONS);
 double form_volume(VOLUME_PARAMETER_DECLARATIONS) {
+#line %(line)d "%(file)s"
     %(body)s
 }
-""" % {'body':model_info['form_volume']}
+""" % {'body':model_info['form_volume'],
+       'file':model_info['filename'],
+       'line':model_info['form_volume_line'],
+       }
         source.append(fn)
 
@@ -527 +537 @@
 double Iq(double q, IQ_PARAMETER_DECLARATIONS);
 double Iq(double q, IQ_PARAMETER_DECLARATIONS) {
+#line %(line)d "%(file)s"
     %(body)s
 }
-""" % {'body':model_info['Iq']}
+""" % {'body':model_info['Iq'],
+       'file':model_info['filename'],
+       'line':model_info['Iq_line'],
+       }
         source.append(fn)
 
@@ -556 +570 @@
 double Iqxy(double qx, double qy, IQXY_PARAMETER_DECLARATIONS);
 double Iqxy(double qx, double qy, IQXY_PARAMETER_DECLARATIONS) {
+#line %(line)d "%(file)s"
     %(body)s
 }
-""" % {'body':model_info['Iqxy']}
+""" % {'body':model_info['Iqxy'],
+       'file':model_info['filename'],
+       'line':model_info['Iqxy_line'],
+       }
         source.append(fn)
 
@@ -655 +673 @@
         kernel_module = getattr(models, model_name, None)
     return kernel_module
+
+def find_source_lines(model_info, kernel_module):
+    """
+    Identify the location of the C source inside the model definition file.
+
+    This code runs through the source of the kernel module looking for
+    lines that start with 'Iq', 'Iqxy' or 'form_volume'.  Clearly there are
+    all sorts of reasons why this might not work (e.g., code commented out
+    in a triple-quoted line block, code built using string concatenation,
+    or code defined in the branch of an 'if' block), but it should work
+    properly in the 95% case, and getting the incorrect line number will
+    be harmless.
+    """
+    # Check if we need line numbers at all
+    if callable(model_info['Iq']):
+        return None
+
+    if (model_info['Iq'] is None
+        and model_info['Iqxy'] is None
+        and model_info['form_volume'] is None):
+        return
+
+    # Make sure we have harmless default values
+    model_info['Iqxy_line'] = 0
+    model_info['Iq_line'] = 0
+    model_info['form_volume_line'] = 0
+
+    # find the defintion lines for the different code blocks
+    source = inspect.getsource(kernel_module)
+    for k, v in enumerate(source.split('\n')):
+        if v.startswith('Iqxy'):
+            model_info['Iqxy_line'] = k+1
+        elif v.startswith('Iq'):
+            model_info['Iq_line'] = k+1
+        elif v.startswith('form_volume'):
+            model_info['form_volume_line'] = k+1
 
 
@@ -726 +780 @@
     functions = "ER VR form_volume Iq Iqxy shape sesans".split()
     model_info.update((k, getattr(kernel_module, k, None)) for k in functions)
+    find_source_lines(model_info, kernel_module)
     return model_info
 

sasmodels/kernel_template.c

@@ +1 @@
+#line 1 "kernel_template.c"
 // GENERATED CODE --- DO NOT EDIT ---
 // Code is produced by sasmodels.gen from sasmodels/models/MODEL.c